Merge pull request #11 from posit-dev/merge/1.109.0

Merge upstream changes for 1.109.0

Author: timtmok

.claude/CLAUDE.md

@@ -0,0 +1 @@
+../.github/copilot-instructions.md

.esbuild.ts

@@ -6,21 +6,25 @@
 import * as watcher from '@parcel/watcher';
 import * as esbuild from 'esbuild';
 import * as fs from 'fs';
-import { copyFile, mkdir } from 'fs/promises';
+import { copyFile, mkdir, readdir, rename } from 'fs/promises';
 import { glob } from 'glob';
 import * as path from 'path';
 
 const REPO_ROOT = import.meta.dirname;
 const isWatch = process.argv.includes('--watch');
 const isDev = process.argv.includes('--dev');
 const isPreRelease = process.argv.includes('--prerelease');
+const generateSourceMaps = process.argv.includes('--sourcemaps');
+const sourceMapOutDir = './dist-sourcemaps';
 
 const baseBuildOptions = {
 	bundle: true,
 	logLevel: 'info',
 	minify: !isDev,
 	outdir: './dist',
-	sourcemap: isDev ? 'linked' : false,
+	// In dev mode, use linked source maps for debugging.
+	// With --sourcemaps flag, generate external source maps (no sourceMappingURL comment in output).
+	sourcemap: isDev ? 'linked' : (generateSourceMaps ? 'external' : false),
 	sourcesContent: false,
 	treeShaking: true
 } satisfies esbuild.BuildOptions;
@@ -283,6 +287,42 @@ const typeScriptServerPluginBuildOptions = {
 	]
 } satisfies esbuild.BuildOptions;
 
+/**
+ * Moves all .map files from the output directories to a separate source maps directory.
+ * This keeps source maps out of the packaged extension while making them available for upload.
+ */
+async function moveSourceMapsToSeparateDir(): Promise<void> {
+	if (!generateSourceMaps) {
+		return;
+	}
+
+	const outputDirs = [
+		'./dist',
+		'./node_modules/@vscode/copilot-typescript-server-plugin/dist',
+	];
+
+	await mkdir(sourceMapOutDir, { recursive: true });
+
+	for (const dir of outputDirs) {
+		try {
+			const files = await readdir(dir);
+			for (const file of files) {
+				if (file.endsWith('.map')) {
+					const sourcePath = path.join(dir, file);
+					// Prefix with directory name to avoid collisions
+					const prefix = dir === './dist' ? '' : 'ts-plugin-';
+					const destPath = path.join(sourceMapOutDir, prefix + file);
+					await rename(sourcePath, destPath);
+					console.log(`Moved source map: ${sourcePath} -> ${destPath}`);
+				}
+			}
+		} catch (error) {
+			// Directory might not exist in some build configurations
+			console.warn(`Could not process directory ${dir}:`, error);
+		}
+	}
+}
+
 async function main() {
 	if (!isDev) {
 		applyPackageJsonPatch(isPreRelease);
@@ -368,6 +408,9 @@ async function main() {
 			esbuild.build(typeScriptServerPluginBuildOptions),
 			esbuild.build(webviewBuildOptions),
 		]);
+
+		// Move source maps to separate directory so they're not packaged with the extension
+		await moveSourceMapsToSeparateDir();
 	}
 }
 

.github/copilot-instructions.md

@@ -75,7 +75,6 @@ You MUST check compilation output before running ANY script or declaring work co
 - **`intents/`**: Chat participant/slash command implementations
 - **`prompts/`**: Prompt engineering and template system
 - **`prompt/`**: Common prompt utilities
-- **`relatedFiles/`**: Related file discovery and context gathering
 - **`typescriptContext/`**: TypeScript-specific context and analysis
 
 **Search & Discovery:**
@@ -275,7 +274,7 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 - **GitHub**: Authentication and API access
 - **Azure**: Cloud services and experimentation
 - **OpenAI**: Language model API
-- **Anthropic**: Claude model integration
+- **Anthropic**: Claude model integration - See **[src/extension/agents/claude/AGENTS.md](../src/extension/agents/claude/AGENTS.md)** for complete Claude Agent SDK integration documentation including architecture, components, and registries
 - **Telemetry**: Usage analytics and performance monitoring
 
 ## Development Workflow
@@ -302,7 +301,6 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 - **Context resolution changes**: Check `src/extension/context/` and `src/extension/typescriptContext/`
 - **Prompt engineering**: Update `src/extension/prompts/` and `src/extension/prompt/`
 - **Intent detection**: Modify `src/extension/intents/` for user intent classification
