npm - @xopcai/xopc - Versions diffs - 0.0.6 → 0.0.11 - Mend

@xopcai/xopc 0.0.6 → 0.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (412) hide show

package/dist/src/agent/child-agent-factory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"child-agent-factory.js","names":[],"sources":["../../../src/agent/child-agent-factory.ts"],"sourcesContent":["import { Agent, type ThinkingLevel } from '@mariozechner/pi-agent-core';\nimport type { Api, Model } from '@mariozechner/pi-ai';\n\nimport type { Config } from '../config/schema.js';\nimport type { MessageBus } from '../infra/bus/index.js';\nimport { resolveProviderApiKeySync } from '../auth/sync-provider-auth.js';\nimport { getApiKeySync } from '../providers/index.js';\nimport { createLogger } from '../utils/logger.js';\n\nimport { extractTextContent } from './context/workspace.js';\nimport {\n resolveAgentTurnTimeoutMs,\n runAgentTurnWithTimeout,\n} from './orchestration/run-agent-turn-with-timeout.js';\nimport type { ToolExecutorConfig } from './tools/executor.js';\nimport { AgentToolsFactory } from './tools/factory.js';\n\nconst log = createLogger('delegate-child');\n\nexport function buildChildSystemPrompt(goal: string, context?: string, workspace?: string): string {\n const parts = [\n 'You are a focused sub-agent working on a specific delegated task.',\n '',\n `YOUR TASK:\\n${goal}`,\n ];\n\n if (context?.trim()) {\n parts.push(`\\nCONTEXT:\\n${context.trim()}`);\n }\n\n if (workspace?.trim()) {\n parts.push(`\\nWORKSPACE: ${workspace.trim()}`);\n }\n\n parts.push(\n '\\nComplete this task using only the tools available to you. ' +\n 'When finished, reply with a clear, concise summary covering:\\n' +\n '- What you did\\n' +\n '- What you found or accomplished\\n' +\n '- Files created or modified\\n' +\n '- Issues encountered\\n\\n' +\n 'Your final reply is returned to the parent agent — be thorough but compact.',\n );\n\n return parts.join('\\n');\n}\n\nexport interface DelegateChildHandleOptions {\n workspace: string;\n goal: string;\n context?: string;\n allowedToolNames: string[];\n maxIterations: number;\n model: Model<Api>;\n bus: MessageBus;\n getConfig: () => Config \| undefined;\n toolExecutorConfig?: Partial<ToolExecutorConfig>;\n}\n\nexport interface DelegateChildRunResult {\n summary: string;\n toolIterations: number;\n}\n\nexport interface DelegateChildHandle {\n run(): Promise<DelegateChildRunResult>;\n abort(): void;\n}\n\n/*\n Build an isolated tool factory (no extensions, no session memory hooks) and a child {@link Agent}.\n */\nexport function createDelegateChildHandle(options: DelegateChildHandleOptions): DelegateChildHandle {\n const childFactory = new AgentToolsFactory({\n workspace: options.workspace,\n bus: options.bus,\n getCurrentContext: () => null,\n getConfig: options.getConfig,\n getPrimaryModel: () => options.model,\n toolExecutorConfig: options.toolExecutorConfig,\n });\n\n const allTools = childFactory.createAllTools({\n workspace: options.workspace,\n getPrimaryModel: () => options.model,\n disabledTools: new Set(['extensions']),\n });\n\n const allow = new Set(options.allowedToolNames);\n const filteredTools = allTools.filter((t) => allow.has(t.name));\n\n if (filteredTools.length === 0) {\n return {\n async run() {\n return {\n summary: 'No tools matched the allowlist after factory registration.',\n toolIterations: 0,\n };\n },\n abort() {},\n };\n }\n\n let toolIterations = 0;\n let aborted = false;\n\n const agent = new Agent({\n initialState: {\n systemPrompt: buildChildSystemPrompt(options.goal, options.context, options.workspace),\n model: options.model,\n thinkingLevel: 'low' as ThinkingLevel,\n tools: filteredTools,\n messages: [],\n },\n getApiKey: (provider: string) =>\n resolveProviderApiKeySync(provider) ?? getApiKeySync(provider) ?? '',\n beforeToolCall: async () => {\n if (aborted) {\n return { block: true, reason: 'Sub-agent aborted.' };\n }\n if (toolIterations >= options.maxIterations) {\n return {\n block: true,\n reason: `Sub-agent reached max tool iterations (${options.maxIterations}).`,\n };\n }\n return undefined;\n },\n afterToolCall: async () => {\n toolIterations += 1;\n return undefined;\n },\n });\n\n const userText = options.context?.trim()\n ? `${options.goal}\\n\\nAdditional context:\\n${options.context.trim()}`\n : options.goal;\n\n return {\n async run(): Promise<DelegateChildRunResult> {\n toolIterations = 0;\n aborted = false;\n try {\n await runAgentTurnWithTimeout(\n agent,\n async () => {\n await agent.prompt(userText);\n await agent.waitForIdle();\n },\n resolveAgentTurnTimeoutMs(options.getConfig()),\n );\n\n const messages = agent.state.messages;\n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n if (msg.role === 'assistant') {\n const content: unknown = msg.content;\n if (typeof content === 'string') {\n return { summary: content.trim() \|\| '(empty assistant message)', toolIterations };\n }\n if (Array.isArray(content)) {\n const text = extractTextContent(content as Array<{ type: string; text?: string }>);\n return {\n summary: text.trim() \|\| '(empty assistant message)',\n toolIterations,\n };\n }\n }\n }\n\n return {\n summary: aborted\n ? 'Sub-agent was aborted before producing a result.'\n : 'Sub-agent completed but produced no assistant text.',\n toolIterations,\n };\n } catch (e) {\n const msg = e instanceof Error ? e.message : String(e);\n const m = options.model as { model?: string; id?: string };\n const modelId = m?.model ?? m?.id;\n log.warn(\n {\n err: e,\n errorMessage: msg,\n goalPreview: options.goal.slice(0, 120),\n maxIterations: options.maxIterations,\n allowedToolCount: options.allowedToolNames.length,\n modelId,\n },\n `Delegate child run failed: ${msg}`,\n );\n return {\n summary: `Sub-agent error: ${msg}`,\n toolIterations,\n };\n }\n },\n\n abort(): void {\n aborted = true;\n agent.abort();\n },\n };\n}\n"],"mappings":"~~;;;;;;;;;~~yBAK0E;gBACpB;~~aACJ~~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"}
1	+ {"version":3,"file":"child-agent-factory.js","names":[],"sources":["../../../src/agent/child-agent-factory.ts"],"sourcesContent":["import { Agent, type ThinkingLevel } from '@mariozechner/pi-agent-core';\nimport type { Api, Model } from '@mariozechner/pi-ai';\n\nimport type { Config } from '../config/schema.js';\nimport type { MessageBus } from '../infra/bus/index.js';\nimport { resolveProviderApiKeySync } from '../auth/sync-provider-auth.js';\nimport { getApiKeySync } from '../providers/index.js';\nimport { createExtensionAwareStreamFn } from '../providers/extension-stream-bridge.js';\nimport { createLogger } from '../utils/logger.js';\n\nimport { extractTextContent } from './context/workspace.js';\nimport {\n resolveAgentTurnTimeoutMs,\n runAgentTurnWithTimeout,\n} from './orchestration/run-agent-turn-with-timeout.js';\nimport type { ToolExecutorConfig } from './tools/executor.js';\nimport { AgentToolsFactory } from './tools/factory.js';\n\nconst log = createLogger('delegate-child');\n\nexport function buildChildSystemPrompt(goal: string, context?: string, workspace?: string): string {\n const parts = [\n 'You are a focused sub-agent working on a specific delegated task.',\n '',\n `YOUR TASK:\\n${goal}`,\n ];\n\n if (context?.trim()) {\n parts.push(`\\nCONTEXT:\\n${context.trim()}`);\n }\n\n if (workspace?.trim()) {\n parts.push(`\\nWORKSPACE: ${workspace.trim()}`);\n }\n\n parts.push(\n '\\nComplete this task using only the tools available to you. ' +\n 'When finished, reply with a clear, concise summary covering:\\n' +\n '- What you did\\n' +\n '- What you found or accomplished\\n' +\n '- Files created or modified\\n' +\n '- Issues encountered\\n\\n' +\n 'Your final reply is returned to the parent agent — be thorough but compact.',\n );\n\n return parts.join('\\n');\n}\n\nexport interface DelegateChildHandleOptions {\n workspace: string;\n goal: string;\n context?: string;\n allowedToolNames: string[];\n maxIterations: number;\n model: Model<Api>;\n bus: MessageBus;\n getConfig: () => Config \| undefined;\n toolExecutorConfig?: Partial<ToolExecutorConfig>;\n}\n\nexport interface DelegateChildRunResult {\n summary: string;\n toolIterations: number;\n}\n\nexport interface DelegateChildHandle {\n run(): Promise<DelegateChildRunResult>;\n abort(): void;\n}\n\n/*\n Build an isolated tool factory (no extensions, no session memory hooks) and a child {@link Agent}.\n */\nexport function createDelegateChildHandle(options: DelegateChildHandleOptions): DelegateChildHandle {\n const childFactory = new AgentToolsFactory({\n workspace: options.workspace,\n bus: options.bus,\n getCurrentContext: () => null,\n getConfig: options.getConfig,\n getPrimaryModel: () => options.model,\n toolExecutorConfig: options.toolExecutorConfig,\n });\n\n const allTools = childFactory.createAllTools({\n workspace: options.workspace,\n getPrimaryModel: () => options.model,\n disabledTools: new Set(['extensions']),\n });\n\n const allow = new Set(options.allowedToolNames);\n const filteredTools = allTools.filter((t) => allow.has(t.name));\n\n if (filteredTools.length === 0) {\n return {\n async run() {\n return {\n summary: 'No tools matched the allowlist after factory registration.',\n toolIterations: 0,\n };\n },\n abort() {},\n };\n }\n\n let toolIterations = 0;\n let aborted = false;\n\n const agent = new Agent({\n initialState: {\n systemPrompt: buildChildSystemPrompt(options.goal, options.context, options.workspace),\n model: options.model,\n thinkingLevel: 'low' as ThinkingLevel,\n tools: filteredTools,\n messages: [],\n },\n streamFn: createExtensionAwareStreamFn(),\n getApiKey: (provider: string) =>\n resolveProviderApiKeySync(provider) ?? getApiKeySync(provider) ?? '',\n beforeToolCall: async () => {\n if (aborted) {\n return { block: true, reason: 'Sub-agent aborted.' };\n }\n if (toolIterations >= options.maxIterations) {\n return {\n block: true,\n reason: `Sub-agent reached max tool iterations (${options.maxIterations}).`,\n };\n }\n return undefined;\n },\n afterToolCall: async () => {\n toolIterations += 1;\n return undefined;\n },\n });\n\n const userText = options.context?.trim()\n ? `${options.goal}\\n\\nAdditional context:\\n${options.context.trim()}`\n : options.goal;\n\n return {\n async run(): Promise<DelegateChildRunResult> {\n toolIterations = 0;\n aborted = false;\n try {\n await runAgentTurnWithTimeout(\n agent,\n async () => {\n await agent.prompt(userText);\n await agent.waitForIdle();\n },\n resolveAgentTurnTimeoutMs(options.getConfig()),\n );\n\n const messages = agent.state.messages;\n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n if (msg.role === 'assistant') {\n const content: unknown = msg.content;\n if (typeof content === 'string') {\n return { summary: content.trim() \|\| '(empty assistant message)', toolIterations };\n }\n if (Array.isArray(content)) {\n const text = extractTextContent(content as Array<{ type: string; text?: string }>);\n return {\n summary: text.trim() \|\| '(empty assistant message)',\n toolIterations,\n };\n }\n }\n }\n\n return {\n summary: aborted\n ? 'Sub-agent was aborted before producing a result.'\n : 'Sub-agent completed but produced no assistant text.',\n toolIterations,\n };\n } catch (e) {\n const msg = e instanceof Error ? e.message : String(e);\n const m = options.model as { model?: string; id?: string };\n const modelId = m?.model ?? m?.id;\n log.warn(\n {\n err: e,\n errorMessage: msg,\n goalPreview: options.goal.slice(0, 120),\n maxIterations: options.maxIterations,\n allowedToolCount: options.allowedToolNames.length,\n modelId,\n },\n `Delegate child run failed: ${msg}`,\n );\n return {\n summary: `Sub-agent error: ${msg}`,\n toolIterations,\n };\n }\n },\n\n abort(): void {\n aborted = true;\n agent.abort();\n },\n };\n}\n"],"mappings":"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"}

