gsd-pi 2.77.0-dev.538325aea → 2.77.0-dev.58d3d4d6c

package/pkg/dist/core/export-html/tool-renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-renderer.js","sourceRoot":"","sources":["../../src/export-html/tool-renderer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAuBpD;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA0B;IAChE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;IAEvD,OAAO;QACN,UAAU,CAAC,QAAgB,EAAE,IAAa;YACzC,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;oBAC1B,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAEA,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACnD,IAAI,CAAC,SAAS,EAAE,CAAC;oBAChB,OAAO,SAAS,CAAC;gBAClB,CAAC;gBACD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtC,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACR,sDAAsD;gBACtD,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;QAED,YAAY,CACX,QAAgB,EAChB,MAAgF,EAChF,OAAgB,EAChB,OAAgB;YAEhB,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;oBAC5B,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,2CAA2C;gBAC3C,+DAA+D;gBAC/D,MAAM,eAAe,GAAG;oBACvB,OAAO,EAAE,MAAwC;oBACjD,OAAO;oBACP,OAAO;iBACP,CAAC;gBAED,mBAAmB;gBACnB,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAC9C,eAAe,EACf,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EACrC,KAAK,CACL,CAAC;gBACH,MAAM,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAErG,kBAAkB;gBACjB,MAAM,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAC7C,eAAe,EACf,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,EACpC,KAAK,CACL,CAAC;gBACH,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAElG,+DAA+D;gBAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACf,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,OAAO;oBACN,GAAG,CAAC,SAAS,IAAI,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7D,QAAQ;iBACR,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACR,sDAAsD;gBACtD,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC","sourcesContent":["/**\n * Tool HTML renderer for custom tools in HTML export.\n *\n * Renders custom tool calls and results to HTML by invoking their TUI renderers\n * and converting the ANSI output to HTML.\n */\n\nimport type { ImageContent, TextContent } from \"@gsd/pi-ai\";\nimport type { Theme } from \"@gsd/agent-types\";\nimport type { ToolDefinition } from \"@gsd/agent-types\";\nimport { ansiLinesToHtml } from \"./ansi-to-html.js\";\n\nexport interface ToolHtmlRendererDeps {\n\t/** Function to look up tool definition by name */\n\tgetToolDefinition: (name: string) => ToolDefinition | undefined;\n\t/** Theme for styling */\n\ttheme: Theme;\n\t/** Terminal width for rendering (default: 100) */\n\twidth?: number;\n}\n\nexport interface ToolHtmlRenderer {\n\t/** Render a tool call to HTML. Returns undefined if tool has no custom renderer. */\n\trenderCall(toolName: string, args: unknown): string | undefined;\n\t/** Render a tool result to collapsed/expanded HTML. Returns undefined if tool has no custom renderer. */\n\trenderResult(\n\t\ttoolName: string,\n\t\tresult: Array<{ type: string; text?: string; data?: string; mimeType?: string }>,\n\t\tdetails: unknown,\n\t\tisError: boolean,\n\t): { collapsed?: string; expanded?: string } | undefined;\n}\n\n/**\n * Create a tool HTML renderer.\n *\n * The renderer looks up tool definitions and invokes their renderCall/renderResult\n * methods, converting the resulting TUI Component output (ANSI) to HTML.\n */\nexport function createToolHtmlRenderer(deps: ToolHtmlRendererDeps): ToolHtmlRenderer {\n\tconst { getToolDefinition, theme, width = 100 } = deps;\n\n\treturn {\n\t\trenderCall(toolName: string, args: unknown): string | undefined {\n\t\t\ttry {\n\t\t\t\tconst toolDef = getToolDefinition(toolName);\n\t\t\t\tif (!toolDef?.renderCall) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\t\tconst component = toolDef.renderCall(args, theme);\n\t\t\t\tif (!component) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\t\t\t\tconst lines = component.render(width);\n\t\t\t\treturn ansiLinesToHtml(lines);\n\t\t\t} catch {\n\t\t\t\t// On error, return undefined to trigger JSON fallback\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t},\n\n\t\trenderResult(\n\t\t\ttoolName: string,\n\t\t\tresult: Array<{ type: string; text?: string; data?: string; mimeType?: string }>,\n\t\t\tdetails: unknown,\n\t\t\tisError: boolean,\n\t\t): { collapsed?: string; expanded?: string } | undefined {\n\t\t\ttry {\n\t\t\t\tconst toolDef = getToolDefinition(toolName);\n\t\t\t\tif (!toolDef?.renderResult) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\t// Build AgentToolResult from content array\n\t\t\t\t// Cast content since session storage uses generic object types\n\t\t\t\tconst agentToolResult = {\n\t\t\t\t\tcontent: result as (TextContent | ImageContent)[],\n\t\t\t\t\tdetails,\n\t\t\t\t\tisError,\n\t\t\t\t};\n\n\t\t\t\t\t// Render collapsed\n\t\t\t\t\tconst collapsedComponent = toolDef.renderResult(\n\t\t\t\t\t\tagentToolResult,\n\t\t\t\t\t\t{ expanded: false, isPartial: false },\n\t\t\t\t\t\ttheme,\n\t\t\t\t\t);\n\t\t\t\tconst collapsed = collapsedComponent ? ansiLinesToHtml(collapsedComponent.render(width)) : undefined;\n\n\t\t\t\t// Render expanded\n\t\t\t\t\tconst expandedComponent = toolDef.renderResult(\n\t\t\t\t\t\tagentToolResult,\n\t\t\t\t\t\t{ expanded: true, isPartial: false },\n\t\t\t\t\t\ttheme,\n\t\t\t\t\t);\n\t\t\t\tconst expanded = expandedComponent ? ansiLinesToHtml(expandedComponent.render(width)) : undefined;\n\n\t\t\t\t// Return collapsed only if it exists and differs from expanded\n\t\t\t\tif (!expanded) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\treturn {\n\t\t\t\t\t...(collapsed && collapsed !== expanded ? { collapsed } : {}),\n\t\t\t\t\texpanded,\n\t\t\t\t};\n\t\t\t} catch {\n\t\t\t\t// On error, return undefined to trigger JSON fallback\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t},\n\t};\n}\n"]}
+{"version":3,"file":"tool-renderer.js","sourceRoot":"","sources":["../../../src/core/export-html/tool-renderer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAuBpD;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAA0B;IAChE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;IAEvD,OAAO;QACN,UAAU,CAAC,QAAgB,EAAE,IAAa;YACzC,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;oBAC1B,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAClD,IAAI,CAAC,SAAS,EAAE,CAAC;oBAChB,OAAO,SAAS,CAAC;gBAClB,CAAC;gBACD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtC,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACR,sDAAsD;gBACtD,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;QAED,YAAY,CACX,QAAgB,EAChB,MAAgF,EAChF,OAAgB,EAChB,OAAgB;YAEhB,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;oBAC5B,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,2CAA2C;gBAC3C,+DAA+D;gBAC/D,MAAM,eAAe,GAAG;oBACvB,OAAO,EAAE,MAAwC;oBACjD,OAAO;oBACP,OAAO;iBACP,CAAC;gBAEF,mBAAmB;gBACnB,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAC9C,eAAe,EACf,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EACrC,KAAK,CACL,CAAC;gBACF,MAAM,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAErG,kBAAkB;gBAClB,MAAM,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAC7C,eAAe,EACf,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,EACpC,KAAK,CACL,CAAC;gBACF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAElG,+DAA+D;gBAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACf,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,OAAO;oBACN,GAAG,CAAC,SAAS,IAAI,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7D,QAAQ;iBACR,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACR,sDAAsD;gBACtD,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;KACD,CAAC;AACH,CAAC","sourcesContent":["/**\n * Tool HTML renderer for custom tools in HTML export.\n *\n * Renders custom tool calls and results to HTML by invoking their TUI renderers\n * and converting the ANSI output to HTML.\n */\n\nimport type { ImageContent, TextContent } from \"@gsd/pi-ai\";\nimport type { Theme } from \"../../modes/interactive/theme/theme.js\";\nimport type { ToolDefinition } from \"../extensions/types.js\";\nimport { ansiLinesToHtml } from \"./ansi-to-html.js\";\n\nexport interface ToolHtmlRendererDeps {\n\t/** Function to look up tool definition by name */\n\tgetToolDefinition: (name: string) => ToolDefinition | undefined;\n\t/** Theme for styling */\n\ttheme: Theme;\n\t/** Terminal width for rendering (default: 100) */\n\twidth?: number;\n}\n\nexport interface ToolHtmlRenderer {\n\t/** Render a tool call to HTML. Returns undefined if tool has no custom renderer. */\n\trenderCall(toolName: string, args: unknown): string | undefined;\n\t/** Render a tool result to collapsed/expanded HTML. Returns undefined if tool has no custom renderer. */\n\trenderResult(\n\t\ttoolName: string,\n\t\tresult: Array<{ type: string; text?: string; data?: string; mimeType?: string }>,\n\t\tdetails: unknown,\n\t\tisError: boolean,\n\t): { collapsed?: string; expanded?: string } | undefined;\n}\n\n/**\n * Create a tool HTML renderer.\n *\n * The renderer looks up tool definitions and invokes their renderCall/renderResult\n * methods, converting the resulting TUI Component output (ANSI) to HTML.\n */\nexport function createToolHtmlRenderer(deps: ToolHtmlRendererDeps): ToolHtmlRenderer {\n\tconst { getToolDefinition, theme, width = 100 } = deps;\n\n\treturn {\n\t\trenderCall(toolName: string, args: unknown): string | undefined {\n\t\t\ttry {\n\t\t\t\tconst toolDef = getToolDefinition(toolName);\n\t\t\t\tif (!toolDef?.renderCall) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\tconst component = toolDef.renderCall(args, theme);\n\t\t\t\tif (!component) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\t\t\t\tconst lines = component.render(width);\n\t\t\t\treturn ansiLinesToHtml(lines);\n\t\t\t} catch {\n\t\t\t\t// On error, return undefined to trigger JSON fallback\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t},\n\n\t\trenderResult(\n\t\t\ttoolName: string,\n\t\t\tresult: Array<{ type: string; text?: string; data?: string; mimeType?: string }>,\n\t\t\tdetails: unknown,\n\t\t\tisError: boolean,\n\t\t): { collapsed?: string; expanded?: string } | undefined {\n\t\t\ttry {\n\t\t\t\tconst toolDef = getToolDefinition(toolName);\n\t\t\t\tif (!toolDef?.renderResult) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\t// Build AgentToolResult from content array\n\t\t\t\t// Cast content since session storage uses generic object types\n\t\t\t\tconst agentToolResult = {\n\t\t\t\t\tcontent: result as (TextContent | ImageContent)[],\n\t\t\t\t\tdetails,\n\t\t\t\t\tisError,\n\t\t\t\t};\n\n\t\t\t\t// Render collapsed\n\t\t\t\tconst collapsedComponent = toolDef.renderResult(\n\t\t\t\t\tagentToolResult,\n\t\t\t\t\t{ expanded: false, isPartial: false },\n\t\t\t\t\ttheme,\n\t\t\t\t);\n\t\t\t\tconst collapsed = collapsedComponent ? ansiLinesToHtml(collapsedComponent.render(width)) : undefined;\n\n\t\t\t\t// Render expanded\n\t\t\t\tconst expandedComponent = toolDef.renderResult(\n\t\t\t\t\tagentToolResult,\n\t\t\t\t\t{ expanded: true, isPartial: false },\n\t\t\t\t\ttheme,\n\t\t\t\t);\n\t\t\t\tconst expanded = expandedComponent ? ansiLinesToHtml(expandedComponent.render(width)) : undefined;\n\n\t\t\t\t// Return collapsed only if it exists and differs from expanded\n\t\t\t\tif (!expanded) {\n\t\t\t\t\treturn undefined;\n\t\t\t\t}\n\n\t\t\t\treturn {\n\t\t\t\t\t...(collapsed && collapsed !== expanded ? { collapsed } : {}),\n\t\t\t\t\texpanded,\n\t\t\t\t};\n\t\t\t} catch {\n\t\t\t\t// On error, return undefined to trigger JSON fallback\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t},\n\t};\n}\n"]}

package/scripts/ensure-workspace-builds.cjs

@@ -97,8 +97,6 @@ if (require.main === module) {
     'pi-ai',
     'pi-agent-core',
     'pi-coding-agent',
-    'gsd-agent-core',
-    'gsd-agent-modes',
     'rpc-client',
     'mcp-server',
   ]

package/scripts/lib/workspace-manifest.cjs

@@ -0,0 +1,86 @@
+// GSD-2 + scripts/lib/workspace-manifest.cjs — single source of truth for linkable @gsd/* packages
+'use strict'
+
+const { readdirSync, readFileSync, existsSync, statSync } = require('fs')
+const { join, resolve } = require('path')
+
+const REPO_ROOT = resolve(__dirname, '..', '..')
+const PACKAGES_DIR = join(REPO_ROOT, 'packages')
+
+/**
+ * Returns the canonical list of linkable workspace packages.
+ *
+ * A package is "linkable" if its `package.json` contains:
+ *   { "gsd": { "linkable": true, "scope": "@gsd" | "@gsd-build", "name": "<pkgname>" } }
+ *
+ * Each returned entry has:
+ *   - dir: directory name under packages/ (e.g. "gsd-agent-core")
+ *   - scope: "@gsd" or "@gsd-build"
+ *   - name: unscoped package name (e.g. "agent-core")
+ *   - packageName: scoped name (e.g. "@gsd/agent-core")
+ *   - path: absolute path to package directory
+ *   - packageJsonPath: absolute path to its package.json
+ *
+ * Used by:
+ *   - scripts/link-workspace-packages.cjs (node_modules linkage)
+ *   - src/loader.ts (via scripts/generate-ws-packages.cjs)
+ *   - scripts/validate-pack.js (pack-install smoke checks)
+ *   - scripts/verify-workspace-coverage.cjs (CI coverage gate)
+ */
+function getLinkablePackages() {
+	if (!existsSync(PACKAGES_DIR)) return []
+	const entries = readdirSync(PACKAGES_DIR)
+	const out = []
+	for (const dir of entries) {
+		const pkgPath = join(PACKAGES_DIR, dir)
+		if (!statSync(pkgPath).isDirectory()) continue
+		const pkgJsonPath = join(pkgPath, 'package.json')
+		if (!existsSync(pkgJsonPath)) continue
+		let pkg
+		try {
+			pkg = JSON.parse(readFileSync(pkgJsonPath, 'utf8'))
+		} catch (err) {
+			throw new Error(`Invalid package.json at ${pkgJsonPath}: ${err.message}`)
+		}
+		const gsd = pkg.gsd
+		if (!gsd || gsd.linkable !== true) continue
+		if (!gsd.scope || !gsd.name) {
+			throw new Error(
+				`${pkgJsonPath}: "gsd.linkable" is true but "gsd.scope" or "gsd.name" is missing.`
+			)
+		}
+		if (gsd.scope !== '@gsd' && gsd.scope !== '@gsd-build') {
+			throw new Error(
+				`${pkgJsonPath}: "gsd.scope" must be "@gsd" or "@gsd-build" (got "${gsd.scope}").`
+			)
+		}
+		const expectedName = `${gsd.scope}/${gsd.name}`
+		if (pkg.name !== expectedName) {
+			throw new Error(
+				`${pkgJsonPath}: package.json "name" (${pkg.name}) does not match gsd.scope/gsd.name (${expectedName}).`
+			)
+		}
+		out.push({
+			dir,
+			scope: gsd.scope,
+			name: gsd.name,
+			packageName: pkg.name,
+			path: pkgPath,
+			packageJsonPath: pkgJsonPath,
+		})
+	}
+	out.sort((a, b) => a.packageName.localeCompare(b.packageName))
+	return out
+}
+
+/** Returns only packages in the `@gsd` scope (excludes `@gsd-build`). */
+function getCorePackages() {
+	return getLinkablePackages().filter((p) => p.scope === '@gsd')
+}
+
+module.exports = {
+	REPO_ROOT,
+	PACKAGES_DIR,
+	getLinkablePackages,
+	getCorePackages,
+}

package/scripts/link-workspace-packages.cjs

@@ -18,25 +18,11 @@
  */
 const { existsSync, mkdirSync, symlinkSync, cpSync, lstatSync, readlinkSync, unlinkSync } = require('fs')
 const { resolve, join } = require('path')
+const { getLinkablePackages, REPO_ROOT } = require('./lib/workspace-manifest.cjs')
 
-const root = resolve(__dirname, '..')
-const packagesDir = join(root, 'packages')
 const scopeDirs = {
-  '@gsd': join(root, 'node_modules', '@gsd'),
-  '@gsd-build': join(root, 'node_modules', '@gsd-build'),
-}
-
-// Map directory names to scoped package names
-const packageMap = {
-  'native': { scope: '@gsd', name: 'native' },
-  'pi-agent-core': { scope: '@gsd', name: 'pi-agent-core' },
-  'pi-ai': { scope: '@gsd', name: 'pi-ai' },
-  'pi-coding-agent': { scope: '@gsd', name: 'pi-coding-agent' },
-  'pi-tui': { scope: '@gsd', name: 'pi-tui' },
-  'gsd-agent-core': { scope: '@gsd', name: 'agent-core' },
-  'gsd-agent-modes': { scope: '@gsd', name: 'agent-modes' },
-  'rpc-client': { scope: '@gsd-build', name: 'rpc-client' },
-  'mcp-server': { scope: '@gsd-build', name: 'mcp-server' },
+  '@gsd': join(REPO_ROOT, 'node_modules', '@gsd'),
+  '@gsd-build': join(REPO_ROOT, 'node_modules', '@gsd-build'),
 }
 
 for (const scopeDir of Object.values(scopeDirs)) {
@@ -47,8 +33,8 @@ for (const scopeDir of Object.values(scopeDirs)) {
 
 let linked = 0
 let copied = 0
-for (const [dir, pkg] of Object.entries(packageMap)) {
-  const source = join(packagesDir, dir)
+for (const pkg of getLinkablePackages()) {
+  const source = pkg.path
   const scopeDir = scopeDirs[pkg.scope]
   const target = join(scopeDir, pkg.name)
 

package/src/resources/extensions/async-jobs/async-bash-tool.ts

@@ -9,9 +9,9 @@
 import type { ToolDefinition } from "@gsd/pi-coding-agent";
 import {
 	getShellConfig,
+	sanitizeCommand,
 	DEFAULT_MAX_BYTES,
 	DEFAULT_MAX_LINES,
-	sanitizeCommand,
 } from "@gsd/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import { spawn, spawnSync } from "node:child_process";

package/src/resources/extensions/aws-auth/index.ts

@@ -139,7 +139,6 @@ export default function (pi: ExtensionAPI) {
 		const refreshed = await runRefresh(refreshCommand, (m, level) => ctx.ui.notify(m, level));
 		if (!refreshed) return;
 
-		// retryLastTurn removed in pi 0.67.2 — notify user to retry manually
-		ctx.ui.notify("AWS credentials refreshed. Please resend your message to retry.", "info");
+		pi.retryLastTurn();
 	});
 }

package/src/resources/extensions/bg-shell/bg-shell-lifecycle.ts

@@ -94,10 +94,13 @@ export function registerBgShellLifecycle(pi: ExtensionAPI, state: BgShellSharedS
 	});
 
 	// Session switch resets the agent's context.
-	pi.on("session_start", async (_event, ctx) => {
+	pi.on("session_switch", async (event, ctx) => {
 		state.latestCtx = ctx;
-		syncLatestCtxCwd();
-		if (state.latestCtx) persistManifest(state.latestCtx.cwd);
+		if (event.reason === "new" && event.previousSessionFile) {
+			await cleanupSessionProcesses(event.previousSessionFile);
+			syncLatestCtxCwd();
+			if (state.latestCtx) persistManifest(state.latestCtx.cwd);
+		}
 		buildProcessStateAlert("Session was switched.");
 	});
 
@@ -390,7 +393,7 @@ export function registerBgShellLifecycle(pi: ExtensionAPI, state: BgShellSharedS
 	pi.on("turn_end", refreshHandler as any);
 	pi.on("agent_end", refreshHandler as any);
 	pi.on("session_start", refreshHandler as any);
-	pi.on("session_before_switch", refreshHandler as any);
+	pi.on("session_switch", refreshHandler as any);
 
 	pi.on("tool_execution_end", async (_event, ctx) => {
 		state.latestCtx = ctx;

package/src/resources/extensions/bg-shell/index.ts

@@ -5,8 +5,7 @@
  * block on the full background-process stack before the TUI paints.
  */
 
-import { type ExtensionAPI, type ExtensionContext } from "@gsd/pi-coding-agent";
-import { importExtensionModule } from "@gsd/pi-coding-agent";
+import { importExtensionModule, type ExtensionAPI, type ExtensionContext } from "@gsd/pi-coding-agent";
 import { registerBgShellLifecycle } from "./bg-shell-lifecycle.js";
 
 export interface BgShellSharedState {

package/src/resources/extensions/bg-shell/process-manager.ts

@@ -7,8 +7,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { writeFileSync, readFileSync, existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
-import { getShellConfig } from "@gsd/pi-coding-agent";
-import { sanitizeCommand } from "@gsd/pi-coding-agent";
+import { getShellConfig, sanitizeCommand } from "@gsd/pi-coding-agent";
 import { rewriteCommandWithRtk } from "../shared/rtk.js";
 import type {
 	BgProcess,

package/src/resources/extensions/browser-tools/index.ts

@@ -1,6 +1,5 @@
 /** browser-tools — pi extension: full browser interaction via Playwright. */
-import { type ExtensionAPI } from "@gsd/pi-coding-agent";
-import { importExtensionModule } from "@gsd/pi-coding-agent";
+import { importExtensionModule, type ExtensionAPI } from "@gsd/pi-coding-agent";
 
 let registrationPromise: Promise<void> | null = null;
 

package/src/resources/extensions/claude-code-cli/index.ts

@@ -19,9 +19,9 @@ import { streamViaClaudeCode } from "./stream-adapter.js";
 export default function claudeCodeCli(pi: ExtensionAPI) {
 	pi.registerProvider("claude-code", {
 		authMode: "externalCli",
-		isReady: isClaudeCodeReady,
 		api: "anthropic-messages",
 		baseUrl: "local://claude-code",
+		isReady: isClaudeCodeReady,
 		streamSimple: streamViaClaudeCode,
 		models: CLAUDE_CODE_MODELS,
 	});

package/src/resources/extensions/claude-code-cli/partial-builder.ts

@@ -8,116 +8,17 @@
 import type {
 	AssistantMessage,
 	AssistantMessageEvent,
+	ServerToolUseContent,
 	StopReason,
 	TextContent,
 	ThinkingContent,
 	ToolCall,
 	Usage,
+	WebSearchResultContent,
 } from "@gsd/pi-ai";
+import { hasXmlParameterTags, repairToolJson } from "@gsd/pi-ai";
 import type { BetaContentBlock, BetaRawMessageStreamEvent, NonNullableUsage } from "./sdk-types.js";
 
-// ---------------------------------------------------------------------------
-// XML parameter tag utilities (inline replacements for removed pi-ai symbols)
-// ---------------------------------------------------------------------------
-
-/**
- * Detects XML parameter tags (inline <parameter name="...">...</parameter> form)
- * or XML wrapper (<parameters>...</parameters>) in streaming tool call JSON.
- * Replaces removed pi-ai utility (removed in pi 0.67.2).
- * T-10-05: regex only detects tag presence; does not evaluate content.
- */
-function hasXmlParameterTags(s: string): boolean {
-	return /<parameter[s\s>]/i.test(s);
-}
-
-/**
- * Repairs malformed LLM-generated tool JSON using three strategies:
- *
- * 1. XML parameter extraction: When inline <parameter name="key">value</parameter>
- *    tags appear inside a JSON string value, extract each as a top-level key and
- *    clean the containing string value by truncating at the closing tag boundary.
- *
- * 2. YAML bullet repair: When bare "- item" patterns appear as JSON values (not
- *    quoted), convert each bullet sequence into a JSON array.
- *
- * 3. XML wrapper extraction: Extract content from <parameters>...</parameters> wrapper.
- *
- * Replaces removed pi-ai utility (removed in pi 0.67.2).
- * T-10-05: extracts text content only, no evaluation.
- */
-function repairToolJson(s: string): string {
-	// Strategy 1: XML parameter tags inside JSON string values (#3751)
-	// The raw JSON string may have escaped quotes: <parameter name=\"key\">val</parameter>
-	// or unescaped: <parameter name="key">val</parameter>
-	// We match both forms.
-	if (/<parameter\s+name=/i.test(s)) {
-		try {
-			// Match <parameter name="key"> or <parameter name=\"key\"> in raw JSON text
-			const paramPattern = /<parameter\s+name=(?:\\"|")([^"\\]+)(?:\\"|")>([\s\S]*?)<\/parameter>/gi;
-			const extracted: Record<string, unknown> = {};
-			let match: RegExpExecArray | null;
-			while ((match = paramPattern.exec(s)) !== null) {
-				const key = match[1];
-				// rawVal may contain JSON-escaped characters; unescape for parsing
-				const rawVal = match[2].trim().replace(/\\"/g, '"').replace(/\\n/g, "\n");
-				// Attempt to parse value as JSON; fall back to string
-				try {
-					extracted[key] = JSON.parse(rawVal);
-				} catch {
-					extracted[key] = rawVal;
-				}
-			}
-
-			if (Object.keys(extracted).length > 0) {
-				// Remove the XML parameter block and preceding closing tag from the raw string.
-				// The block looks like: </tagName>\n<parameter ...>...</parameter>...\n (with escaped chars)
-				// We remove from the first </...> closing tag through the last </parameter> tag.
-				const cleaned = s
-					.replace(/<\/[^>]+>(?:\\n|\n)*(?:<parameter[\s\S]*?<\/parameter>(?:\\n|\n)*)+/gi, "")
-					.trim();
-
-				// Parse cleaned base JSON and merge extracted params
-				const base = JSON.parse(cleaned) as Record<string, unknown>;
-				return JSON.stringify({ ...base, ...extracted });
-			}
-		} catch {
-			// Fall through to next strategy
-		}
-	}
-
-	// Strategy 2: YAML bullet lists as unquoted JSON values (#2660)
-	// Pattern: "key": - item1, "key2": - item2
-	if (/:\s*-\s+/.test(s)) {
-		try {
-			// Replace bare YAML bullet sequences with JSON arrays.
-			// Match: "key": - val1, - val2, "nextKey" or end
-			// We need to handle: "key": - item, "nextKey" where - item is the unquoted value
-			const repaired = s.replace(
-				// Match a quoted key followed by colon, then one or more "- item" bullets
-				// terminated by either a comma+quote (next key) or closing brace
-				/"([^"]+)":\s*((?:-\s+[^,\n\-"{}[\]]+(?:,\s*(?![-"\s*{]))?)+)/g,
-				(fullMatch: string, key: string, bulletBlock: string) => {
-					// Extract individual bullet items
-					const items = bulletBlock
-						.split(/,?\s*-\s+/)
-						.map((item: string) => item.trim().replace(/,\s*$/, "").trim())
-						.filter((item: string) => item.length > 0);
-					if (items.length === 0) return fullMatch;
-					return `"${key}": ${JSON.stringify(items)}`;
-				},
-			);
-			const parsed = JSON.parse(repaired);
-			return JSON.stringify(parsed);
-		} catch {
-			// Fall through to next strategy
-		}
-	}
-
-	// Strategy 3: XML wrapper extraction (<parameters>...</parameters>)
-	const m = /<parameters[^>]*>([\s\S]*?)<\/parameters>/i.exec(s);
-	return m ? m[1].trim() : s;
-}
-
 // ---------------------------------------------------------------------------
 // MCP tool name parsing
 // ---------------------------------------------------------------------------
@@ -170,7 +71,7 @@ function toolCallFromBlock(
  */
 export function mapContentBlock(
 	block: BetaContentBlock,
-): TextContent | ThinkingContent | ToolCall {
+): TextContent | ThinkingContent | ToolCall | ServerToolUseContent | WebSearchResultContent {
 	switch (block.type) {
 		case "text":
 			return { type: "text", text: block.text } satisfies TextContent;
@@ -186,18 +87,19 @@ export function mapContentBlock(
 			return toolCallFromBlock(block.id, block.name, block.input);
 
 		case "server_tool_use":
-			// ServerToolUseContent removed from pi-ai in pi 0.67.2 — represent as text
 			return {
-				type: "text",
-				text: `[server tool use: ${(block as Record<string, unknown>).name ?? "unknown"}]`,
-			} satisfies TextContent;
+				type: "serverToolUse",
+				id: block.id,
+				name: block.name,
+				input: block.input,
+			} satisfies ServerToolUseContent;
 
 		case "web_search_tool_result":
-			// WebSearchResultContent removed from pi-ai in pi 0.67.2 — represent as text
 			return {
-				type: "text",
-				text: `[web search result]`,
-			} satisfies TextContent;
+				type: "webSearchResult",
+				toolUseId: block.tool_use_id,
+				content: block.content,
+			} satisfies WebSearchResultContent;
 
 		default: {
 			const unknown = block as Record<string, unknown>;
@@ -322,7 +224,15 @@ export class PartialMessageBuilder {
 					this.partial.content.push(toolCallFromBlock(block.id, block.name, {}));
 					return { type: "toolcall_start", contentIndex, partial: this.partial };
 				}
-				// server_tool_use removed from pi-ai content types in pi 0.67.2 — skip
+				if (block.type === "server_tool_use") {
+					this.partial.content.push({
+						type: "serverToolUse",
+						id: block.id,
+						name: block.name,
+						input: block.input,
+					});
+					return { type: "server_tool_use", contentIndex, partial: this.partial };
+				}
 				return null;
 			}
 
@@ -379,9 +289,7 @@ export class PartialMessageBuilder {
 							// malformation explicitly so downstream consumers can
 							// distinguish this from a healthy tool completion (#2574).
 							block.arguments = { _raw: jsonStr };
-							// malformedArguments removed from the toolcall_end type in pi 0.67.2;
-							// cast to any to preserve the runtime signal for downstream consumers (#2574)
-							return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true } as any;
+							return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial, malformedArguments: true };
 						}
 					}
 					return { type: "toolcall_end", contentIndex, toolCall: block, partial: this.partial };

package/src/resources/extensions/claude-code-cli/stream-adapter.ts

@@ -3,8 +3,9 @@
  *
  * The SDK runs the full agentic loop (multi-turn, tool execution, compaction)
  * in one call. This adapter translates the SDK's streaming output into
- * AssistantMessageEvents for TUI rendering, then strips tool-call blocks from
- * the final AssistantMessage so GSD's agent loop doesn't try to dispatch them.
+ * AssistantMessageEvents for TUI rendering, then preserves externally executed
+ * tool-call blocks on the final AssistantMessage so Agent Core can render them
+ * while `externalToolExecution` prevents local redispatch.
  */
 
 import type {
@@ -548,9 +549,8 @@ async function promptElicitationWithDialogs(
 		const title = buildElicitationPromptTitle(request, question);
 
 		if (question.allowMultiple) {
-			// allowMultiple removed from ExtensionUIDialogOptions in pi 0.67.2;
-			// fall back to single-select (result is wrapped in array below)
 			const selected = await ui.select(title, question.options.map((option) => option.label), {
+				allowMultiple: true,
 				signal,
 			});
 			if (Array.isArray(selected)) {
@@ -723,7 +723,7 @@ export async function resolveClaudePermissionMode(
 		);
 		return "bypassPermissions";
 	}
-	return "acceptEdits";
+	return "bypassPermissions";
 }
 
 // NOTE: These helpers intentionally mirror @gsd/pi-ai anthropic-shared
@@ -783,21 +783,25 @@ export function buildSdkOptions(
 ): Record<string, unknown> {
 	const { reasoning, ...sdkExtraOptions } = extraOptions;
 	const mcpServers = buildWorkflowMcpServers();
-	const permissionMode = overrides?.permissionMode ?? "acceptEdits";
-	const disallowedTools = ["AskUserQuestion"];
-	// Pre-authorize the safe built-ins and every registered workflow MCP
-	// server's tools. `acceptEdits` mode (the interactive default) only
-	// auto-approves file edits — Read/Glob/Grep, basic shell inspection, and
-	// every `mcp__gsd-workflow__*` call still surface as "This command
-	// requires approval" and block GSD actions (#4099).
+	const permissionMode = overrides?.permissionMode ?? "bypassPermissions";
+	// Globally unblock all tools. Users reported that the `acceptEdits` default
+	// plus a narrow allowlist silently declined most Bash/Agent/WebFetch calls
+	// when `extensionUIContext` wasn't threaded through. Default to
+	// bypassPermissions and an empty disallow list so every tool — including
+	// `AskUserQuestion` and every `mcp__*` workflow tool — is auto-approved.
+	// Opt back into gated mode with GSD_CLAUDE_CODE_PERMISSION_MODE=acceptEdits.
+	const disallowedTools: string[] = [];
 	const allowedTools = [
 		"Read",
 		"Write",
 		"Edit",
 		"Glob",
 		"Grep",
-		"Bash(ls:*)",
-		"Bash(pwd)",
+		"Bash",
+		"Agent",
+		"WebFetch",
+		"WebSearch",
+		"AskUserQuestion",
 		...(mcpServers ? Object.keys(mcpServers).map((serverName) => `mcp__${serverName}__*`) : []),
 	];
 	const supportsAdaptive = modelSupportsAdaptiveThinking(modelId);
@@ -998,14 +1002,56 @@ function attachExternalResultsToToolBlocks(
 	toolResultsById: ReadonlyMap<string, ExternalToolResultPayload>,
 ): void {
 	for (const block of toolBlocks) {
-		// serverToolUse removed from AssistantMessage content in pi 0.67.2
-		if (block.type !== "toolCall") continue;
+		if (block.type !== "toolCall" && block.type !== "serverToolUse") continue;
 		const externalResult = toolResultsById.get(block.id);
 		if (!externalResult) continue;
 		(block as ToolCallWithExternalResult & { id: string }).externalResult = externalResult;
 	}
 }
 
+/**
+ * Build the final assistant content that Agent Core consumes in
+ * `externalToolExecution` mode. This preserves tool-call blocks, attaches any
+ * SDK-produced external results by tool-call id, and then appends the final
+ * text/thinking blocks for the completed turn.
+ */
+export function buildFinalAssistantContent(params: {
+	intermediateToolBlocks: AssistantMessage["content"];
+	pendingContent?: AssistantMessage["content"];
+	toolResultsById: ReadonlyMap<string, ExternalToolResultPayload>;
+	lastThinkingContent?: string;
+	lastTextContent?: string;
+	fallbackResultText?: string;
+}): AssistantMessage["content"] {
+	const mergedToolBlocks = [...params.intermediateToolBlocks];
+	if (params.pendingContent) {
+		mergePendingToolCalls(mergedToolBlocks, params.pendingContent);
+	}
+	attachExternalResultsToToolBlocks(mergedToolBlocks, params.toolResultsById);
+
+	const finalContent: AssistantMessage["content"] = [...mergedToolBlocks];
+	if (params.pendingContent && params.pendingContent.length > 0) {
+		for (const block of params.pendingContent) {
+			if (block.type === "text" || block.type === "thinking") {
+				finalContent.push(block);
+			}
+		}
+	} else {
+		if (params.lastThinkingContent) {
+			finalContent.push({ type: "thinking", thinking: params.lastThinkingContent });
+		}
+		if (params.lastTextContent) {
+			finalContent.push({ type: "text", text: params.lastTextContent });
+		}
+	}
+
+	if (finalContent.length === 0 && params.fallbackResultText) {
+		finalContent.push({ type: "text", text: params.fallbackResultText });
+	}
+
+	return finalContent;
+}
+
 /**
  * Merge tool-call blocks from the active partial-message builder into the
  * running list of intermediate tool calls, preserving order and de-duping
@@ -1037,8 +1083,9 @@ export function mergePendingToolCalls(
  * GSD streamSimple function that delegates to the Claude Agent SDK.
  *
  * Emits AssistantMessageEvent deltas for real-time TUI rendering
- * (thinking, text, tool calls). The final AssistantMessage has tool-call
- * blocks stripped so the agent loop ends the turn without local dispatch.
+ * (thinking, text, tool calls). The final AssistantMessage preserves
+ * SDK-executed tool-call blocks for Agent Core's `externalToolExecution`
+ * path, which renders the results without dispatching the tools locally.
  */
 export function streamViaClaudeCode(
 	model: Model<any>,
@@ -1190,9 +1237,8 @@ async function pumpSdkMessages(
 								lastTextContent = block.text;
 							} else if (block.type === "thinking" && block.thinking) {
 								lastThinkingContent = block.thinking;
-							} else if (block.type === "toolCall") {
+							} else if (block.type === "toolCall" || block.type === "serverToolUse") {
 								// Collect tool blocks for externalToolExecution rendering
-								// (serverToolUse removed from pi-ai content types in pi 0.67.2)
 								intermediateToolBlocks.push(block);
 							}
 						}
@@ -1223,8 +1269,13 @@ async function pumpSdkMessages(
 									toolCall: block,
 									partial: builder.message,
 								});
+							} else if (block.type === "serverToolUse") {
+								stream.push({
+									type: "server_tool_use",
+									contentIndex,
+									partial: builder.message,
+								});
 							}
-							// serverToolUse/server_tool_use removed from pi-ai in pi 0.67.2
 						}
 					}
 
@@ -1235,46 +1286,15 @@ async function pumpSdkMessages(
 				// -- Result (terminal) --
 				case "result": {
 					const result = msg as SDKResultMessage;
-
-					// Build final message. Include intermediate tool calls so the
-					// agent loop's externalToolExecution path emits tool_execution
-					// events for proper TUI rendering, followed by the text response.
-					const finalContent: AssistantMessage["content"] = [];
-
-					// If the final turn ended without a synthetic user message
-					// (e.g. stop_reason: "tool_use" followed directly by result,
-					// or a turn with text but no tool execution), the `builder`
-					// still holds toolCall blocks that were never pushed into
-					// `intermediateToolBlocks`. Fold them in here so they aren't
-					// dropped from the final AssistantMessage.
-					if (builder) {
-						mergePendingToolCalls(intermediateToolBlocks, builder.message.content);
-					}
-
-					// Add tool calls from intermediate turns first (renders above text)
-					attachExternalResultsToToolBlocks(intermediateToolBlocks, toolResultsById);
-					finalContent.push(...intermediateToolBlocks);
-
-					// Add text/thinking from the last turn
-					if (builder && builder.message.content.length > 0) {
-						for (const block of builder.message.content) {
-							if (block.type === "text" || block.type === "thinking") {
-								finalContent.push(block);
-							}
-						}
-					} else {
-						if (lastThinkingContent) {
-							finalContent.push({ type: "thinking", thinking: lastThinkingContent });
-						}
-						if (lastTextContent) {
-							finalContent.push({ type: "text", text: lastTextContent });
-						}
-					}
-
-					// Fallback: use the SDK's result text if we have no content
-					if (finalContent.length === 0 && result.subtype === "success" && result.result) {
-						finalContent.push({ type: "text", text: result.result });
-					}
+					const finalContent = buildFinalAssistantContent({
+						intermediateToolBlocks,
+						pendingContent: builder?.message.content,
+						toolResultsById,
+						lastThinkingContent,
+						lastTextContent,
+						fallbackResultText:
+							result.subtype === "success" && result.result ? result.result : undefined,
+					});
 
 					const finalMessage: AssistantMessage = {
 						role: "assistant",