-- **Related files discovery**: Edit `src/extension/relatedFiles/` for context gathering
 
 **Search & Discovery:**
 - **Search functionality**: Update `src/extension/search/` for general search
@@ -339,5 +337,9 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 This extension is a complex, multi-layered system that provides comprehensive AI assistance within VS Code. Understanding the service architecture, contribution system, and separation between platform and extension layers is crucial for making effective changes.
 
 ## Best Practices
-- Use services and dependency injection whenever possible instead of using node or vscode APIs directly. For example, use `IFileSystemService` instead of node's `fs`.
+- Use services and dependency injection over VS Code extension APIs when possible:
+  - Use `IFileSystemService` instead of Node's `fs` or `vscode.workspace.fs`
+  - Use `ILogService` instead of `console.log`
+  - Look for existing `I*Service` interfaces before reaching for raw APIs
+  - **Why**: Enables unit testing without VS Code host, supports simulation tests, provides cross-platform abstractions (Node vs web), and adds features like caching and size limits
 - Always use the URI type instead of using string file paths. There are many helpers available for working with URIs.

.gitignore

@@ -3,6 +3,7 @@
 .vscode-test-web/
 node_modules/
 dist/
+dist-sourcemaps/
 
 # created by simulation
 .simulation

.vscode/settings.json

@@ -149,5 +149,7 @@
 		"eslint": "warning"
 	},
 	"githubPullRequests.codingAgent.enabled": true,
-	"githubPullRequests.codingAgent.uiIntegration": true
-}
+	"githubPullRequests.codingAgent.uiIntegration": true,
+	"python-envs.defaultEnvManager": "ms-python.python:system",
+	"python-envs.pythonProjects": [],
+}

.vscodeignore

@@ -20,11 +20,15 @@ assets/walkthroughs/**
 !dist/suggestionsPanelWebview.js
 !node_modules/@vscode/copilot-typescript-server-plugin/package.json
 !node_modules/@vscode/copilot-typescript-server-plugin/dist/*.js
-!node_modules/@github/copilot/**/package.json
 node_modules/@github/copilot/index.js
