@compilr-dev/cli 0.5.1 → 0.5.3

package/dist/tool-names.js

@@ -112,6 +112,12 @@ export const TOOL_NAMES = {
     ARTIFACT_DELETE: 'artifact_delete',
     // Episode tools (meta-registry)
     RECALL_WORK: 'recall_work',
+    // Factory tools (meta-registry)
+    APP_MODEL_GET: 'app_model_get',
+    APP_MODEL_UPDATE: 'app_model_update',
+    APP_MODEL_VALIDATE: 'app_model_validate',
+    FACTORY_SCAFFOLD: 'factory_scaffold',
+    FACTORY_LIST_TOOLKITS: 'factory_list_toolkits',
 };
 /** Array of all direct tool names (always available) */
 export const DIRECT_TOOL_NAMES = [
@@ -136,6 +142,30 @@ export const DIRECT_TOOL_NAMES = [
     TOOL_NAMES.TASK,
     TOOL_NAMES.SUGGEST,
 ];
+/** Hot tools — used in >50% of turns, always declared as direct schemas */
+export const HOT_TOOL_NAMES = [
+    TOOL_NAMES.READ_FILE,
+    TOOL_NAMES.WRITE_FILE,
+    TOOL_NAMES.EDIT,
+    TOOL_NAMES.BASH,
+    TOOL_NAMES.GREP,
+    TOOL_NAMES.GLOB,
+    TOOL_NAMES.ASK_USER,
+];
+/** Warm tools — used occasionally, moved to meta-registry in hot-tools mode */
+export const WARM_TOOL_NAMES = [
+    TOOL_NAMES.BASH_OUTPUT,
+    TOOL_NAMES.KILL_SHELL,
+    TOOL_NAMES.TODO_WRITE,
+    TOOL_NAMES.TODO_READ,
+    TOOL_NAMES.TODO_CLAIM,
+    TOOL_NAMES.TODO_HANDOFF,
+    TOOL_NAMES.ASK_USER_SIMPLE,
+    TOOL_NAMES.DELEGATE,
+    TOOL_NAMES.DELEGATE_BACKGROUND,
+    TOOL_NAMES.HANDOFF,
+    TOOL_NAMES.COMPILR_GUIDE,
+];
 /** Array of all meta-tool names (tool discovery) */
 export const META_TOOL_NAMES = [
     TOOL_NAMES.LIST_TOOLS,
@@ -217,6 +247,12 @@ export const META_REGISTRY_TOOL_NAMES = [
     TOOL_NAMES.RECALL_WORK,
     // Delegation
     TOOL_NAMES.DELEGATION_STATUS,
+    // Factory
+    TOOL_NAMES.APP_MODEL_GET,
+    TOOL_NAMES.APP_MODEL_UPDATE,
+    TOOL_NAMES.APP_MODEL_VALIDATE,
+    TOOL_NAMES.FACTORY_SCAFFOLD,
+    TOOL_NAMES.FACTORY_LIST_TOOLKITS,
 ];
 /**
  * Get all tool names as an array.

package/dist/tools/db-tools.d.ts

@@ -5,8 +5,13 @@
  * provided by the SDK via platform-adapter.ts. This file re-exports them
  * along with state management functions still needed by ~15+ CLI files.
  */
+import { allFactoryTools } from './platform-adapter.js';
 export { getActiveProject, setActiveProject } from './project-db.js';
 /**
- * All database tools combined (24 tools from SDK)
+ * All database tools combined (32 tools from SDK)
  */
 export declare const allDbTools: import("@compilr-dev/agents").Tool<never>[];
+/**
+ * All factory tools (5 tools from @compilr-dev/factory)
+ */
+export { allFactoryTools };

package/dist/tools/db-tools.js

@@ -5,10 +5,14 @@
  * provided by the SDK via platform-adapter.ts. This file re-exports them
  * along with state management functions still needed by ~15+ CLI files.
  */
-import { allPlatformTools } from './platform-adapter.js';
+import { allPlatformTools, allFactoryTools } from './platform-adapter.js';
 // Re-export state management functions (still needed by many CLI files)
 export { getActiveProject, setActiveProject } from './project-db.js';
 /**
- * All database tools combined (24 tools from SDK)
+ * All database tools combined (32 tools from SDK)
  */
 export const allDbTools = allPlatformTools;
+/**
+ * All factory tools (5 tools from @compilr-dev/factory)
+ */
+export { allFactoryTools };

package/dist/tools/meta-tools.d.ts

@@ -23,4 +23,4 @@ export declare const getToolInfoTool: Tool<object>;
 export declare const useToolTool: Tool<object>;
 export declare const metaTools: Tool<object>[];
 export declare function createMetaToolFallback(): (name: string, input: Record<string, unknown>) => Promise<ToolExecutionResult | null>;
-export declare const META_TOOLS_SYSTEM_PROMPT_PREFIX = "\n## Tool Index (Specialized Tools)\n\nThese tools are called **exactly like direct tools** \u2014 just use the tool name with parameters. No special syntax or wrapper needed. The system routes them automatically.\n\n**IMPORTANT \u2014 These are CLI system tools, NOT your project's backend. Never use localhost/curl to access them.**\n\n**Parameter Rules:**\n- For **zero-parameter calls**: call the tool directly (e.g., `workitem_query()`, `git_status()`).\n- For **calls WITH parameters**: you MUST call `get_tool_info(\"tool_name\")` first to get the exact JSON schema. The signatures below are summaries only \u2014 do NOT guess parameter structure from them.\n- After a failed tool call, always call `get_tool_info()` before retrying.\n\n";
+export declare const META_TOOLS_SYSTEM_PROMPT_PREFIX = "\n## Tool Index (Specialized Tools)\n\nThese tools are called **exactly like direct tools** \u2014 just use the tool name with parameters. No special syntax or wrapper needed. The system routes them automatically.\n\n**IMPORTANT \u2014 These are CLI system tools, NOT your project's backend. Never use localhost/curl to access them.**\n\n**Parameter Rules:**\n- For **zero-parameter calls**: call the tool directly (e.g., `workitem_query()`, `git_status()`).\n- For **calls WITH parameters**: you MUST call `get_tool_info(\"tool_name\")` first to get parameter details. The signatures below are summaries only \u2014 do NOT guess parameter structure from them.\n- After a failed tool call, always call `get_tool_info()` before retrying.\n\n";

package/dist/tools/platform-adapter.d.ts

@@ -27,3 +27,9 @@
  * - 1 episode tool (recall_work)
  */
 export declare const allPlatformTools: import("@compilr-dev/sdk").Tool<never>[];
+/**
+ * All 5 factory tools from @compilr-dev/factory:
+ * - 3 model tools (app_model_get, app_model_update, app_model_validate)
+ * - 2 factory tools (factory_scaffold, factory_list_toolkits)
+ */
+export declare const allFactoryTools: import("@compilr-dev/sdk").Tool<never>[];

package/dist/tools/platform-adapter.js

@@ -16,6 +16,7 @@
  * - recall-work-tool.ts (1 tool)
  */
 import { createPlatformTools, } from '@compilr-dev/sdk';
+import { createFactoryTools } from '@compilr-dev/factory';
 import { projectRepository, workItemRepository, documentRepository, planRepository, } from '../db/repositories/index.js';
 import { getCurrentProject, setCurrentProject } from './project-db.js';
 import { awardFirstProject, awardWorkItemCompletion } from '../games/coins.js';
@@ -392,3 +393,12 @@ const config = {
  * - 1 episode tool (recall_work)
  */
 export const allPlatformTools = createPlatformTools(config);
+/**
+ * All 5 factory tools from @compilr-dev/factory:
+ * - 3 model tools (app_model_get, app_model_update, app_model_validate)
+ * - 2 factory tools (factory_scaffold, factory_list_toolkits)
+ */
+export const allFactoryTools = createFactoryTools({
+    context,
+    cwd: process.cwd(),
+});

package/dist/tools.d.ts

@@ -14,7 +14,7 @@
  * Tool names are defined in tool-names.ts (a dependency-free module).
  * This file re-exports them for convenience. Import from here or tool-names.ts.
  */
-export { TOOL_NAMES, type ToolName, DIRECT_TOOL_NAMES, META_TOOL_NAMES, META_REGISTRY_TOOL_NAMES, getAllToolNames, } from './tool-names.js';
+export { TOOL_NAMES, type ToolName, DIRECT_TOOL_NAMES, HOT_TOOL_NAMES, WARM_TOOL_NAMES, META_TOOL_NAMES, META_REGISTRY_TOOL_NAMES, getAllToolNames, } from './tool-names.js';
 import { TodoStore, type Tool } from '@compilr-dev/sdk';
 export declare const todoStore: TodoStore;
 import { setMetaToolFilter, getRegisteredMetaTools } from './tools/meta-tools.js';
@@ -32,9 +32,10 @@ export declare function createToolRegistry(): unknown[];
 export declare function createMinimalToolRegistry(): unknown[];
 /**
  * Get direct tools that are always available.
- * These are declared normally and can be called by name.
+ * When hotOnly is true, returns only hot tools (7 tools, ~2.1K tokens).
+ * When false/undefined, returns all direct tools (18 tools, ~5.4K tokens).
  */
-export declare function getDirectTools(): Tool[];
+export declare function getDirectTools(hotOnly?: boolean): Tool[];
 /**
  * Get meta-tools for agent registration.
  * Only get_tool_info is kept as a direct tool — use_tool and list_tools
@@ -47,11 +48,18 @@ export declare function getMetaTools(): Tool[];
  * checks the meta-registry and executes it transparently.
  */
 export declare function createToolFallback(): (name: string, input: Record<string, unknown>) => Promise<import('@compilr-dev/sdk').ToolExecutionResult | null>;
+/**
+ * Check if hot-tools mode is active.
+ * When true, only hot tools are declared as direct schemas; warm tools are in meta-registry.
+ */
+export declare function isHotToolsMode(): boolean;
 /**
  * Initialize the meta-tool registry with specialized tools.
+ * When includeWarmTools is true, warm tools are also added to the meta-registry
+ * (enabling hot-tools mode where only 7 core tools are declared directly).
  * Call this once at startup.
  */
-export declare function initializeMetaTools(): void;
+export declare function initializeMetaTools(includeWarmTools?: boolean): void;
 /**
  * Get the tool index for the system prompt.
  * This lists all meta-registry tools with their signatures.
@@ -71,6 +79,8 @@ export declare function isMetaToolsEnabled(): boolean;
  */
 export declare function getToolStats(): {
     directTools: number;
+    hotTools: number;
+    warmTools: number;
     metaRegistryTools: number;
     totalTools: number;
     estimatedDirectTokens: number;

package/dist/tools.js

@@ -16,7 +16,7 @@
  */
 // Re-export tool names from the dependency-free module
 // This breaks circular dependencies while maintaining a single source of truth
-export { TOOL_NAMES, DIRECT_TOOL_NAMES, META_TOOL_NAMES, META_REGISTRY_TOOL_NAMES, getAllToolNames, } from './tool-names.js';
+export { TOOL_NAMES, DIRECT_TOOL_NAMES, HOT_TOOL_NAMES, WARM_TOOL_NAMES, META_TOOL_NAMES, META_REGISTRY_TOOL_NAMES, getAllToolNames, } from './tool-names.js';
 // =============================================================================
 // TOOL IMPORTS
 // =============================================================================
@@ -127,7 +127,7 @@ import { delegationStatusTool } from './tools/delegation-status.js';
 import { handoffTool } from './tools/handoff.js';
 import { guideTool } from './tools/guide-tool.js';
 // DB tools for project, work item, document, plan, backlog, anchor, artifact, and episode management
-import { allDbTools } from './tools/db-tools.js';
+import { allDbTools, allFactoryTools } from './tools/db-tools.js';
 // Meta-tools for dynamic tool loading
 import { initializeMetaToolRegistry, generateToolIndex, getMetaToolCount, META_TOOLS_SYSTEM_PROMPT_PREFIX, setMetaToolFilter, getRegisteredMetaTools, createMetaToolFallback, getToolInfoTool, } from './tools/meta-tools.js';
 // Re-export for use in agent.ts
@@ -136,29 +136,36 @@ export { setMetaToolFilter, getRegisteredMetaTools };
 // DIRECT TOOLS - Always available, called by name
 // =============================================================================
 /**
- * Direct tools are the most frequently used tools.
- * These are always available and can be called directly by name.
- * Estimated: ~3,500 tokens for definitions
+ * Hot tools — used in >50% of turns. Always declared as direct schemas.
+ * Estimated: ~2,100 tokens for definitions
  */
-const DIRECT_TOOLS = [
+const HOT_TOOLS = [
     // File operations (most common)
     readFileTool,
     writeFileTool,
     editTool,
     // Shell (very common)
     bashTool,
-    bashOutputTool,
-    killShellTool,
     // Search (very common)
     globTool,
     grepTool,
-    // Task tracking (always needed)
+    // User interaction (always needed)
+    askUserTool,
+];
+/**
+ * Warm tools — used occasionally. In hot-tools mode these move to meta-registry.
+ * Estimated: ~3,300 tokens for definitions
+ */
+const WARM_TOOLS = [
+    // Shell management
+    bashOutputTool,
+    killShellTool,
+    // Task tracking
     todoWriteTool,
     todoReadTool,
     todoClaimTool,
     todoHandoffTool,
-    // User interaction (always needed)
-    askUserTool,
+    // User interaction (simple variant)
     askUserSimpleTool,
     // Delegation (coordinator only)
     delegateTool,
@@ -166,9 +173,14 @@ const DIRECT_TOOLS = [
     delegateBackgroundTool,
     // Handoff (specialist-to-specialist)
     handoffTool,
-    // CLI documentation (always available)
+    // CLI documentation
     guideTool,
 ];
+/**
+ * All direct tools combined (hot + warm).
+ * Used in legacy mode (no meta-tools) and for backwards compatibility.
+ */
+const DIRECT_TOOLS = [...HOT_TOOLS, ...WARM_TOOLS];
 // =============================================================================
 // META-REGISTRY TOOLS - Available via use_tool()
 // =============================================================================
@@ -212,6 +224,8 @@ const META_REGISTRY_TOOLS = [
     getComplexityTool,
     // DB tools (project, workitem, document, plan, backlog, anchor, artifact, episode)
     ...allDbTools,
+    // Factory tools (app_model_get, app_model_update, app_model_validate, factory_scaffold, factory_list_toolkits)
+    ...allFactoryTools,
     // Delegation status (coordinator query)
     delegationStatusTool,
 ];
@@ -246,9 +260,12 @@ export function createMinimalToolRegistry() {
 // =============================================================================
 /**
  * Get direct tools that are always available.
- * These are declared normally and can be called by name.
+ * When hotOnly is true, returns only hot tools (7 tools, ~2.1K tokens).
+ * When false/undefined, returns all direct tools (18 tools, ~5.4K tokens).
  */
-export function getDirectTools() {
+export function getDirectTools(hotOnly) {
+    if (hotOnly)
+        return HOT_TOOLS;
     return DIRECT_TOOLS;
 }
 /**
@@ -267,12 +284,29 @@ export function getMetaTools() {
 export function createToolFallback() {
     return createMetaToolFallback();
 }
+/** Whether hot-tools mode is active (warm tools in meta-registry) */
+let hotToolsModeActive = false;
+/**
+ * Check if hot-tools mode is active.
+ * When true, only hot tools are declared as direct schemas; warm tools are in meta-registry.
+ */
+export function isHotToolsMode() {
+    return hotToolsModeActive;
+}
 /**
  * Initialize the meta-tool registry with specialized tools.
+ * When includeWarmTools is true, warm tools are also added to the meta-registry
+ * (enabling hot-tools mode where only 7 core tools are declared directly).
  * Call this once at startup.
  */
-export function initializeMetaTools() {
-    initializeMetaToolRegistry(META_REGISTRY_TOOLS);
+export function initializeMetaTools(includeWarmTools) {
+    const tools = includeWarmTools
+        ? [...WARM_TOOLS, ...META_REGISTRY_TOOLS]
+        : META_REGISTRY_TOOLS;
+    initializeMetaToolRegistry(tools);
+    if (includeWarmTools) {
+        hotToolsModeActive = true;
+    }
 }
 /**
  * Get the tool index for the system prompt.
@@ -301,16 +335,22 @@ export function isMetaToolsEnabled() {
  * Get tool statistics for debugging/display.
  */
 export function getToolStats() {
-    const directCount = DIRECT_TOOLS.length;
-    const metaCount = META_REGISTRY_TOOLS.length;
-    const totalCount = directCount + metaCount;
+    const hotCount = HOT_TOOLS.length;
+    const warmCount = WARM_TOOLS.length;
+    const directCount = hotToolsModeActive ? hotCount : hotCount + warmCount;
+    const metaCount = hotToolsModeActive
+        ? META_REGISTRY_TOOLS.length + warmCount
+        : META_REGISTRY_TOOLS.length;
+    const totalCount = hotCount + warmCount + META_REGISTRY_TOOLS.length;
     // Rough estimates: ~300 tokens per tool definition
     const tokensPerTool = 300;
     const estimatedDirectTokens = directCount * tokensPerTool;
-    const estimatedMetaTokens = 800; // Tool index + meta-tool definitions
+    const estimatedMetaTokens = 1000; // Tool index + meta-tool definitions
     const estimatedLegacyTokens = totalCount * tokensPerTool;
     return {
         directTools: directCount,
+        hotTools: hotCount,
+        warmTools: warmCount,
         metaRegistryTools: metaCount,
         totalTools: totalCount,
         estimatedDirectTokens,

package/dist/ui/constants/labels.js

@@ -22,6 +22,7 @@ export const DOC_TYPE_LABELS = {
     'design': 'DESIGN',
     'notes': 'NOTES',
     'plan': 'PLAN',
+    'app-model': 'MODEL',
 };
 // =============================================================================
 // Plan Status Labels

package/dist/ui/overlay/impl/workflow-overlay-v2.d.ts

@@ -24,6 +24,7 @@ interface ProjectStats {
     hasPrd: boolean;
     hasArchDocs: boolean;
     hasScaffold: boolean;
+    hasModel: boolean;
 }
 interface ActionItem {
     label: string;

package/dist/ui/overlay/impl/workflow-overlay-v2.js

@@ -53,7 +53,7 @@ const PHASES = [
         id: 'scaffold',
         name: 'Scaffold',
         command: '/scaffold',
-        description: 'Create project foundation',
+        description: 'Create project foundation (auto-generates if model available)',
         isComplete: (_project, stats) => stats.hasScaffold,
         isActive: (_project, stats) => stats.totalItems >= 3 && !stats.hasScaffold,
     },
@@ -82,6 +82,7 @@ function getProjectStats(project) {
     const docs = documentRepository.listByProject(project.id);
     const hasPrd = docs.some(d => d.docType === 'prd');
     const hasArchDocs = docs.some(d => d.docType === 'architecture');
+    const hasModel = docs.some(d => d.docType === 'app-model');
     const hasScaffold = items.some(i => i.title.toLowerCase().includes('scaffold') && i.status === 'completed') || project.metadata?.scaffolded === true;
     return {
         totalItems: items.length,
@@ -90,6 +91,7 @@ function getProjectStats(project) {
         hasPrd,
         hasArchDocs,
         hasScaffold,
+        hasModel,
     };
 }
 function buildActionsItems(project, stats) {
@@ -130,9 +132,9 @@ function buildActionsItems(project, stats) {
     }
     if (stats.totalItems > 0 && !stats.hasScaffold) {
         actions.push({
-            label: 'Scaffold Project',
+            label: stats.hasModel ? 'Generate from Model' : 'Scaffold Project',
             command: '/scaffold',
-            description: 'Create project foundation',
+            description: stats.hasModel ? 'Auto-generate from Application Model' : 'Create project foundation',
             enabled: true,
         });
     }

package/dist/ui/terminal-ui.d.ts

@@ -103,12 +103,12 @@ export declare class TerminalUI extends EventEmitter {
      * Add input/output tokens for live display
      * @param thinkingTokens - Optional thinking tokens (Gemini 2.5+ models)
      * @param cacheReadTokens - Optional cache read tokens (Anthropic/Gemini)
-     * @param debugPayload - Optional debug payload sizes (char counts)
+     * @param debugPayload - Optional debug payload sizes (token estimates)
      */
     addTokens(inputTokens: number, outputTokens: number, thinkingTokens?: number, cacheReadTokens?: number, debugPayload?: {
-        systemChars: number;
-        contentsChars: number;
-        toolsChars: number;
+        systemTokens: number;
+        contentsTokens: number;
+        toolsTokens: number;
     }): void;
     /**
      * Increment tool call counter
@@ -134,9 +134,9 @@ export declare class TerminalUI extends EventEmitter {
         toolCalls: number;
         apiCalls: number;
         debugPayload?: {
-            systemChars: number;
-            contentsChars: number;
-            toolsChars: number;
+            systemTokens: number;
+            contentsTokens: number;
+            toolsTokens: number;
         };
     };
     setMode(mode: AgentMode): void;

package/dist/ui/terminal-ui.js

@@ -339,7 +339,7 @@ export class TerminalUI extends EventEmitter {
      * Add input/output tokens for live display
      * @param thinkingTokens - Optional thinking tokens (Gemini 2.5+ models)
      * @param cacheReadTokens - Optional cache read tokens (Anthropic/Gemini)
-     * @param debugPayload - Optional debug payload sizes (char counts)
+     * @param debugPayload - Optional debug payload sizes (token estimates)
      */
     addTokens(inputTokens, outputTokens, thinkingTokens, cacheReadTokens, debugPayload) {
         this.turnMetrics.addTokens(inputTokens, outputTokens, thinkingTokens, cacheReadTokens, debugPayload);

package/dist/ui/tool-formatters.js

@@ -130,6 +130,21 @@ export function formatToolResult(toolName, result) {
         else if (toolLower.startsWith('artifact_')) {
             ({ content, summary } = formatArtifact(toolLower, innerResult));
         }
+        else if (toolLower === 'app_model_get') {
+            ({ content, summary } = formatAppModelGet(innerResult));
+        }
+        else if (toolLower === 'app_model_update') {
+            ({ content, summary } = formatAppModelUpdate(innerResult));
+        }
+        else if (toolLower === 'app_model_validate') {
+            ({ content, summary } = formatAppModelValidate(innerResult));
+        }
+        else if (toolLower === 'factory_scaffold') {
+            ({ content, summary } = formatFactoryScaffold(innerResult));
+        }
+        else if (toolLower === 'factory_list_toolkits') {
+            ({ content, summary } = formatFactoryListToolkits(innerResult));
+        }
         else if (toolLower === 'list_tools') {
             ({ content, summary } = formatListTools(innerResult));
         }
@@ -973,14 +988,22 @@ function formatListTools(result) {
     return { content: '', summary: count ? `${String(count)} tools available` : 'No tools' };
 }
 function formatGetToolInfo(result) {
+    // Compact schema format (SDK 0.1.15+): result is a string like "tool_name(...)\n  description"
+    if (typeof result === 'string') {
+        // Extract tool name from signature line: "tool_name(params...)"
+        const parenIdx = result.indexOf('(');
+        const toolName = parenIdx > 0 ? result.slice(0, parenIdx) : null;
+        if (toolName) {
+            return { content: '', summary: `Schema: ${toolName}` };
+        }
+        return { content: '', summary: result.split('\n')[0].slice(0, 80) };
+    }
+    // Legacy object format: { name, description, parameters }
     const name = result.name;
-    const description = result.description;
-    if (name && description) {
-        // First sentence of description
-        const firstSentence = description.split('.')[0].slice(0, 60);
-        return { content: '', summary: `${name}: ${firstSentence}` };
+    if (name) {
+        return { content: '', summary: `Schema: ${name}` };
     }
-    return { content: '', summary: name || 'Tool info' };
+    return { content: '', summary: 'Tool info' };
 }
 function formatDelegateBackground(result) {
     const delegated = result.delegated;
@@ -1002,6 +1025,167 @@ function formatDelegate(result) {
     const message = result.message;
     return { content: '', summary: message || 'Delegated' };
 }
+// =============================================================================
+// Factory Tool Formatters
+// =============================================================================
+/**
+ * Unwrap the use_tool envelope to get the actual tool result.
+ * use_tool wraps as: { tool, status, message, result: { success, result: actualData } }
+ */
+function unwrapToolResult(result) {
+    const inner = result.result;
+    if (inner && typeof inner === 'object' && !Array.isArray(inner)) {
+        const innerObj = inner;
+        // If wrapped by use_tool, the actual data is in innerObj.result
+        if (innerObj.result && typeof innerObj.result === 'object' && !Array.isArray(innerObj.result)) {
+            return innerObj.result;
+        }
+        return innerObj;
+    }
+    return result;
+}
+function formatAppModelGet(result) {
+    const data = unwrapToolResult(result);
+    // No model exists
+    if (data.exists === false) {
+        const message = data.message;
+        return { content: '', summary: message || 'No Application Model found' };
+    }
+    // Summary scope
+    if (data.entityCount !== undefined) {
+        const name = data.name || '?';
+        const entityCount = data.entityCount;
+        const toolkit = data.toolkit || '?';
+        const revision = data.revision;
+        const entities = data.entities;
+        const summary = `${name} — ${String(entityCount)} entities, toolkit: ${toolkit}${revision !== undefined ? `, rev ${String(revision)}` : ''}`;
+        const lines = [];
+        if (entities?.length) {
+            for (const e of entities) {
+                const rels = e.relationshipCount > 0 ? `, ${String(e.relationshipCount)} rel` : '';
+                lines.push(`  ${e.name} (${String(e.fieldCount)} fields, ${e.views.join('/')})${rels}`);
+            }
+        }
+        const features = data.features;
+        if (features) {
+            const enabled = Object.entries(features).filter(([, v]) => v).map(([k]) => k);
+            if (enabled.length)
+                lines.push(`Features: ${enabled.join(', ')}`);
+        }
+        return { content: lines.join('\n'), summary };
+    }
+    // Single entity scope
+    if (data.entity && typeof data.entity === 'object') {
+        const entity = data.entity;
+        const name = entity.name || '?';
+        const fields = entity.fields;
+        const rels = entity.relationships;
+        const summary = `Entity: ${name} (${String(fields?.length ?? 0)} fields)`;
+        const lines = [];
+        if (fields?.length) {
+            lines.push('Fields:');
+            for (const f of fields)
+                lines.push(`  ${f.name}: ${f.type}`);
+        }
+        if (rels?.length) {
+            lines.push('Relationships:');
+            for (const r of rels)
+                lines.push(`  ${r.type} → ${r.target}`);
+        }
+        return { content: lines.join('\n'), summary };
+    }
+    // Section scopes (identity, features, layout, theme, techStack)
+    const section = data.identity ?? data.features ?? data.layout ?? data.theme ?? data.techStack;
+    if (section && typeof section === 'object') {
+        const entries = Object.entries(section);
+        const summary = entries.map(([k, v]) => `${k}: ${String(v)}`).join(', ');
+        return { content: '', summary: truncate(summary, 80) };
+    }
+    // Full model fallback
+    const message = data.message;
+    return { content: '', summary: message || 'Application Model' };
+}
+function formatAppModelUpdate(result) {
+    const data = unwrapToolResult(result);
+    const op = data.op || '';
+    const revision = data.revision;
+    const message = data.message;
+    const revInfo = revision !== undefined ? ` (rev ${String(revision)})` : '';
+    const summary = message || `${op} applied${revInfo}`;
+    return { content: '', summary: truncate(summary, 80) };
+}
+function formatAppModelValidate(result) {
+    const data = unwrapToolResult(result);
+    const valid = data.valid;
+    const errors = data.errors;
+    const revision = data.revision;
+    if (valid) {
+        return { content: '', summary: `Model valid${revision !== undefined ? ` (rev ${String(revision)})` : ''}` };
+    }
+    const errorCount = errors?.length ?? 0;
+    const summary = `${String(errorCount)} validation error(s)`;
+    const lines = errors?.slice(0, 10).map((e) => `${e.path || '?'}: ${e.message || 'error'}`) ?? [];
+    if (errorCount > 10)
+        lines.push(`... and ${String(errorCount - 10)} more`);
+    return { content: lines.join('\n'), summary };
+}
+function formatFactoryScaffold(result) {
+    const data = unwrapToolResult(result);
+    const toolkit = data.toolkit || '?';
+    const fileCount = data.fileCount;
+    const files = data.files;
+    const dryRun = data.dryRun;
+    const warnings = data.warnings;
+    const message = data.message;
+    const mode = dryRun ? 'Dry run' : 'Generated';
+    const summary = message || `${mode}: ${String(fileCount ?? 0)} files (${toolkit})`;
+    // Build detailed content with file listing
+    const lines = [];
+    if (files?.length) {
+        // Group files by directory
+        const dirs = new Map();
+        for (const f of files) {
+            const parts = f.split('/');
+            const dir = parts.length > 1 ? parts.slice(0, -1).join('/') : '.';
+            const file = parts[parts.length - 1];
+            const existing = dirs.get(dir);
+            if (existing) {
+                existing.push(file);
+            }
+            else {
+                dirs.set(dir, [file]);
+            }
+        }
+        for (const [dir, dirFiles] of dirs) {
+            lines.push(`${dir}/`);
+            for (const f of dirFiles)
+                lines.push(`  ${f}`);
+        }
+    }
+    if (warnings?.length) {
+        lines.push('');
+        lines.push('Warnings:');
+        for (const w of warnings)
+            lines.push(`  ! ${w}`);
+    }
+    return { content: lines.join('\n'), summary };
+}
+function formatFactoryListToolkits(result) {
+    const data = unwrapToolResult(result);
+    const count = data.count;
+    const toolkits = data.toolkits;
+    if (!toolkits?.length) {
+        return { content: '', summary: 'No toolkits available' };
+    }
+    const summary = `${String(count ?? toolkits.length)} toolkit(s)`;
+    const lines = toolkits.map((t) => {
+        const name = t.name || t.id || '?';
+        const desc = t.description ? ` — ${t.description}` : '';
+        const sections = t.requiredSections?.length ? `\n  Requires: ${t.requiredSections.join(', ')}` : '';
+        return `${name}${desc}${sections}`;
+    });
+    return { content: lines.join('\n'), summary };
+}
 function formatGeneric(result) {
     const content = typeof result.content === 'string'
         ? result.content