package/dist/src/agent/context/expand-at-file-mentions.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+/**
+ * Prepend `<file path="…">` blocks for `@file:` references before the raw user text.
+ */
+export declare function expandAtFileMentionsInPlainText(text: string, workspaceRoot: string): Promise<string>;

package/dist/src/agent/context/expand-at-file-mentions.js ADDED Viewed

@@ -0,0 +1,69 @@
+import { resolveWorkspaceSafePath } from "../../gateway/workspace-editor-path.js";
+import { readFile, readdir, stat } from "node:fs/promises";
+//#region src/agent/context/expand-at-file-mentions.ts
+/** Aligned with web `file-wire-pattern.ts`: unquoted path or quoted for spaces. */
+const QUOTED_INNER = String.raw`((?:[^"\\]|\\.)*)`;
+const UNQUOTED = String.raw`[a-zA-Z0-9_./\-\p{L}\p{N}]+`;
+const FILE_RE = new RegExp(`@file:(?:"${QUOTED_INNER}"|(${UNQUOTED}))`, "gu");
+const MAX_PATH_BYTES = 5e4;
+const MAX_DIR_ENTRIES = 120;
+function pathFromFileWireExec(m) {
+	const unquoted = m[2];
+	if (unquoted != null && unquoted !== "") return unquoted;
+	const q = m[1];
+	return q != null ? q.replace(/\\(.)/g, (_, ch) => ch) : "";
+}
+function escapeXmlAttr(s) {
+	return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+}
+function collectFileTokens(text) {
+	const out = [];
+	const r = new RegExp(FILE_RE.source, "gu");
+	let m;
+	while ((m = r.exec(text)) !== null) {
+		const v = pathFromFileWireExec(m).trim();
+		if (v) out.push({
+			start: m.index,
+			end: m.index + m[0].length,
+			value: v
+		});
+	}
+	return out;
+}
+async function workspacePathSnippet(rel, workspaceRoot) {
+	const abs = resolveWorkspaceSafePath(workspaceRoot, rel);
+	if (!abs) return "[invalid path]";
+	try {
+		const st = await stat(abs);
+		if (st.isDirectory()) return `[directory, first ${MAX_DIR_ENTRIES} non-hidden entries]\n${(await readdir(abs, { withFileTypes: true })).filter((e) => !e.name.startsWith(".")).slice(0, MAX_DIR_ENTRIES).map((e) => `${e.isDirectory() ? "(dir)" : "(file)"} ${e.name}`).join("\n")}`;
+		if (st.isFile()) {
+			const s = (await readFile(abs)).toString("utf8");
+			return s.length > MAX_PATH_BYTES ? `${s.slice(0, MAX_PATH_BYTES)}\n\n[... truncated ...]` : s;
+		}
+		return "[not a file or directory]";
+	} catch {
+		return "[unreadable or missing]";
+	}
+}
+/**
+* Prepend `<file path="…">` blocks for `@file:` references before the raw user text.
+*/
+async function expandAtFileMentionsInPlainText(text, workspaceRoot) {
+	if (!text.includes("@file:")) return text;
+	const tokens = collectFileTokens(text);
+	if (tokens.length === 0) return text;
+	const seen = /* @__PURE__ */ new Set();
+	const blocks = [];
+	for (const t of tokens) {
+		if (seen.has(t.value)) continue;
+		seen.add(t.value);
+		const body = await workspacePathSnippet(t.value, workspaceRoot);
+		blocks.push(`<file path="${escapeXmlAttr(t.value)}">\n${body}\n</file>`);
+	}
+	if (blocks.length === 0) return text;
+	return `${blocks.join("\n\n")}\n\n${text}`;
+}
+//#endregion
+export { expandAtFileMentionsInPlainText };
+//# sourceMappingURL=expand-at-file-mentions.js.map

