Fix document manager constructor not updating cached values

src/ai/CfnAI.ts

@@ -58,10 +58,11 @@ export class CfnAI implements SettingsConfigurable, Closeable {
                 throw new Error(`Template not found ${toString(templateFile)}`);
             }
 
-            return await agent.execute(
-                await Prompts.describeTemplate(document.contents()),
-                await this.getToolsWithFallback(),
-            );
+            const content = document.contents();
+            if (!content) {
+                throw new Error('Document content is undefined');
+            }
+            return await agent.execute(await Prompts.describeTemplate(content), await this.getToolsWithFallback());
         });
     }
 
@@ -72,10 +73,11 @@ export class CfnAI implements SettingsConfigurable, Closeable {
                 throw new Error(`Template not found ${toString(templateFile)}`);
             }
 
-            return await agent.execute(
-                await Prompts.optimizeTemplate(document.contents()),
-                await this.getToolsWithFallback(),
-            );
+            const content = document.contents();
+            if (!content) {
+                throw new Error('Document content is undefined');
+            }
+            return await agent.execute(await Prompts.optimizeTemplate(content), await this.getToolsWithFallback());
         });
     }
 
@@ -86,8 +88,12 @@ export class CfnAI implements SettingsConfigurable, Closeable {
                 return;
             }
 
+            const content = document.contents();
+            if (!content) {
+                throw new Error('Document content is undefined');
+            }
             return await agent.execute(
-                await Prompts.analyzeDiagnostic(document.contents(), diagnostics),
+                await Prompts.analyzeDiagnostic(content, diagnostics),
                 await this.getToolsWithFallback(),
             );
         });
@@ -107,6 +113,9 @@ export class CfnAI implements SettingsConfigurable, Closeable {
             }
 
             const templateContent = document.contents();
+            if (!templateContent) {
+                throw new Error('Document content is undefined');
+            }
 
             const resourceTypes = this.relationshipSchemaService.extractResourceTypesFromTemplate(templateContent);
             const relationshipContext = this.relationshipSchemaService.getRelationshipContext(resourceTypes);

src/codeLens/ManagedResourceCodeLens.ts

@@ -28,6 +28,9 @@ export class ManagedResourceCodeLens {
         }
 
         const text = document.getText();