+node_modules/@github/copilot/clipboard/**
+node_modules/@github/copilot/prebuilds/**
+node_modules/@github/copilot/sharp/**
+!node_modules/@github/copilot/package.json
+!node_modules/@github/copilot/sdk/**/package.json
 !node_modules/@github/copilot/sdk/*.js
 !node_modules/@github/copilot/sdk/worker/*.js
-!node_modules/@github/copilot/node_modules/**/*.js
+!node_modules/@github/copilot/sdk/sharp/**
 !CHANGELOG.md
 !README.md
 !package.json

assets/agents/Plan.agent.md

@@ -0,0 +1,50 @@
+---
+name: init
+description: Generate or update workspace instructions file for AI coding agents
+argument-hint: Optionally specify a focus area or pattern to document for agents
+agent: agent
+---
+Related skill: `agent-customization`.
+
+Generate or update workspace instructions (`.github/copilot-instructions.md` as first choice, or `AGENTS.md` if it is already present) for guiding AI coding agents in this workspace.
+
+## Discovery
+
+Search for existing AI conventions using this glob pattern: `**/{.github/copilot-instructions.md,AGENT.md,AGENTS.md,CLAUDE.md,.cursorrules,.windsurfrules,.clinerules,.cursor/rules/**,.windsurf/rules/**,.clinerules/**,README.md}`
+
+Then, start a subagent to research essential knowledge that helps an AI agent be immediately productive. Only include sections the workspace benefits from—skip any that don't apply:
+
+```markdown
+# Project Guidelines
+
+## Code Style
+{Language and formatting preferences - reference key files that exemplify patterns}
+
+## Architecture
+{Major components, service boundaries, data flows, the "why" behind structural decisions}
+
+## Build and Test
+{Commands to install, build, test - agents will attempt to run these automatically}
+
+## Project Conventions
+{Patterns that differ from common practices - include specific examples from the codebase}
+
+## Integration Points
+{External dependencies and cross-component communication}
+
+## Security
+{Sensitive areas and auth patterns}
+```
+
+## Guidelines
+
+- If `.github/copilot-instructions.md`/`AGENTS.md` exists, merge intelligently—preserve valuable content while updating outdated sections
+- If `AGENTS.md` exists, prefer updating it; for monorepos, use nested files per package (closest file to edited code wins)
+- Write concise, actionable instructions (~20-50 lines) using markdown structure
+- Link specific examples from the codebase when describing patterns
+- Reference key files/directories that exemplify important patterns
+- Avoid generic advice ("write tests", "handle errors")—focus on THIS project's specific approaches
+- Document only discoverable patterns, not aspirational practices
+- List build/test commands explicitly—agents will attempt to run them automatically
+
+Update `.github/copilot-instructions.md`/`AGENTS.md`, then ask for feedback on unclear or incomplete sections to iterate.

assets/prompts/init.prompt.md

@@ -0,0 +1,7 @@
+---
+name: plan
+description: Research and plan with the Plan agent
+agent: Plan
+argument-hint: Describe what you want to plan or research
+---
+Plan my task.

assets/prompts/plan.prompt.md

@@ -0,0 +1,70 @@
+---
+name: agent-customization
+description: 'Create, update, review, fix, or debug VS Code agent customization files (.instructions.md, .prompt.md, .agent.md, SKILL.md, copilot-instructions.md, AGENTS.md). Use for: saving coding preferences; troubleshooting why instructions/skills/agents are ignored or not invoked; configuring applyTo patterns; defining tool restrictions; creating custom agent modes or specialized workflows; packaging domain knowledge; fixing YAML frontmatter syntax.'
+---
+
+# Agent Customization
+
+## Decision Flow
+
+| Primitive | When to Use |
+|-----------|-------------|
+| Workspace Instructions | Always-on, applies everywhere in the project |
+| File Instructions | Explicit via `applyTo` patterns, or on-demand via `description` |
+| MCP | Integrates external systems, APIs, or data |
+| Custom Agents | Subagents for context isolation, or multi-stage workflows with tool restrictions |
+| Prompts | Single focused task with parameterized inputs |
+| Skills | On-demand workflow with bundled assets (scripts/templates) |
+
+## Quick Reference
+
+Consult the reference docs for templates, domain examples, advanced frontmatter options, asset organization, anti-patterns, and creation checklists.
+
+| Type | File | Location | Key Field | Reference |
+|------|------|----------|-----------|---------|
+| Workspace Instructions | `copilot-instructions.md`, `AGENTS.md` | `.github/` or root | N/A (always applies) | [Link](./primitives/workspace-instructions.md) |
+| File Instructions | `*.instructions.md` | `.github/instructions/` | `applyTo` (explicit), `description` (on-demand) | [Link](./primitives/instructions.md) |
+| Prompts | `*.prompt.md` | `.github/prompts/` | `description` (user-invoked) | [Link](./primitives/prompts.md) |
+| Custom Agents | `*.agent.md` | `.github/agents/` | `description` (on-demand), `infer` (subagent) | [Link](./primitives/agents.md) |
+| Skills | `SKILL.md` | `.github/skills/<name>/` | `description` (on-demand) | [Link](./primitives/skills.md) |
+
+**User-level**: `{{USER_PROMPTS_FOLDER}}/` (*.prompt.md, *.instructions.md, *.agent.md; not skills)
+Customizations roam with user's settings sync
+
+## Creation Process
+
+If you need to explore or validate patterns in the codebase, use a read-only subagent. If the ask-questions tool is available, use it to interview the user and clarify requirements.
+
+Follow these steps when creating any customization file.
+
+### 1. Determine Scope
+
+Ask the user where they want the customization:
+- **Workspace**: For project-specific, team-shared customizations → `.github/` folder
+- **User profile**: For personal, cross-workspace customizations → `{{USER_PROMPTS_FOLDER}}/`
+
+### 2. Choose the Right Primitive
+
+Use the Decision Flow above to select the appropriate file type based on the user's need.
+
+### 3. Create the File
+
+Create the file directly at the appropriate path:
+- Use the location tables in each reference file
+- Include required frontmatter as needed
+- Add the body content following the templates
+
+### 4. Validate
+
+After creating:
+- Confirm the file is in the correct location
+- Verify frontmatter syntax (YAML between `---` markers)
+- Check that `description` is present and meaningful
+
+## Edge Cases
+
+**Instructions vs Skill?** Does this apply to *most* work, or *specific* tasks? Most → Instructions. Specific → Skill.
+
+**Skill vs Prompt?** Multi-step workflow with bundled assets → Skill. Single focused task with inputs → Prompt.
+
+**Skill vs Custom Agent?** Same capabilities for all steps → Skill. Need context isolation (subagent returns single output) or different tool restrictions per stage → Custom Agent.