package/dist/src/agent/context/expand-at-file-mentions.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"expand-at-file-mentions.js","names":[],"sources":["../../../../src/agent/context/expand-at-file-mentions.ts"],"sourcesContent":["import { readFile, readdir, stat } from 'node:fs/promises';\n\nimport { resolveWorkspaceSafePath } from '../../gateway/workspace-editor-path.js';\n\n/** Aligned with web `file-wire-pattern.ts`: unquoted path or quoted for spaces. */\nconst QUOTED_INNER = String.raw`((?:[^\"\\\\]|\\\\.)*)`;\nconst UNQUOTED = String.raw`[a-zA-Z0-9_./\\-\\p{L}\\p{N}]+`;\nconst FILE_RE = new RegExp(`@file:(?:\"${QUOTED_INNER}\"|(${UNQUOTED}))`, 'gu');\n\nconst MAX_PATH_BYTES = 50_000;\nconst MAX_DIR_ENTRIES = 120;\n\ninterface TokenHit {\n start: number;\n end: number;\n value: string;\n}\n\nfunction pathFromFileWireExec(m: RegExpExecArray): string {\n const unquoted = m[2];\n if (unquoted != null && unquoted !== '') return unquoted;\n const q = m[1];\n return q != null ? q.replace(/\\\\(.)/g, (_: string, ch: string) => ch) : '';\n}\n\nfunction escapeXmlAttr(s: string): string {\n return s.replace(/&/g, '&').replace(/\"/g, '"').replace(/</g, '<');\n}\n\nfunction collectFileTokens(text: string): TokenHit[] {\n const out: TokenHit[] = [];\n const r = new RegExp(FILE_RE.source, 'gu');\n let m: RegExpExecArray | null;\n while ((m = r.exec(text)) !== null) {\n const v = pathFromFileWireExec(m).trim();\n if (v) out.push({ start: m.index, end: m.index + m[0].length, value: v });\n }\n return out;\n}\n\nasync function workspacePathSnippet(rel: string, workspaceRoot: string): Promise<string> {\n const abs = resolveWorkspaceSafePath(workspaceRoot, rel);\n if (!abs) return '[invalid path]';\n try {\n const st = await stat(abs);\n if (st.isDirectory()) {\n const entries = await readdir(abs, { withFileTypes: true });\n const lines = entries\n .filter((e) => !e.name.startsWith('.'))\n .slice(0, MAX_DIR_ENTRIES)\n .map((e) => `${e.isDirectory() ? '(dir)' : '(file)'} ${e.name}`)\n .join('\\n');\n return `[directory, first ${MAX_DIR_ENTRIES} non-hidden entries]\\n${lines}`;\n }\n if (st.isFile()) {\n const buf = await readFile(abs);\n const s = buf.toString('utf8');\n return s.length > MAX_PATH_BYTES ? `${s.slice(0, MAX_PATH_BYTES)}\\n\\n[... truncated ...]` : s;\n }\n return '[not a file or directory]';\n } catch {\n return '[unreadable or missing]';\n }\n}\n\n/**\n * Prepend `<file path=\"…\">` blocks for `@file:` references before the raw user text.\n */\nexport async function expandAtFileMentionsInPlainText(text: string, workspaceRoot: string): Promise<string> {\n if (!text.includes('@file:')) return text;\n const tokens = collectFileTokens(text);\n if (tokens.length === 0) return text;\n\n const seen = new Set<string>();\n const blocks: string[] = [];\n\n for (const t of tokens) {\n if (seen.has(t.value)) continue;\n seen.add(t.value);\n const body = await workspacePathSnippet(t.value, workspaceRoot);\n blocks.push(`<file path=\"${escapeXmlAttr(t.value)}\">\\n${body}\\n</file>`);\n }\n\n if (blocks.length === 0) return text;\n return `${blocks.join('\\n\\n')}\\n\\n${text}`;\n}\n"],"mappings":";;;;AAKA,MAAM,eAAe,OAAO,GAAG;AAC/B,MAAM,WAAW,OAAO,GAAG;AAC3B,MAAM,UAAU,IAAI,OAAO,aAAa,aAAa,KAAK,SAAS,KAAK,KAAK;AAE7E,MAAM,iBAAiB;AACvB,MAAM,kBAAkB;AAQxB,SAAS,qBAAqB,GAA4B;CACxD,MAAM,WAAW,EAAE;AACnB,KAAI,YAAY,QAAQ,aAAa,GAAI,QAAO;CAChD,MAAM,IAAI,EAAE;AACZ,QAAO,KAAK,OAAO,EAAE,QAAQ,WAAW,GAAW,OAAe,GAAG,GAAG;;AAG1E,SAAS,cAAc,GAAmB;AACxC,QAAO,EAAE,QAAQ,MAAM,QAAQ,CAAC,QAAQ,MAAM,SAAS,CAAC,QAAQ,MAAM,OAAO;;AAG/E,SAAS,kBAAkB,MAA0B;CACnD,MAAM,MAAkB,EAAE;CAC1B,MAAM,IAAI,IAAI,OAAO,QAAQ,QAAQ,KAAK;CAC1C,IAAI;AACJ,SAAQ,IAAI,EAAE,KAAK,KAAK,MAAM,MAAM;EAClC,MAAM,IAAI,qBAAqB,EAAE,CAAC,MAAM;AACxC,MAAI,EAAG,KAAI,KAAK;GAAE,OAAO,EAAE;GAAO,KAAK,EAAE,QAAQ,EAAE,GAAG;GAAQ,OAAO;GAAG,CAAC;;AAE3E,QAAO;;AAGT,eAAe,qBAAqB,KAAa,eAAwC;CACvF,MAAM,MAAM,yBAAyB,eAAe,IAAI;AACxD,KAAI,CAAC,IAAK,QAAO;AACjB,KAAI;EACF,MAAM,KAAK,MAAM,KAAK,IAAI;AAC1B,MAAI,GAAG,aAAa,CAOlB,QAAO,qBAAqB,gBAAgB,yBAN5B,MAAM,QAAQ,KAAK,EAAE,eAAe,MAAM,CAAC,EAExD,QAAQ,MAAM,CAAC,EAAE,KAAK,WAAW,IAAI,CAAC,CACtC,MAAM,GAAG,gBAAgB,CACzB,KAAK,MAAM,GAAG,EAAE,aAAa,GAAG,UAAU,SAAS,GAAG,EAAE,OAAO,CAC/D,KAAK,KAAK;AAGf,MAAI,GAAG,QAAQ,EAAE;GAEf,MAAM,KADM,MAAM,SAAS,IAAI,EACjB,SAAS,OAAO;AAC9B,UAAO,EAAE,SAAS,iBAAiB,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC,2BAA2B;;AAE9F,SAAO;SACD;AACN,SAAO;;;;;;AAOX,eAAsB,gCAAgC,MAAc,eAAwC;AAC1G,KAAI,CAAC,KAAK,SAAS,SAAS,CAAE,QAAO;CACrC,MAAM,SAAS,kBAAkB,KAAK;AACtC,KAAI,OAAO,WAAW,EAAG,QAAO;CAEhC,MAAM,uBAAO,IAAI,KAAa;CAC9B,MAAM,SAAmB,EAAE;AAE3B,MAAK,MAAM,KAAK,QAAQ;AACtB,MAAI,KAAK,IAAI,EAAE,MAAM,CAAE;AACvB,OAAK,IAAI,EAAE,MAAM;EACjB,MAAM,OAAO,MAAM,qBAAqB,EAAE,OAAO,cAAc;AAC/D,SAAO,KAAK,eAAe,cAAc,EAAE,MAAM,CAAC,MAAM,KAAK,WAAW;;AAG1E,KAAI,OAAO,WAAW,EAAG,QAAO;AAChC,QAAO,GAAG,OAAO,KAAK,OAAO,CAAC,MAAM"}

package/dist/src/agent/context/workspace-seed.js CHANGED Viewed

@@ -4,8 +4,8 @@ import { DEFAULT_AGENT_ID, init_agent_scope, resolveAgentBootstrapDir } from "..
 import { WORKSPACE_FILES, init_paths } from "../../config/paths.js";
 import { BOOTSTRAP_FILES } from "./workspace.js";
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 //#region src/agent/context/workspace-seed.ts
 /**
 * Seed bootstrap persona Markdown files under `…/agents/<id>/bootstrap/` (ensure workspace + write-if-missing).

package/dist/src/agent/image/index.d.ts CHANGED Viewed

@@ -2,7 +2,6 @@
  * Unified image stack: understanding (pi-ai multimodal) under this folder;
  * generation (OpenAI Images API; DashScope Beijing wan2.6-t2i via `dashscope/`) under `./generation/`.
  */
-export { describeImagesWithPiAi } from './describe-images.js';
 export { describeImages, describeImagesWithFallback, type DescribeImagesParams, type DescribeImagesWithFallbackParams, type DescribeImagesWithFallbackResult, type DescribeImagesAttempt, } from './understanding/runtime.js';
 export { registerImageUnderstandingProvider, getImageUnderstandingProvider, listImageUnderstandingProviders, } from './understanding/provider-registry.js';
 export type { ImageUnderstandingProvider, ImageUnderstandingRequest, ImageUnderstandingResult, } from './understanding/types.js';

package/dist/src/agent/image/index.js CHANGED Viewed

@@ -1,11 +1,10 @@
 import { getImageUnderstandingProvider, listImageUnderstandingProviders, registerImageUnderstandingProvider } from "./understanding/provider-registry.js";
 import { resolveImageModelConfigForTool } from "./tool-model-config.js";
 import { describeImages, describeImagesWithFallback } from "./understanding/runtime.js";
-import { describeImagesWithPiAi } from "./describe-images.js";
 import { runWithImageModelFallback } from "./image-model-fallback.js";
 import { loadImageForToolInput } from "./load-image-media.js";
 import { DASHSCOPE_DEFAULT_IMAGE_MODEL, OPENAI_DEFAULT_IMAGE_MODEL } from "./generation/constants.js";
 import { getImageGenerationProvider, listImageGenerationProviders, registerImageGenerationProvider } from "./generation/provider-registry.js";
 import { generateImage, listImageGenerationProvidersSummary } from "./generation/runtime.js";
 import { modelSupportsVision, resolveImageHandlingStrategy } from "./vision-detection.js";
-export { DASHSCOPE_DEFAULT_IMAGE_MODEL, OPENAI_DEFAULT_IMAGE_MODEL, describeImages, describeImagesWithFallback, describeImagesWithPiAi, generateImage, getImageGenerationProvider, getImageUnderstandingProvider, listImageGenerationProviders, listImageGenerationProvidersSummary, listImageUnderstandingProviders, loadImageForToolInput, modelSupportsVision, registerImageGenerationProvider, registerImageUnderstandingProvider, resolveImageHandlingStrategy, resolveImageModelConfigForTool, runWithImageModelFallback };
+export { DASHSCOPE_DEFAULT_IMAGE_MODEL, OPENAI_DEFAULT_IMAGE_MODEL, describeImages, describeImagesWithFallback, generateImage, getImageGenerationProvider, getImageUnderstandingProvider, listImageGenerationProviders, listImageGenerationProvidersSummary, listImageUnderstandingProviders, loadImageForToolInput, modelSupportsVision, registerImageGenerationProvider, registerImageUnderstandingProvider, resolveImageHandlingStrategy, resolveImageModelConfigForTool, runWithImageModelFallback };

package/dist/src/agent/image/understanding/pi-ai-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pi-ai-provider.js","names":[],"sources":["../../../../../src/agent/image/understanding/pi-ai-provider.ts"],"sourcesContent":["import { complete, type Api, type Context, type Model } from '@mariozechner/pi-ai';\nimport { resolveModel, getApiKey } from '../../../providers/index.js';\nimport { coerceImageAssistantText } from '../image-helpers.js';\nimport { registerImageUnderstandingProvider } from './provider-registry.js';\nimport type {\n ImageUnderstandingProvider~~,\n ImageUnderstandingRequest,\n ImageUnderstandingResult,\n~~} from './types.js';\n\nfunction resolveMaxTokens(modelMaxTokens: number \| undefined, requestedMaxTokens = 4096): number {\n if (\n typeof modelMaxTokens !== 'number' \|\|\n !Number.isFinite(modelMaxTokens) \|\|\n modelMaxTokens <= 0\n ) {\n return requestedMaxTokens;\n }\n return Math.min(requestedMaxTokens, modelMaxTokens);\n}\n\nexport function buildPiAiImageUnderstandingProvider(providerId: string): ImageUnderstandingProvider {\n return {\n id: providerId,\n label: `pi-ai (${providerId})`,\n async isConfigured() {\n const apiKey = await getApiKey(providerId);\n return Boolean(apiKey);\n },\n async describeImages(modelId, request) {\n const modelRef = `${providerId}/${modelId}`;\n const model = resolveModel(modelRef) as Model<Api>;\n if (!model.input?.includes('image')) {\n throw new Error(`Model does not support images: ${modelRef}`);\n }\n const apiKey = await getApiKey(providerId);\n if (!apiKey) {\n throw new Error(`No API key configured for provider: ${providerId}`);\n }\n\n const context: Context = {\n messages: [\n {\n role: 'user',\n content: [\n { type: 'text', text: request.prompt },\n ...request.images.map((img) => ({\n type: 'image' as const,\n data: img.buffer.toString('base64'),\n mimeType: img.mimeType \|\| 'image/jpeg',\n })),\n ],\n timestamp: Date.now(),\n },\n ],\n };\n\n const maxTokens = resolveMaxTokens(model.maxTokens, request.maxTokens ?? 512);\n const timeoutMs = request.timeoutMs ?? 60_000;\n const timeoutSignal =\n typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function'\n ? AbortSignal.timeout(timeoutMs)\n : undefined;\n const signal = (() => {\n if (timeoutSignal && request.signal && typeof AbortSignal.any === 'function') {\n return AbortSignal.any([request.signal, timeoutSignal]);\n }\n if (request.signal) {\n return request.signal;\n }\n if (timeoutSignal) {\n return timeoutSignal;\n }\n const controller = new AbortController();\n setTimeout(() => controller.abort(), timeoutMs);\n return controller.signal;\n })();\n\n const message = await complete(model, context, {\n apiKey,\n maxTokens,\n signal,\n });\n\n const text = coerceImageAssistantText({\n message,\n provider: providerId,\n model: modelId,\n });\n return { text, provider: providerId, model: modelId };\n },\n };\n}\n\nfor (const providerId of ['openai', 'anthropic', 'google']) {\n registerImageUnderstandingProvider(buildPiAiImageUnderstandingProvider(providerId));\n}\n"],"mappings":";;;;;gBACsE;~~AAStE~~,SAAS,iBAAiB,gBAAoC,qBAAqB,MAAc;AAC/F,KACE,OAAO,mBAAmB,YAC1B,CAAC,OAAO,SAAS,eAAe,IAChC,kBAAkB,EAElB,QAAO;AAET,QAAO,KAAK,IAAI,oBAAoB,eAAe;;AAGrD,SAAgB,oCAAoC,YAAgD;AAClG,QAAO;EACL,IAAI;EACJ,OAAO,UAAU,WAAW;EAC5B,MAAM,eAAe;GACnB,MAAM,SAAS,MAAM,UAAU,WAAW;AAC1C,UAAO,QAAQ,OAAO;;EAExB,MAAM,eAAe,SAAS,SAAS;GACrC,MAAM,WAAW,GAAG,WAAW,GAAG;GAClC,MAAM,QAAQ,aAAa,SAAS;AACpC,OAAI,CAAC,MAAM,OAAO,SAAS,QAAQ,CACjC,OAAM,IAAI,MAAM,kCAAkC,WAAW;GAE/D,MAAM,SAAS,MAAM,UAAU,WAAW;AAC1C,OAAI,CAAC,OACH,OAAM,IAAI,MAAM,uCAAuC,aAAa;GAGtE,MAAM,UAAmB,EACvB,UAAU,CACR;IACE,MAAM;IACN,SAAS,CACP;KAAE,MAAM;KAAQ,MAAM,QAAQ;KAAQ,EACtC,GAAG,QAAQ,OAAO,KAAK,SAAS;KAC9B,MAAM;KACN,MAAM,IAAI,OAAO,SAAS,SAAS;KACnC,UAAU,IAAI,YAAY;KAC3B,EAAE,CACJ;IACD,WAAW,KAAK,KAAK;IACtB,CACF,EACF;GAED,MAAM,YAAY,iBAAiB,MAAM,WAAW,QAAQ,aAAa,IAAI;GAC7E,MAAM,YAAY,QAAQ,aAAa;GACvC,MAAM,gBACJ,OAAO,gBAAgB,eAAe,OAAO,YAAY,YAAY,aACjE,YAAY,QAAQ,UAAU,GAC9B,KAAA;AA2BN,UAAO;IAAE,MALI,yBAAyB;KACpC,SAPc,MAAM,SAAS,OAAO,SAAS;MAC7C;MACA;MACA,eAlBoB;AACpB,WAAI,iBAAiB,QAAQ,UAAU,OAAO,YAAY,QAAQ,WAChE,QAAO,YAAY,IAAI,CAAC,QAAQ,QAAQ,cAAc,CAAC;AAEzD,WAAI,QAAQ,OACV,QAAO,QAAQ;AAEjB,WAAI,cACF,QAAO;OAET,MAAM,aAAa,IAAI,iBAAiB;AACxC,wBAAiB,WAAW,OAAO,EAAE,UAAU;AAC/C,cAAO,WAAW;UAChB;MAMH,CAAC;KAIA,UAAU;KACV,OAAO;KACR,CAAC;IACa,UAAU;IAAY,OAAO;IAAS;;EAExD;;AAGH,KAAK,MAAM,cAAc;CAAC;CAAU;CAAa;CAAS,CACxD,oCAAmC,oCAAoC,WAAW,CAAC"}
1	+ {"version":3,"file":"pi-ai-provider.js","names":[],"sources":["../../../../../src/agent/image/understanding/pi-ai-provider.ts"],"sourcesContent":["import { complete, type Api, type Context, type Model } from '@mariozechner/pi-ai';\nimport { resolveModel, getApiKey } from '../../../providers/index.js';\nimport { coerceImageAssistantText } from '../image-helpers.js';\nimport { registerImageUnderstandingProvider } from './provider-registry.js';\nimport type { ImageUnderstandingProvider } from './types.js';\n\nfunction resolveMaxTokens(modelMaxTokens: number \| undefined, requestedMaxTokens = 4096): number {\n if (\n typeof modelMaxTokens !== 'number' \|\|\n !Number.isFinite(modelMaxTokens) \|\|\n modelMaxTokens <= 0\n ) {\n return requestedMaxTokens;\n }\n return Math.min(requestedMaxTokens, modelMaxTokens);\n}\n\nexport function buildPiAiImageUnderstandingProvider(providerId: string): ImageUnderstandingProvider {\n return {\n id: providerId,\n label: `pi-ai (${providerId})`,\n async isConfigured() {\n const apiKey = await getApiKey(providerId);\n return Boolean(apiKey);\n },\n async describeImages(modelId, request) {\n const modelRef = `${providerId}/${modelId}`;\n const model = resolveModel(modelRef) as Model<Api>;\n if (!model.input?.includes('image')) {\n throw new Error(`Model does not support images: ${modelRef}`);\n }\n const apiKey = await getApiKey(providerId);\n if (!apiKey) {\n throw new Error(`No API key configured for provider: ${providerId}`);\n }\n\n const context: Context = {\n messages: [\n {\n role: 'user',\n content: [\n { type: 'text', text: request.prompt },\n ...request.images.map((img) => ({\n type: 'image' as const,\n data: img.buffer.toString('base64'),\n mimeType: img.mimeType \|\| 'image/jpeg',\n })),\n ],\n timestamp: Date.now(),\n },\n ],\n };\n\n const maxTokens = resolveMaxTokens(model.maxTokens, request.maxTokens ?? 512);\n const timeoutMs = request.timeoutMs ?? 60_000;\n const timeoutSignal =\n typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function'\n ? AbortSignal.timeout(timeoutMs)\n : undefined;\n const signal = (() => {\n if (timeoutSignal && request.signal && typeof AbortSignal.any === 'function') {\n return AbortSignal.any([request.signal, timeoutSignal]);\n }\n if (request.signal) {\n return request.signal;\n }\n if (timeoutSignal) {\n return timeoutSignal;\n }\n const controller = new AbortController();\n setTimeout(() => controller.abort(), timeoutMs);\n return controller.signal;\n })();\n\n const message = await complete(model, context, {\n apiKey,\n maxTokens,\n signal,\n });\n\n const text = coerceImageAssistantText({\n message,\n provider: providerId,\n model: modelId,\n });\n return { text, provider: providerId, model: modelId };\n },\n };\n}\n\nfor (const providerId of ['openai', 'anthropic', 'google']) {\n registerImageUnderstandingProvider(buildPiAiImageUnderstandingProvider(providerId));\n}\n"],"mappings":";;;;;gBACsE;AAKtE,SAAS,iBAAiB,gBAAoC,qBAAqB,MAAc;AAC/F,KACE,OAAO,mBAAmB,YAC1B,CAAC,OAAO,SAAS,eAAe,IAChC,kBAAkB,EAElB,QAAO;AAET,QAAO,KAAK,IAAI,oBAAoB,eAAe;;AAGrD,SAAgB,oCAAoC,YAAgD;AAClG,QAAO;EACL,IAAI;EACJ,OAAO,UAAU,WAAW;EAC5B,MAAM,eAAe;GACnB,MAAM,SAAS,MAAM,UAAU,WAAW;AAC1C,UAAO,QAAQ,OAAO;;EAExB,MAAM,eAAe,SAAS,SAAS;GACrC,MAAM,WAAW,GAAG,WAAW,GAAG;GAClC,MAAM,QAAQ,aAAa,SAAS;AACpC,OAAI,CAAC,MAAM,OAAO,SAAS,QAAQ,CACjC,OAAM,IAAI,MAAM,kCAAkC,WAAW;GAE/D,MAAM,SAAS,MAAM,UAAU,WAAW;AAC1C,OAAI,CAAC,OACH,OAAM,IAAI,MAAM,uCAAuC,aAAa;GAGtE,MAAM,UAAmB,EACvB,UAAU,CACR;IACE,MAAM;IACN,SAAS,CACP;KAAE,MAAM;KAAQ,MAAM,QAAQ;KAAQ,EACtC,GAAG,QAAQ,OAAO,KAAK,SAAS;KAC9B,MAAM;KACN,MAAM,IAAI,OAAO,SAAS,SAAS;KACnC,UAAU,IAAI,YAAY;KAC3B,EAAE,CACJ;IACD,WAAW,KAAK,KAAK;IACtB,CACF,EACF;GAED,MAAM,YAAY,iBAAiB,MAAM,WAAW,QAAQ,aAAa,IAAI;GAC7E,MAAM,YAAY,QAAQ,aAAa;GACvC,MAAM,gBACJ,OAAO,gBAAgB,eAAe,OAAO,YAAY,YAAY,aACjE,YAAY,QAAQ,UAAU,GAC9B,KAAA;AA2BN,UAAO;IAAE,MALI,yBAAyB;KACpC,SAPc,MAAM,SAAS,OAAO,SAAS;MAC7C;MACA;MACA,eAlBoB;AACpB,WAAI,iBAAiB,QAAQ,UAAU,OAAO,YAAY,QAAQ,WAChE,QAAO,YAAY,IAAI,CAAC,QAAQ,QAAQ,cAAc,CAAC;AAEzD,WAAI,QAAQ,OACV,QAAO,QAAQ;AAEjB,WAAI,cACF,QAAO;OAET,MAAM,aAAa,IAAI,iBAAiB;AACxC,wBAAiB,WAAW,OAAO,EAAE,UAAU;AAC/C,cAAO,WAAW;UAChB;MAMH,CAAC;KAIA,UAAU;KACV,OAAO;KACR,CAAC;IACa,UAAU;IAAY,OAAO;IAAS;;EAExD;;AAGH,KAAK,MAAM,cAAc;CAAC;CAAU;CAAa;CAAS,CACxD,oCAAmC,oCAAoC,WAAW,CAAC"}

package/dist/src/agent/ipc/inbox.js CHANGED Viewed

@@ -1,9 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveAgentDir } from "../../config/paths.js";
+import { mkdir, readFile, readdir, rename, writeFile } from "fs/promises";
 import { join } from "path";
 import { existsSync, watch } from "fs";
-import { mkdir, readFile, readdir, rename, writeFile } from "fs/promises";
 //#region src/agent/ipc/inbox.ts
 init_logger();
 init_paths();

package/dist/src/agent/ipc/socket.js CHANGED Viewed

@@ -2,8 +2,8 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveSocketPath } from "../../config/paths.js";
 import { isValidIPCMessage } from "./types.js";
-import { dirname } from "path";
 import { mkdir } from "fs/promises";
+import { dirname } from "path";
 import { Socket, createServer } from "net";
 //#region src/agent/ipc/socket.ts
 init_logger();

package/dist/src/agent/memory/compaction.d.ts CHANGED Viewed

@@ -44,7 +44,7 @@ export declare class SessionCompactor {
         reason: string;
         usagePercent?: number;
     };
-    compact(messages: AgentMessage[], _instructions?: string): Promise<CompactionResult>;
+    compact(messages: AgentMessage[], instructions?: string, force?: boolean): Promise<CompactionResult>;
     private generateSummary;
     private llmAbstractiveSummary;
     private formatMessages;

package/dist/src/agent/memory/compaction.js CHANGED Viewed

@@ -121,9 +121,17 @@ var SessionCompactor = class {
 			reason: "within_threshold"
 		};
 	}
-	async compact(messages, _instructions) {
+	async compact(messages, instructions, force) {
 		const effectiveMessages = filterDroppableMessages(messages);
-		if (effectiveMessages.length < this.config.minMessagesBeforeCompact) return {
+		const minRequired = this.config.minMessagesBeforeCompact;
+		if (!force && effectiveMessages.length < minRequired) return {
+			summary: "",
+			firstKeptIndex: 0,
+			tokensBefore: this.estimateTotalTokens(effectiveMessages),
+			tokensAfter: this.estimateTotalTokens(effectiveMessages),
+			compacted: false
+		};
+		if (force && effectiveMessages.length < 2) return {
 			summary: "",
 			firstKeptIndex: 0,
 			tokensBefore: this.estimateTotalTokens(effectiveMessages),
@@ -131,15 +139,33 @@ var SessionCompactor = class {
 			compacted: false
 		};
 		const range = calculateCompactionRange(effectiveMessages, this.config);
-		const keepRecent = range ? effectiveMessages.length - range.end : this.config.keepRecentMessages;
-		const messagesToSummarize = range ? effectiveMessages.slice(0, range.end) : effectiveMessages.slice(0, -keepRecent);
-		const keptMessages = range ? effectiveMessages.slice(range.end) : effectiveMessages.slice(-keepRecent);
+		let messagesToSummarize;
+		let keptMessages;
+		if (range) {
+			messagesToSummarize = effectiveMessages.slice(0, range.end);
+			keptMessages = effectiveMessages.slice(range.end);
+		} else if (force) {
+			const keep = Math.min(this.config.keepRecentMessages, Math.max(1, effectiveMessages.length - 1));
+			messagesToSummarize = effectiveMessages.slice(0, effectiveMessages.length - keep);
+			keptMessages = effectiveMessages.slice(-keep);
+		} else {
+			const keepRecent = this.config.keepRecentMessages;
+			messagesToSummarize = effectiveMessages.slice(0, -keepRecent);
+			keptMessages = effectiveMessages.slice(-keepRecent);
+		}
+		if (messagesToSummarize.length === 0) return {
+			summary: "",
+			firstKeptIndex: 0,
+			tokensBefore: this.estimateTotalTokens(effectiveMessages),
+			tokensAfter: this.estimateTotalTokens(effectiveMessages),
+			compacted: false
+		};
 		let preservedReasoning = null;
 		if (this.config.preserveReasoning) {
 			preservedReasoning = extractLastReasoning(messagesToSummarize);
 			if (preservedReasoning) injectReasoningIntoFirstAssistant(keptMessages, preservedReasoning);
 		}
-		const summary = await this.generateSummary(messagesToSummarize);
+		const summary = await this.generateSummary(messagesToSummarize, instructions);
 		const structuredSummary = this.config.mode === "structured" ? generateStructuredSummary(messagesToSummarize) : void 0;
 		const tokensBefore = this.estimateTotalTokens(effectiveMessages);
 		const tokensAfter = estimateTokens(summary) + 20 + this.estimateTotalTokens(keptMessages);
@@ -155,24 +181,25 @@ var SessionCompactor = class {
 			compactedUsage
 		};
 	}
-	async generateSummary(messages) {
+	async generateSummary(messages, instructions) {
 		if (this.model && (this.config.mode === "abstractive" || this.config.mode === "structured")) try {
 			if (this.config.mode === "structured") return formatSummaryAsText(generateStructuredSummary(messages), true);
-			else return await this.llmAbstractiveSummary(messages);
+			else return await this.llmAbstractiveSummary(messages, instructions);
 		} catch (err) {
 			console.warn("[Compactor] LLM summarization failed, falling back to extractive", err);
 		}
 		return this.extractiveSummary(messages);
 	}
-	async llmAbstractiveSummary(messages) {
+	async llmAbstractiveSummary(messages, instructions) {
 		if (!this.model) throw new Error("Model not available");
+		const conversation = this.formatMessages(messages);
 		const prompt = `Summarize the following conversation in 2-3 concise sentences. Focus on:
 1. What the user was trying to accomplish
 2. Key decisions, outcomes, or solutions
 3. Any important context that should be preserved
+${instructions?.trim() ? `\nAdditional focus from the user:\n${instructions.trim()}\n` : ""}
 Conversation:
-${this.formatMessages(messages)}
+${conversation}
 Summary:`;
 		const controller = new AbortController();

package/dist/src/agent/memory/compaction.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"compaction.js","names":[],"sources":["../../../../src/agent/memory/compaction.ts"],"sourcesContent":["import type { AgentMessage } from '@mariozechner/pi-agent-core';\nimport { complete, type Model, type Api, type UserMessage } from '@mariozechner/pi-ai';\nimport { generateStructuredSummary, formatSummaryAsText, type ConversationSummary } from './summary-generator.js';\n\nexport interface CompactionResult {\n summary: string;\n firstKeptIndex: number;\n tokensBefore: number;\n tokensAfter: number;\n compacted: boolean;\n structuredSummary?: ConversationSummary;\n compactedUsage?: {\n input: number;\n output: number;\n total: number;\n cost?: number;\n };\n}\n\nexport interface CompactionConfig {\n enabled: boolean;\n mode: 'extractive' \| 'abstractive' \| 'structured';\n reserveTokens: number;\n triggerThreshold: number;\n minMessagesBeforeCompact: number;\n keepRecentMessages: number;\n summaryMaxTokens: number;\n evictionWindow: number;\n retentionWindow: number;\n preserveReasoning: boolean;\n accumulateUsage: boolean;\n}\n\nconst DEFAULT_CONFIG: CompactionConfig = {\n enabled: true,\n mode: 'abstractive',\n reserveTokens: 8000,\n triggerThreshold: 0.8,\n minMessagesBeforeCompact: 10,\n keepRecentMessages: 10,\n summaryMaxTokens: 500,\n evictionWindow: 0.2,\n retentionWindow: 6,\n preserveReasoning: true,\n accumulateUsage: true,\n};\n\nfunction estimateTokens(text: string): number {\n return Math.ceil(text.length / 4);\n}\n\nfunction estimateMessageTokens(msg: AgentMessage): number {\n let text = '';\n \n if (typeof msg.content === 'string') {\n text = msg.content;\n } else if (Array.isArray(msg.content)) {\n text = msg.content\n .filter(c => c.type === 'text')\n .map(c => (c as { text?: string }).text \|\| '')\n .join('\\n');\n }\n \n return estimateTokens(text) + 10;\n}\n\n// Internal: Reasoning extraction utilities\ninterface ReasoningDetails {\n thinking?: string;\n signature?: string;\n}\n\nfunction extractLastReasoning(messages: AgentMessage[]): ReasoningDetails \| null {\n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n if (msg.role === 'assistant') {\n const rd = (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details;\n if (rd && (rd.thinking \|\| rd.signature)) {\n return rd;\n }\n }\n }\n return null;\n}\n\n// Internal: Inject reasoning into first assistant message\nfunction injectReasoningIntoFirstAssistant(\n messages: AgentMessage[],\n reasoning: ReasoningDetails\n): void {\n for (const msg of messages) {\n if (msg.role === 'assistant') {\n const existing = (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details;\n if (!existing \|\| (!existing.thinking && !existing.signature)) {\n (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details = reasoning;\n }\n break;\n }\n }\n}\n\n// Internal: Message usage tracking\ninterface MessageUsage {\n input: number;\n output: number;\n total: number;\n cost?: number;\n}\n\nexport function accumulateUsage(messages: AgentMessage[]): MessageUsage \| undefined {\n let totalInput = 0;\n let totalOutput = 0;\n let totalCost = 0;\n let hasUsage = false;\n\n for (const msg of messages) {\n const usage = (msg as unknown as { usage?: MessageUsage }).usage;\n if (usage) {\n hasUsage = true;\n totalInput += usage.input \|\| 0;\n totalOutput += usage.output \|\| 0;\n totalCost += usage.cost \|\| 0;\n }\n }\n\n if (!hasUsage) return undefined;\n\n return {\n input: totalInput,\n output: totalOutput,\n total: totalInput + totalOutput,\n cost: totalCost > 0 ? totalCost : undefined,\n };\n}\n\n// Internal: Droppable message filtering\ntype DroppableMessage = AgentMessage & {\n droppable?: boolean;\n};\n\nfunction filterDroppableMessages(messages: AgentMessage[]): AgentMessage[] {\n return messages.filter(msg => !(msg as DroppableMessage).droppable);\n}\n\nfunction findNthTurnFromEnd(messages: AgentMessage[], n: number): number {\n if (n <= 0) return messages.length;\n \n let turnsFound = 0;\n let lastRole: string \| null = null;\n \n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n \n if (msg.role === 'user' && lastRole !== 'user') {\n turnsFound++;\n if (turnsFound === n) {\n return i;\n }\n }\n lastRole = msg.role;\n }\n \n return 0;\n}\n\n// Internal: Calculate compaction range\nfunction calculateCompactionRange(\n messages: AgentMessage[],\n config: CompactionConfig\n): { start: number; end: number } \| null {\n const totalMessages = messages.length;\n \n if (totalMessages < config.minMessagesBeforeCompact) {\n return null;\n }\n \n const evictionEnd = Math.floor(totalMessages * config.evictionWindow);\n const retentionStart = findNthTurnFromEnd(messages, config.retentionWindow);\n const retentionEnd = retentionStart > 0 ? retentionStart - 1 : 0;\n const compactionEnd = Math.min(evictionEnd, retentionEnd);\n \n if (compactionEnd <= 1) {\n return null;\n }\n \n return { start: 0, end: compactionEnd };\n}\n\nexport class SessionCompactor {\n private config: CompactionConfig;\n \n constructor(\n config?: Partial<CompactionConfig>,\n private model?: Model<Api>\n ) {\n this.config = { ...DEFAULT_CONFIG, ...config };\n }\n\n needsCompaction(\n messages: AgentMessage[],\n contextWindow: number\n ): { needed: boolean; reason: string; usagePercent?: number } {\n if (!this.config.enabled) {\n return { needed: false, reason: 'disabled' };\n }\n\n if (messages.length < this.config.minMessagesBeforeCompact) {\n return { needed: false, reason: 'not_enough_messages' };\n }\n\n const totalTokens = this.estimateTotalTokens(messages);\n const usagePercent = totalTokens / contextWindow;\n\n if (usagePercent > this.config.triggerThreshold) {\n return { \n needed: true, \n reason: 'threshold_exceeded',\n usagePercent \n };\n }\n\n return { needed: false, reason: 'within_threshold' };\n }\n\n async compact(\n messages: AgentMessage[],\n _instructions?: string\n ): Promise<CompactionResult> {\n const effectiveMessages = filterDroppableMessages(messages);\n \n if (effectiveMessages.length < this.config.minMessagesBeforeCompact) {\n return {\n summary: '',\n firstKeptIndex: 0,\n tokensBefore: this.estimateTotalTokens(effectiveMessages),\n tokensAfter: this.estimateTotalTokens(effectiveMessages),\n compacted: false,\n };\n }\n\n const range = calculateCompactionRange(effectiveMessages, this.config);\n const keepRecent = range ? effectiveMessages.length - range.end : this.config.keepRecentMessages;\n const messagesToSummarize = range \n ? effectiveMessages.slice(0, range.end)\n : effectiveMessages.slice(0, -keepRecent);\n const keptMessages = range \n ? effectiveMessages.slice(range.end)\n : effectiveMessages.slice(-keepRecent);\n\n let preservedReasoning: ReasoningDetails \| null = null;\n if (this.config.preserveReasoning) {\n preservedReasoning = extractLastReasoning(messagesToSummarize);\n if (preservedReasoning) {\n injectReasoningIntoFirstAssistant(keptMessages, preservedReasoning);\n }\n }\n\n const summary = await this.generateSummary(messagesToSummarize);\n const structuredSummary = this.config.mode === 'structured' \n ? generateStructuredSummary(messagesToSummarize)\n : undefined;\n\n const tokensBefore = this.estimateTotalTokens(effectiveMessages);\n const summaryTokens = estimateTokens(summary) + 20;\n const keptTokens = this.estimateTotalTokens(keptMessages);\n const tokensAfter = summaryTokens + keptTokens;\n\n let compactedUsage: MessageUsage \| undefined;\n if (this.config.accumulateUsage) {\n compactedUsage = accumulateUsage(messagesToSummarize);\n }\n\n return {\n summary,\n firstKeptIndex: keptMessages.length > 0 ? effectiveMessages.length - keptMessages.length : 0,\n tokensBefore,\n tokensAfter,\n compacted: true,\n structuredSummary,\n compactedUsage,\n };\n }\n\n private async generateSummary(messages: AgentMessage[]): Promise<string> {\n if (this.model && (this.config.mode === 'abstractive' \|\| this.config.mode === 'structured')) {\n try {\n if (this.config.mode === 'structured') {\n const structured = generateStructuredSummary(messages);\n return formatSummaryAsText(structured, true);\n } else {\n return await this.llmAbstractiveSummary(messages);\n }\n } catch (err) {\n console.warn('[Compactor] LLM summarization failed, falling back to extractive', err);\n }\n }\n\n return this.extractiveSummary(messages);\n }\n\n private async llmAbstractiveSummary(messages: AgentMessage[]): Promise<string> {\n if (!this.model) {\n throw new Error('Model not available');\n }\n\n const conversation = this.formatMessages(messages);\n const prompt = `Summarize the following conversation in 2-3 concise sentences. Focus on:\n1. What the user was trying to accomplish\n2. Key decisions, outcomes, or solutions\n3. Any important context that should be preserved\n\nConversation:\n${conversation}\n\nSummary:`;\n\n const controller = new AbortController();\n const timeoutId = setTimeout(() => controller.abort(), 30000);\n\n try {\n const summaryMessage: UserMessage = { role: 'user', content: prompt, timestamp: Date.now() };\n const result = await complete(this.model, { \n messages: [summaryMessage]\n }, {\n maxTokens: this.config.summaryMaxTokens,\n temperature: 0.3,\n signal: controller.signal as any,\n });\n\n const text = Array.isArray(result.content)\n ? result.content.filter((c: any) => c.type === 'text').map((c: any) => c.text).join('')\n : '';\n\n return text.trim();\n } catch (err) {\n if (err instanceof Error && err.name === 'AbortError') {\n throw new Error('LLM summarization timed out after 30 seconds');\n }\n throw err;\n } finally {\n clearTimeout(timeoutId);\n }\n }\n\n private formatMessages(messages: AgentMessage[]): string {\n return messages\n .map(m => {\n const role = m.role;\n const content = typeof m.content === 'string' \n ? m.content \n : (m.content as Array<{ type: string; text?: string }>).filter(c => c.type === 'text').map(c => c.text \|\| '').join('\\n');\n return `[${role}]: ${content}`;\n })\n .join('\\n\\n');\n }\n\n private extractiveSummary(messages: AgentMessage[]): string {\n const userMessages = messages\n .filter(m => m.role === 'user')\n .slice(-5)\n .map(m => {\n if (typeof m.content === 'string') return m.content;\n if (Array.isArray(m.content)) {\n return m.content\n .filter(c => c.type === 'text')\n .map(c => (c as { text?: string }).text \|\| '')\n .join('\\n');\n }\n return '';\n })\n .filter(t => t.length > 0)\n .join('; ');\n\n return `Previous conversation covered: ${userMessages.slice(0, 300)}...`;\n }\n\n estimateTotalTokens(messages: AgentMessage[]): number {\n return messages.reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);\n }\n\n applyCompaction(\n messages: AgentMessage[],\n result: CompactionResult\n ): AgentMessage[] {\n if (!result.compacted \|\| !result.summary) {\n return messages;\n }\n\n const summaryMessage: AgentMessage & { usage?: MessageUsage } = {\n role: 'user',\n content: [{ type: 'text', text: `[Previous conversation summary]: ${result.summary}` }],\n timestamp: Date.now(),\n };\n\n if (result.compactedUsage) {\n summaryMessage.usage = result.compactedUsage;\n }\n\n const keptMessages = messages.slice(result.firstKeptIndex);\n return [summaryMessage, ...keptMessages];\n }\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"compaction.js","names":[],"sources":["../../../../src/agent/memory/compaction.ts"],"sourcesContent":["import type { AgentMessage } from '@mariozechner/pi-agent-core';\nimport { complete, type Model, type Api, type UserMessage } from '@mariozechner/pi-ai';\nimport { generateStructuredSummary, formatSummaryAsText, type ConversationSummary } from './summary-generator.js';\n\nexport interface CompactionResult {\n summary: string;\n firstKeptIndex: number;\n tokensBefore: number;\n tokensAfter: number;\n compacted: boolean;\n structuredSummary?: ConversationSummary;\n compactedUsage?: {\n input: number;\n output: number;\n total: number;\n cost?: number;\n };\n}\n\nexport interface CompactionConfig {\n enabled: boolean;\n mode: 'extractive' \| 'abstractive' \| 'structured';\n reserveTokens: number;\n triggerThreshold: number;\n minMessagesBeforeCompact: number;\n keepRecentMessages: number;\n summaryMaxTokens: number;\n evictionWindow: number;\n retentionWindow: number;\n preserveReasoning: boolean;\n accumulateUsage: boolean;\n}\n\nconst DEFAULT_CONFIG: CompactionConfig = {\n enabled: true,\n mode: 'abstractive',\n reserveTokens: 8000,\n triggerThreshold: 0.8,\n minMessagesBeforeCompact: 10,\n keepRecentMessages: 10,\n summaryMaxTokens: 500,\n evictionWindow: 0.2,\n retentionWindow: 6,\n preserveReasoning: true,\n accumulateUsage: true,\n};\n\nfunction estimateTokens(text: string): number {\n return Math.ceil(text.length / 4);\n}\n\nfunction estimateMessageTokens(msg: AgentMessage): number {\n let text = '';\n \n if (typeof msg.content === 'string') {\n text = msg.content;\n } else if (Array.isArray(msg.content)) {\n text = msg.content\n .filter(c => c.type === 'text')\n .map(c => (c as { text?: string }).text \|\| '')\n .join('\\n');\n }\n \n return estimateTokens(text) + 10;\n}\n\n// Internal: Reasoning extraction utilities\ninterface ReasoningDetails {\n thinking?: string;\n signature?: string;\n}\n\nfunction extractLastReasoning(messages: AgentMessage[]): ReasoningDetails \| null {\n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n if (msg.role === 'assistant') {\n const rd = (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details;\n if (rd && (rd.thinking \|\| rd.signature)) {\n return rd;\n }\n }\n }\n return null;\n}\n\n// Internal: Inject reasoning into first assistant message\nfunction injectReasoningIntoFirstAssistant(\n messages: AgentMessage[],\n reasoning: ReasoningDetails\n): void {\n for (const msg of messages) {\n if (msg.role === 'assistant') {\n const existing = (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details;\n if (!existing \|\| (!existing.thinking && !existing.signature)) {\n (msg as unknown as { reasoning_details?: ReasoningDetails }).reasoning_details = reasoning;\n }\n break;\n }\n }\n}\n\n// Internal: Message usage tracking\ninterface MessageUsage {\n input: number;\n output: number;\n total: number;\n cost?: number;\n}\n\nexport function accumulateUsage(messages: AgentMessage[]): MessageUsage \| undefined {\n let totalInput = 0;\n let totalOutput = 0;\n let totalCost = 0;\n let hasUsage = false;\n\n for (const msg of messages) {\n const usage = (msg as unknown as { usage?: MessageUsage }).usage;\n if (usage) {\n hasUsage = true;\n totalInput += usage.input \|\| 0;\n totalOutput += usage.output \|\| 0;\n totalCost += usage.cost \|\| 0;\n }\n }\n\n if (!hasUsage) return undefined;\n\n return {\n input: totalInput,\n output: totalOutput,\n total: totalInput + totalOutput,\n cost: totalCost > 0 ? totalCost : undefined,\n };\n}\n\n// Internal: Droppable message filtering\ntype DroppableMessage = AgentMessage & {\n droppable?: boolean;\n};\n\nfunction filterDroppableMessages(messages: AgentMessage[]): AgentMessage[] {\n return messages.filter(msg => !(msg as DroppableMessage).droppable);\n}\n\nfunction findNthTurnFromEnd(messages: AgentMessage[], n: number): number {\n if (n <= 0) return messages.length;\n \n let turnsFound = 0;\n let lastRole: string \| null = null;\n \n for (let i = messages.length - 1; i >= 0; i--) {\n const msg = messages[i];\n \n if (msg.role === 'user' && lastRole !== 'user') {\n turnsFound++;\n if (turnsFound === n) {\n return i;\n }\n }\n lastRole = msg.role;\n }\n \n return 0;\n}\n\n// Internal: Calculate compaction range\nfunction calculateCompactionRange(\n messages: AgentMessage[],\n config: CompactionConfig\n): { start: number; end: number } \| null {\n const totalMessages = messages.length;\n \n if (totalMessages < config.minMessagesBeforeCompact) {\n return null;\n }\n \n const evictionEnd = Math.floor(totalMessages * config.evictionWindow);\n const retentionStart = findNthTurnFromEnd(messages, config.retentionWindow);\n const retentionEnd = retentionStart > 0 ? retentionStart - 1 : 0;\n const compactionEnd = Math.min(evictionEnd, retentionEnd);\n \n if (compactionEnd <= 1) {\n return null;\n }\n \n return { start: 0, end: compactionEnd };\n}\n\nexport class SessionCompactor {\n private config: CompactionConfig;\n \n constructor(\n config?: Partial<CompactionConfig>,\n private model?: Model<Api>\n ) {\n this.config = { ...DEFAULT_CONFIG, ...config };\n }\n\n needsCompaction(\n messages: AgentMessage[],\n contextWindow: number\n ): { needed: boolean; reason: string; usagePercent?: number } {\n if (!this.config.enabled) {\n return { needed: false, reason: 'disabled' };\n }\n\n if (messages.length < this.config.minMessagesBeforeCompact) {\n return { needed: false, reason: 'not_enough_messages' };\n }\n\n const totalTokens = this.estimateTotalTokens(messages);\n const usagePercent = totalTokens / contextWindow;\n\n if (usagePercent > this.config.triggerThreshold) {\n return { \n needed: true, \n reason: 'threshold_exceeded',\n usagePercent \n };\n }\n\n return { needed: false, reason: 'within_threshold' };\n }\n\n async compact(\n messages: AgentMessage[],\n instructions?: string,\n force?: boolean,\n ): Promise<CompactionResult> {\n const effectiveMessages = filterDroppableMessages(messages);\n\n const minRequired = this.config.minMessagesBeforeCompact;\n if (!force && effectiveMessages.length < minRequired) {\n return {\n summary: '',\n firstKeptIndex: 0,\n tokensBefore: this.estimateTotalTokens(effectiveMessages),\n tokensAfter: this.estimateTotalTokens(effectiveMessages),\n compacted: false,\n };\n }\n\n if (force && effectiveMessages.length < 2) {\n return {\n summary: '',\n firstKeptIndex: 0,\n tokensBefore: this.estimateTotalTokens(effectiveMessages),\n tokensAfter: this.estimateTotalTokens(effectiveMessages),\n compacted: false,\n };\n }\n\n const range = calculateCompactionRange(effectiveMessages, this.config);\n let messagesToSummarize: AgentMessage[];\n let keptMessages: AgentMessage[];\n\n if (range) {\n messagesToSummarize = effectiveMessages.slice(0, range.end);\n keptMessages = effectiveMessages.slice(range.end);\n } else if (force) {\n const keep = Math.min(\n this.config.keepRecentMessages,\n Math.max(1, effectiveMessages.length - 1),\n );\n messagesToSummarize = effectiveMessages.slice(0, effectiveMessages.length - keep);\n keptMessages = effectiveMessages.slice(-keep);\n } else {\n const keepRecent = this.config.keepRecentMessages;\n messagesToSummarize = effectiveMessages.slice(0, -keepRecent);\n keptMessages = effectiveMessages.slice(-keepRecent);\n }\n\n if (messagesToSummarize.length === 0) {\n return {\n summary: '',\n firstKeptIndex: 0,\n tokensBefore: this.estimateTotalTokens(effectiveMessages),\n tokensAfter: this.estimateTotalTokens(effectiveMessages),\n compacted: false,\n };\n }\n\n let preservedReasoning: ReasoningDetails \| null = null;\n if (this.config.preserveReasoning) {\n preservedReasoning = extractLastReasoning(messagesToSummarize);\n if (preservedReasoning) {\n injectReasoningIntoFirstAssistant(keptMessages, preservedReasoning);\n }\n }\n\n const summary = await this.generateSummary(messagesToSummarize, instructions);\n const structuredSummary = this.config.mode === 'structured' \n ? generateStructuredSummary(messagesToSummarize)\n : undefined;\n\n const tokensBefore = this.estimateTotalTokens(effectiveMessages);\n const summaryTokens = estimateTokens(summary) + 20;\n const keptTokens = this.estimateTotalTokens(keptMessages);\n const tokensAfter = summaryTokens + keptTokens;\n\n let compactedUsage: MessageUsage \| undefined;\n if (this.config.accumulateUsage) {\n compactedUsage = accumulateUsage(messagesToSummarize);\n }\n\n return {\n summary,\n firstKeptIndex: keptMessages.length > 0 ? effectiveMessages.length - keptMessages.length : 0,\n tokensBefore,\n tokensAfter,\n compacted: true,\n structuredSummary,\n compactedUsage,\n };\n }\n\n private async generateSummary(messages: AgentMessage[], instructions?: string): Promise<string> {\n if (this.model && (this.config.mode === 'abstractive' \|\| this.config.mode === 'structured')) {\n try {\n if (this.config.mode === 'structured') {\n const structured = generateStructuredSummary(messages);\n return formatSummaryAsText(structured, true);\n } else {\n return await this.llmAbstractiveSummary(messages, instructions);\n }\n } catch (err) {\n console.warn('[Compactor] LLM summarization failed, falling back to extractive', err);\n }\n }\n\n return this.extractiveSummary(messages);\n }\n\n private async llmAbstractiveSummary(messages: AgentMessage[], instructions?: string): Promise<string> {\n if (!this.model) {\n throw new Error('Model not available');\n }\n\n const conversation = this.formatMessages(messages);\n const extra = instructions?.trim()\n ? `\\nAdditional focus from the user:\\n${instructions.trim()}\\n`\n : '';\n const prompt = `Summarize the following conversation in 2-3 concise sentences. Focus on:\n1. What the user was trying to accomplish\n2. Key decisions, outcomes, or solutions\n3. Any important context that should be preserved\n${extra}\nConversation:\n${conversation}\n\nSummary:`;\n\n const controller = new AbortController();\n const timeoutId = setTimeout(() => controller.abort(), 30000);\n\n try {\n const summaryMessage: UserMessage = { role: 'user', content: prompt, timestamp: Date.now() };\n const result = await complete(this.model, { \n messages: [summaryMessage]\n }, {\n maxTokens: this.config.summaryMaxTokens,\n temperature: 0.3,\n signal: controller.signal as any,\n });\n\n const text = Array.isArray(result.content)\n ? result.content.filter((c: any) => c.type === 'text').map((c: any) => c.text).join('')\n : '';\n\n return text.trim();\n } catch (err) {\n if (err instanceof Error && err.name === 'AbortError') {\n throw new Error('LLM summarization timed out after 30 seconds');\n }\n throw err;\n } finally {\n clearTimeout(timeoutId);\n }\n }\n\n private formatMessages(messages: AgentMessage[]): string {\n return messages\n .map(m => {\n const role = m.role;\n const content = typeof m.content === 'string' \n ? m.content \n : (m.content as Array<{ type: string; text?: string }>).filter(c => c.type === 'text').map(c => c.text \|\| '').join('\\n');\n return `[${role}]: ${content}`;\n })\n .join('\\n\\n');\n }\n\n private extractiveSummary(messages: AgentMessage[]): string {\n const userMessages = messages\n .filter(m => m.role === 'user')\n .slice(-5)\n .map(m => {\n if (typeof m.content === 'string') return m.content;\n if (Array.isArray(m.content)) {\n return m.content\n .filter(c => c.type === 'text')\n .map(c => (c as { text?: string }).text \|\| '')\n .join('\\n');\n }\n return '';\n })\n .filter(t => t.length > 0)\n .join('; ');\n\n return `Previous conversation covered: ${userMessages.slice(0, 300)}...`;\n }\n\n estimateTotalTokens(messages: AgentMessage[]): number {\n return messages.reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);\n }\n\n applyCompaction(\n messages: AgentMessage[],\n result: CompactionResult\n ): AgentMessage[] {\n if (!result.compacted \|\| !result.summary) {\n return messages;\n }\n\n const summaryMessage: AgentMessage & { usage?: MessageUsage } = {\n role: 'user',\n content: [{ type: 'text', text: `[Previous conversation summary]: ${result.summary}` }],\n timestamp: Date.now(),\n };\n\n if (result.compactedUsage) {\n summaryMessage.usage = result.compactedUsage;\n }\n\n const keptMessages = messages.slice(result.firstKeptIndex);\n return [summaryMessage, ...keptMessages];\n }\n}\n"],"mappings":"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"}

package/dist/src/agent/memory/plugin-discovery.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { readdir, stat } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
 //#region src/agent/memory/plugin-discovery.ts
 async function discoverMemoryPlugins() {
 	const pluginsDir = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "plugins", "memory");

package/dist/src/agent/messaging/command-handler.d.ts CHANGED Viewed

@@ -7,6 +7,7 @@ import type { MessageBus } from '../../infra/bus/index.js';
 import type { Config } from '../../config/schema.js';
 import type { SessionConfigStore, SessionStore } from '../../session/index.js';
 import type { ThinkLevel } from '../transcript/thinking-types.js';
+import type { CompactionResult } from '../memory/compaction.js';
 export interface CommandContext {
     sessionKey: string;
     channel: string;
@@ -27,6 +28,15 @@ export interface CommandHandlerConfig {
     invalidateAgentSession?: (sessionKey: string) => void;
     /** Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) */
     abortSessionTurn?: (sessionKey: string) => Promise<void>;
+    compactSession?: (sessionKey: string, options?: {
+        instructions?: string;
+        force?: boolean;
+    }) => Promise<CompactionResult>;
+    btwQuery?: (sessionKey: string, question: string) => Promise<{
+        text: string;
+        error?: string;
+    }>;
+    getSessionContextReport?: (sessionKey: string, mode: 'list' | 'detail' | 'json') => Promise<string>;
 }
 export declare class CommandHandler {
     private config;
@@ -38,6 +48,9 @@ export declare class CommandHandler {
     private switchModelForSession;
     private invalidateAgentSession?;
     private abortSessionTurn?;
+    private compactSession?;
+    private btwQuery?;
+    private getSessionContextReport?;
     constructor(handlerConfig: CommandHandlerConfig);
     /** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */
     updateAgentConfig(config: Config): void;

package/dist/src/agent/messaging/command-handler.js CHANGED Viewed

@@ -18,6 +18,9 @@ var CommandHandler = class {
 	switchModelForSession;
 	invalidateAgentSession;
 	abortSessionTurn;
+	compactSession;
+	btwQuery;
+	getSessionContextReport;
 	constructor(handlerConfig) {
 		this.config = handlerConfig.config;
 		this.bus = handlerConfig.bus;
@@ -28,6 +31,9 @@ var CommandHandler = class {
 		this.switchModelForSession = handlerConfig.switchModelForSession;
 		this.invalidateAgentSession = handlerConfig.invalidateAgentSession;
 		this.abortSessionTurn = handlerConfig.abortSessionTurn;
+		this.compactSession = handlerConfig.compactSession;
+		this.btwQuery = handlerConfig.btwQuery;
+		this.getSessionContextReport = handlerConfig.getSessionContextReport;
 	}
 	/** Replace config reference after hot reload or gateway PATCH so commands see current defaults. */
 	updateAgentConfig(config) {
@@ -106,7 +112,10 @@ var CommandHandler = class {
 			invalidateAgentSession: this.invalidateAgentSession,
 			abortCurrentTurn: this.abortSessionTurn ? async () => {
 				await this.abortSessionTurn(context.sessionKey);
-			} : void 0
+			} : void 0,
+			compactSession: this.compactSession,
+			btwQuery: this.btwQuery,
+			getSessionContextReport: this.getSessionContextReport
 		});
 		const result = await commandRegistry.execute(commandName, cmdCtx, args);
 		if (result.content) await this.bus.publishOutbound({
@@ -203,7 +212,10 @@ var CommandHandler = class {
 			invalidateAgentSession: this.invalidateAgentSession,
 			abortCurrentTurn: this.abortSessionTurn ? async () => {
 				await this.abortSessionTurn(context.sessionKey);
-			} : void 0
+			} : void 0,
+			compactSession: this.compactSession,
+			btwQuery: this.btwQuery,
+			getSessionContextReport: this.getSessionContextReport
 		});
 		const result = await commandRegistry.execute(commandName, wrapped, args);
 		if (result.content) {

package/dist/src/agent/messaging/command-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"command-handler.js","names":[],"sources":["../../../../src/agent/messaging/command-handler.ts"],"sourcesContent":["/*\n Command Handler - Parses and executes commands\n \n Handles command execution using the unified command system.\n /\n\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { commandRegistry, createCommandContext } from '../../chat-commands/index.js';\nimport { getAllProviders, getModelsByProvider, getProviderDisplayName } from '../../providers/index.js';\n\nconst log = createLogger('CommandHandler');\n\nexport interface CommandContext {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId: string;\n isGroup: boolean;\n}\n\nexport interface CommandHandlerConfig {\n config: Config;\n bus: MessageBus;\n sessionStore: SessionStore;\n sessionConfigStore?: SessionConfigStore;\n /* After /think persists, sync pi-agent /\n applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n getCurrentModel: () => string;\n switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n /* Drop in-memory agent after session file is cleared (e.g. /new) /\n invalidateAgentSession?: (sessionKey: string) => void;\n /* Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) /\n abortSessionTurn?: (sessionKey: string) => Promise<void>;\n}\n\nexport class CommandHandler {\n private config: Config;\n private bus: MessageBus;\n private sessionStore: SessionStore;\n private sessionConfigStore?: SessionConfigStore;\n private applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n private getCurrentModel: () => string;\n private switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n private invalidateAgentSession?: (sessionKey: string) => void;\n private abortSessionTurn?: (sessionKey: string) => Promise<void>;\n\n constructor(handlerConfig: CommandHandlerConfig) {\n this.config = handlerConfig.config;\n this.bus = handlerConfig.bus;\n this.sessionStore = handlerConfig.sessionStore;\n this.sessionConfigStore = handlerConfig.sessionConfigStore;\n this.applySessionThinkingLevel = handlerConfig.applySessionThinkingLevel;\n this.getCurrentModel = handlerConfig.getCurrentModel;\n this.switchModelForSession = handlerConfig.switchModelForSession;\n this.invalidateAgentSession = handlerConfig.invalidateAgentSession;\n this.abortSessionTurn = handlerConfig.abortSessionTurn;\n }\n\n /* Replace config reference after hot reload or gateway PATCH so commands see current defaults. /\n updateAgentConfig(config: Config): void {\n this.config = config;\n }\n\n /\n Execute a command using the unified command system\n /\n async executeCommand(\n commandName: string,\n args: string,\n context: CommandContext\n ): Promise<boolean> {\n // Check if command exists\n if (!commandRegistry.has(commandName)) {\n return false;\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command via new system');\n\n // Create command context\n const cmdCtx = createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' \| 'webui' \| 'cli' \| 'api' \| 'system' \| 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name \|\| m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as any;\n promptTokens += usage.input \|\| 0;\n completionTokens += usage.output \|\| 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n });\n\n const result = await commandRegistry.execute(commandName, cmdCtx, args);\n\n if (result.content) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n return true;\n }\n\n /\n Run command and return all user-visible text (ctx.reply + result.content) for SSE/CLI.\n * Same bus side effects as {@link executeCommand}.\n */\n async executeCommandAndAggregateReply(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<{ handled: boolean; aggregatedText: string }> {\n if (!commandRegistry.has(commandName)) {\n return { handled: false, aggregatedText: '' };\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command (aggregate reply)');\n\n const { aggregatedText } = await this.runRegistryExecuteWithCapture(args, commandName, context);\n\n return { handled: true, aggregatedText };\n }\n\n private async runRegistryExecuteWithCapture(\n args: string,\n commandName: string,\n context: CommandContext,\n ): Promise<{ aggregatedText: string }> {\n const segments: string[] = [];\n\n const wrapped = createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' \| 'webui' \| 'cli' \| 'api' \| 'system' \| 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n segments.push(text);\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name \|\| m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as { input?: number; output?: number };\n promptTokens += usage.input \|\| 0;\n completionTokens += usage.output \|\| 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n });\n\n const result = await commandRegistry.execute(commandName, wrapped, args);\n\n if (result.content) {\n segments.push(result.content);\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n const aggregatedText = segments.filter((s) => s && s.trim()).join('\\n\\n');\n return { aggregatedText };\n }\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"command-handler.js","names":[],"sources":["../../../../src/agent/messaging/command-handler.ts"],"sourcesContent":["/*\n Command Handler - Parses and executes commands\n \n Handles command execution using the unified command system.\n /\n\nimport type { MessageBus } from '../../infra/bus/index.js';\nimport type { Config } from '../../config/schema.js';\nimport { isProviderConfiguredSync } from '../../providers/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { CompactionResult } from '../memory/compaction.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { commandRegistry, createCommandContext } from '../../chat-commands/index.js';\nimport { getAllProviders, getModelsByProvider, getProviderDisplayName } from '../../providers/index.js';\n\nconst log = createLogger('CommandHandler');\n\nexport interface CommandContext {\n sessionKey: string;\n channel: string;\n chatId: string;\n senderId: string;\n isGroup: boolean;\n}\n\nexport interface CommandHandlerConfig {\n config: Config;\n bus: MessageBus;\n sessionStore: SessionStore;\n sessionConfigStore?: SessionConfigStore;\n /* After /think persists, sync pi-agent /\n applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n getCurrentModel: () => string;\n switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n /* Drop in-memory agent after session file is cleared (e.g. /new) /\n invalidateAgentSession?: (sessionKey: string) => void;\n /* Cancel streaming preview + in-flight LLM work for this session (e.g. /abort) /\n abortSessionTurn?: (sessionKey: string) => Promise<void>;\n\n compactSession?: (\n sessionKey: string,\n options?: { instructions?: string; force?: boolean },\n ) => Promise<CompactionResult>;\n\n btwQuery?: (sessionKey: string, question: string) => Promise<{ text: string; error?: string }>;\n\n getSessionContextReport?: (\n sessionKey: string,\n mode: 'list' \| 'detail' \| 'json',\n ) => Promise<string>;\n}\n\nexport class CommandHandler {\n private config: Config;\n private bus: MessageBus;\n private sessionStore: SessionStore;\n private sessionConfigStore?: SessionConfigStore;\n private applySessionThinkingLevel?: (sessionKey: string, level: ThinkLevel) => void;\n private getCurrentModel: () => string;\n private switchModelForSession: (sessionKey: string, modelId: string) => Promise<boolean>;\n private invalidateAgentSession?: (sessionKey: string) => void;\n private abortSessionTurn?: (sessionKey: string) => Promise<void>;\n private compactSession?: CommandHandlerConfig['compactSession'];\n private btwQuery?: CommandHandlerConfig['btwQuery'];\n private getSessionContextReport?: CommandHandlerConfig['getSessionContextReport'];\n\n constructor(handlerConfig: CommandHandlerConfig) {\n this.config = handlerConfig.config;\n this.bus = handlerConfig.bus;\n this.sessionStore = handlerConfig.sessionStore;\n this.sessionConfigStore = handlerConfig.sessionConfigStore;\n this.applySessionThinkingLevel = handlerConfig.applySessionThinkingLevel;\n this.getCurrentModel = handlerConfig.getCurrentModel;\n this.switchModelForSession = handlerConfig.switchModelForSession;\n this.invalidateAgentSession = handlerConfig.invalidateAgentSession;\n this.abortSessionTurn = handlerConfig.abortSessionTurn;\n this.compactSession = handlerConfig.compactSession;\n this.btwQuery = handlerConfig.btwQuery;\n this.getSessionContextReport = handlerConfig.getSessionContextReport;\n }\n\n /* Replace config reference after hot reload or gateway PATCH so commands see current defaults. /\n updateAgentConfig(config: Config): void {\n this.config = config;\n }\n\n /\n Execute a command using the unified command system\n /\n async executeCommand(\n commandName: string,\n args: string,\n context: CommandContext\n ): Promise<boolean> {\n // Check if command exists\n if (!commandRegistry.has(commandName)) {\n return false;\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command via new system');\n\n // Create command context\n const cmdCtx = createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' \| 'webui' \| 'cli' \| 'api' \| 'system' \| 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name \|\| m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as any;\n promptTokens += usage.input \|\| 0;\n completionTokens += usage.output \|\| 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n\n compactSession: this.compactSession,\n btwQuery: this.btwQuery,\n getSessionContextReport: this.getSessionContextReport,\n });\n\n const result = await commandRegistry.execute(commandName, cmdCtx, args);\n\n if (result.content) {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n return true;\n }\n\n /\n Run command and return all user-visible text (ctx.reply + result.content) for SSE/CLI.\n * Same bus side effects as {@link executeCommand}.\n */\n async executeCommandAndAggregateReply(\n commandName: string,\n args: string,\n context: CommandContext,\n ): Promise<{ handled: boolean; aggregatedText: string }> {\n if (!commandRegistry.has(commandName)) {\n return { handled: false, aggregatedText: '' };\n }\n\n log.info({ command: commandName, sessionKey: context.sessionKey }, 'Executing command (aggregate reply)');\n\n const { aggregatedText } = await this.runRegistryExecuteWithCapture(args, commandName, context);\n\n return { handled: true, aggregatedText };\n }\n\n private async runRegistryExecuteWithCapture(\n args: string,\n commandName: string,\n context: CommandContext,\n ): Promise<{ aggregatedText: string }> {\n const segments: string[] = [];\n\n const wrapped = createCommandContext({\n sessionKey: context.sessionKey,\n source: context.channel as 'telegram' \| 'webui' \| 'cli' \| 'api' \| 'system' \| 'gateway',\n channelId: context.channel,\n chatId: context.chatId,\n senderId: context.senderId,\n isGroup: context.isGroup,\n config: this.config,\n bus: this.bus,\n sessionStore: this.sessionStore,\n sessionConfigStore: this.sessionConfigStore,\n applySessionThinkingLevel: this.applySessionThinkingLevel,\n\n replyHandler: async (text: string, _options?) => {\n segments.push(text);\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: text,\n type: 'message',\n });\n },\n\n typingHandler: async (typing: boolean) => {\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n type: typing ? 'typing_on' : 'typing_off',\n });\n },\n\n supportedFeatures: ['markdown', 'typing'],\n\n getCurrentModel: this.getCurrentModel,\n\n switchModel: async (modelId: string) => {\n return this.switchModelForSession(context.sessionKey, modelId);\n },\n\n listModels: async () => {\n const providers = getAllProviders();\n const models: Array<{ id: string; name: string; provider: string }> = [];\n\n for (const providerId of providers) {\n if (isProviderConfiguredSync(providerId)) {\n const providerModels = getModelsByProvider(providerId);\n for (const m of providerModels) {\n models.push({\n id: `${m.provider}/${m.id}`,\n name: m.name \|\| m.id,\n provider: getProviderDisplayName(providerId),\n });\n }\n }\n }\n\n return models;\n },\n\n getUsage: async () => {\n const messages = await this.sessionStore.load(context.sessionKey);\n let promptTokens = 0;\n let completionTokens = 0;\n\n for (const msg of messages) {\n if ('usage' in msg && msg.usage) {\n const usage = msg.usage as { input?: number; output?: number };\n promptTokens += usage.input \|\| 0;\n completionTokens += usage.output \|\| 0;\n }\n }\n\n return {\n promptTokens,\n completionTokens,\n totalTokens: promptTokens + completionTokens,\n messageCount: messages.length,\n };\n },\n\n invalidateAgentSession: this.invalidateAgentSession,\n\n abortCurrentTurn: this.abortSessionTurn\n ? async () => {\n await this.abortSessionTurn!(context.sessionKey);\n }\n : undefined,\n\n compactSession: this.compactSession,\n btwQuery: this.btwQuery,\n getSessionContextReport: this.getSessionContextReport,\n });\n\n const result = await commandRegistry.execute(commandName, wrapped, args);\n\n if (result.content) {\n segments.push(result.content);\n await this.bus.publishOutbound({\n channel: context.channel,\n chat_id: context.chatId,\n content: result.content,\n type: 'message',\n });\n }\n\n const aggregatedText = segments.filter((s) => s && s.trim()).join('\\n\\n');\n return { aggregatedText };\n }\n}\n"],"mappings":"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"}

package/dist/src/agent/orchestration/agent-orchestrator.js CHANGED Viewed

@@ -6,6 +6,7 @@ import { cleanTrailingErrors, sanitizeMessages } from "../memory/message-sanitiz
 import { resolveEffectiveThinkingLevel } from "../../session/thinking-resolve.js";
 import { tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence } from "../transcript/transcript-hygiene.js";
 import { runAgentTurnWithModelFallbacks } from "./run-agent-turn-with-fallbacks.js";
+import { expandAtFileMentionsInPlainText } from "../context/expand-at-file-mentions.js";
 import { resolveInboundImageContentParts } from "../image/inbound-image-handling.js";
 //#region src/agent/orchestration/agent-orchestrator.ts
 init_logger();
@@ -148,7 +149,11 @@ var AgentOrchestrator = class {
 	*/
 	async buildUserMessage(msg, sessionKey) {
 		const storageRootAbs = this.getAgentInternalStorageRootForSession(sessionKey);
-		const textBody = msg.content.trimStart().startsWith("/skill:") ? this.agentManager.expandSkillUserText(msg.content) : msg.content;
+		let textBody = msg.content.trimStart().startsWith("/skill:") ? this.agentManager.expandSkillUserText(msg.content) : msg.content;
+		if (/@file:/.test(textBody)) {
+			const root = this.agentManager.getResolvedWorkspaceForSession(sessionKey);
+			textBody = await expandAtFileMentionsInPlainText(textBody, root);
+		}
 		if (!msg.attachments || msg.attachments.length === 0) return {
 			role: "user",
 			content: textBody,