+        if (!text) {
+            return [];
+        }
         const lines = text.split('\n');
 
         for (const [, resourceContext] of resourcesMap) {

src/codeLens/StackActionsCodeLens.ts

@@ -36,6 +36,9 @@ export function getStackActionsCodeLenses(
 
     let codeLensLine = 0;
     const lines = document.getLines();
+    if (!lines) {
+        return [];
+    }
     for (const [i, line] of lines.entries()) {
         const lineContents = line.trim();
         if (lineContents.length > 0 && !lineContents.startsWith('#')) {

src/context/FileContextManager.ts

@@ -22,8 +22,13 @@ export class FileContextManager {
             return undefined;
         }
 
+        const content = document.contents();
+        if (!content) {
+            return undefined;
+        }
+
         try {
-            return new FileContext(uri, document.documentType, document.contents());
+            return new FileContext(uri, document.documentType, content);
         } catch (error) {
             this.log.error(error, `Failed to create file context ${uri}`);
             return undefined;

src/document/Document.ts

@@ -16,15 +16,15 @@ export class Document {
     private cachedParsedContent: unknown;
 
     constructor(
-        private readonly textDocument: TextDocument,
+        public readonly uri: DocumentUri,
+        private readonly textDocument: (uri: string) => TextDocument | undefined,
         detectIndentation: boolean = true,
         fallbackTabSize: number = DefaultSettings.editor.tabSize,
-        public readonly uri: DocumentUri = textDocument.uri,
-        public readonly languageId: string = textDocument.languageId,
-        public readonly version: number = textDocument.version,
-        public readonly lineCount: number = textDocument.lineCount,
     ) {
-        const { extension, type } = detectDocumentType(textDocument.uri, textDocument.getText());
+        const doc = this.getTextDocument();
+        const { extension, type } = doc
+            ? detectDocumentType(doc.uri, doc.getText())
+            : { extension: '', type: DocumentType.YAML };
 
         this.extension = extension;
         this.documentType = type;
@@ -36,12 +36,28 @@ export class Document {
         this.processIndentation(detectIndentation, fallbackTabSize);
     }
 
+    private getTextDocument(): TextDocument | undefined {
+        return this.textDocument(this.uri);
+    }
+
+    public get languageId(): string | undefined {
+        return this.getTextDocument()?.languageId;
+    }
+
+    public get version(): number | undefined {
+        return this.getTextDocument()?.version;
+    }
+
+    public get lineCount(): number | undefined {
+        return this.getTextDocument()?.lineCount;
+    }
+
     public get cfnFileType(): CloudFormationFileType {
         return this._cfnFileType;
     }
 
     public updateCfnFileType(): void {
-        const content = this.textDocument.getText();
+        const content = this.getTextDocument()?.getText() ?? '';
         if (!content.trim()) {
             this._cfnFileType = CloudFormationFileType.Empty;
             this.cachedParsedContent = undefined;
@@ -54,14 +70,12 @@ export class Document {
         } catch {
             // If parsing fails, leave cfnFileType unchanged and clear cache
             this.cachedParsedContent = undefined;
-            this.log.debug(
-                `Failed to parse document ${this.textDocument.uri}, keeping cfnFileType as ${this._cfnFileType}`,
-            );
+            this.log.debug(`Failed to parse document ${this.uri}, keeping cfnFileType as ${this._cfnFileType}`);
         }
     }
 
     private parseContent(): unknown {
-        const content = this.textDocument.getText();
+        const content = this.getTextDocument()?.getText() ?? '';
         if (this.documentType === DocumentType.JSON) {
             return JSON.parse(content);
         }
@@ -124,27 +138,27 @@ export class Document {
     }
 
     public getText(range?: Range) {
-        return this.textDocument.getText(range);
+        return this.getTextDocument()?.getText(range);
     }
 
-    public getLines(): string[] {
-        return this.getText().split('\n');
+    public getLines(): string[] | undefined {
+        return this.getText()?.split('\n');
     }
 
     public positionAt(offset: number) {
-        return this.textDocument.positionAt(offset);
+        return this.getTextDocument()?.positionAt(offset);
     }
 
     public offsetAt(position: Position) {
-        return this.textDocument.offsetAt(position);
+        return this.getTextDocument()?.offsetAt(position);
     }
 
     public isTemplate() {
         return this.cfnFileType === CloudFormationFileType.Template;
     }
 
     public contents() {
-        return this.textDocument.getText();
+        return this.getTextDocument()?.getText();
     }
 
     public metadata(): DocumentMetadata {
@@ -154,9 +168,9 @@ export class Document {
             ext: this.extension,
             type: this.documentType,
             cfnType: this.cfnFileType,
-            languageId: this.languageId,
-            version: this.version,
-            lineCount: this.lineCount,
+            languageId: this.languageId ?? '',
+            version: this.version ?? 0,
+            lineCount: this.lineCount ?? 0,
         };
     }
 
@@ -176,6 +190,9 @@ export class Document {
 
     private detectIndentationFromContent(): number | undefined {
         const content = this.contents();
+        if (!content) {
+            return undefined;
+        }
         const lines = content.split('\n');
 
         const maxLinesToAnalyze = Math.min(lines.length, 30);

src/document/DocumentManager.ts

@@ -46,17 +46,22 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
     }
 
     get(uri: string) {
-        let document = this.documentMap.get(uri);
-        if (document) {
-            return document;
-        }
-
         const textDocument = this.documents.get(uri);
         if (!textDocument) {
             return;
         }
 
-        document = new Document(textDocument, this.editorSettings.detectIndentation, this.editorSettings.tabSize);
+        let document = this.documentMap.get(uri);
+        if (document) {
+            return document;
+        }
+
+        document = new Document(
+            uri,
+            (u) => this.documents.get(u),
+            this.editorSettings.detectIndentation,
+            this.editorSettings.tabSize,
+        );
         this.documentMap.set(uri, document);
         return document;
     }
@@ -73,7 +78,12 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
         for (const textDoc of this.documents.all()) {
             let document = this.documentMap.get(textDoc.uri);
             if (!document) {
-                document = new Document(textDoc, this.editorSettings.detectIndentation, this.editorSettings.tabSize);
+                document = new Document(
+                    textDoc.uri,
+                    (u) => this.documents.get(u),
+                    this.editorSettings.detectIndentation,
+                    this.editorSettings.tabSize,
+                );
                 this.documentMap.set(textDoc.uri, document);
             }
             allDocs.push(document);
@@ -166,7 +176,10 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
     private emitDocSizeMetrics() {
         for (const doc of this.documentMap.values()) {
             if (doc.isTemplate()) {
-                this.telemetry.histogram('documents.template.size.bytes', byteSize(doc.contents()), { unit: 'By' });
+                const content = doc.contents();
+                if (content) {
+                    this.telemetry.histogram('documents.template.size.bytes', byteSize(content), { unit: 'By' });
+                }
             }
         }
     }

src/handlers/DocumentHandler.ts

@@ -25,6 +25,10 @@ export function didOpenHandler(components: ServerComponents): (event: TextDocume
         }
 
         const content = document.contents();
+        if (!content) {
+            log.error(`No content found for document ${uri}`);
+            return;
+        }
 
         if (document.isTemplate() || document.cfnFileType === CloudFormationFileType.Empty) {
             try {
@@ -55,8 +59,12 @@ export function didChangeHandler(
         }
 
         // This is the document AFTER changes
-        const document = new Document(textDocument);
+        const document = new Document(textDocument.uri, () => textDocument);
         const finalContent = document.getText();
+        if (!finalContent) {
+            log.error(`No content found for document ${documentUri}`);
+            return;
+        }
 
         const tree = components.syntaxTreeManager.getSyntaxTree(documentUri);
 

src/handlers/StackHandler.ts

@@ -97,7 +97,7 @@ export function getTemplateArtifactsHandler(
                 components.s3Service,
                 document.documentType,
                 document.uri,
-                document.contents(),
+                document.contents() ?? '',
             );
             const artifacts = template.getTemplateArtifacts();
             return { artifacts };

src/resourceState/ResourceStateImporter.ts

@@ -114,7 +114,7 @@ export class ResourceStateImporter {
         if (insertPosition.replaceEntireFile) {
             // Replace entire file with properly formatted JSON
             snippetText = docFormattedText;
-            const endPosition = { line: document.lineCount, character: 0 };
+            const endPosition = { line: document.lineCount ?? 0, character: 0 };
             textEdit = TextEdit.replace(Range.create({ line: 0, character: 0 }, endPosition), snippetText);
         } else {
             // Insert at specific position
@@ -420,7 +420,7 @@ export class ResourceStateImporter {
                         : { line: resourcesSection.endPosition.row + 1, character: 0 };
             } else {
                 // Find the last non-empty line
-                let lastNonEmptyLine = document.lineCount - 1;
+                let lastNonEmptyLine = document.lineCount ? document.lineCount - 1 : 0;
                 while (lastNonEmptyLine >= 0 && document.getLine(lastNonEmptyLine)?.trim().length === 0) {
                     lastNonEmptyLine--;
                 }
@@ -434,12 +434,25 @@ export class ResourceStateImporter {
             };
         }
 
-        let line = resourcesSection ? resourcesSection.endPosition.row : document.lineCount - 1;
+        let line = resourcesSection
+            ? resourcesSection.endPosition.row
+            : document.lineCount
+              ? document.lineCount - 1
+              : 0;
 
         // For JSON without Resources section, check if file is essentially empty
         if (!resourcesSection) {
             try {
-                const parsed = JSON.parse(document.getText()) as Record<string, unknown>;
+                const text = document.getText();
+                if (!text) {
+                    return {
+                        position: { line: 0, character: 0 },
+                        commaPrefixNeeded: false,
+                        newLineSuffixNeeded: false,
+                        replaceEntireFile: true,
+                    };
+                }
+                const parsed = JSON.parse(text) as Record<string, unknown>;
                 const hasContent = Object.keys(parsed).length > 0;
 
                 // If no content, replace entire file
@@ -495,7 +508,7 @@ export class ResourceStateImporter {
         }
         // malformed case, allow import to end of document
         return {
-            position: { line: document.lineCount, character: 0 },
+            position: { line: document.lineCount ?? 0, character: 0 },
             commaPrefixNeeded: false,
             newLineSuffixNeeded: false,
             replaceEntireFile: false,

src/stacks/actions/StackActionOperations.ts

@@ -97,14 +97,22 @@ export async function processChangeSet(
         throw new ResponseError(ErrorCodes.InvalidParams, `Document not found: ${params.uri}`);
     }
     let templateBody = document.contents();
+    if (!templateBody) {
+        throw new ResponseError(ErrorCodes.InvalidParams, `Document content is undefined: ${params.uri}`);
+    }
     let templateS3Url: string | undefined;
     let expectedETag: string | undefined;
     try {
         if (params.s3Bucket) {
             const s3KeyPrefix = params.s3Key?.includes('/')
                 ? params.s3Key.slice(0, params.s3Key.lastIndexOf('/'))
                 : undefined;
-            const template = new ArtifactExporter(s3Service, document.documentType, document.uri, document.contents());
+            const template = new ArtifactExporter(
+                s3Service,
+                document.documentType,
+                document.uri,
+                document.contents() ?? '',
+            );
 
             const exportedTemplate = await template.export(params.s3Bucket, s3KeyPrefix);