@xopcai/xopc 0.0.123 → 0.0.125

package/dist/src/agent/orchestration/agent-event-handler.js

@@ -174,6 +174,40 @@ function appendTextToToolResult(result, text) {
 	}
 	return result;
 }
+function readRecord(value) {
+	return value && typeof value === "object" ? value : null;
+}
+function readToolResultDetails(result) {
+	const rec = readRecord(result);
+	if (!rec) return null;
+	return readRecord(rec.details);
+}
+function readStringArray(value) {
+	return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+}
+function readChangedPathsFromToolEnd(toolName, args, result) {
+	const name = toolName.toLowerCase();
+	const details = readToolResultDetails(result);
+	if (name === "apply_patch") {
+		const files = readStringArray(details?.files);
+		if (files.length > 0) return files;
+		return (Array.isArray(details?.changes) ? details.changes : []).flatMap((change) => {
+			const rec = readRecord(change);
+			if (!rec) return [];
+			return readStringArray([rec.moveTo, rec.path]);
+		});
+	}
+	if (name === "write_file") {
+		if (typeof details?.size !== "number") return [];
+		const rec = readRecord(args);
+		return typeof rec?.path === "string" ? [rec.path] : [];
+	}
+	if (name.includes("write") || name.includes("edit")) {
+		const rec = readRecord(args);
+		return typeof rec?.path === "string" ? [rec.path] : [];
+	}
+	return [];
+}
 function installToolChainListener(bus, toolChainTracker) {
 	bus.on("turn_start", (_event, context) => {
 		toolChainTracker.startChain(context.sessionKey);
@@ -232,24 +266,44 @@ function installErrorTrackingListener(bus, deps) {
 	});
 }
 function installSelfVerifyListener(bus, selfVerifyMiddleware) {
-	bus.on("tool_execution_start", (event) => {
+	bus.on("tool_execution_end", (event, context) => {
 		const e = event;
+		const name = e.toolName?.toLowerCase() ?? "";
 		const args = e.args;
-		const toolName = e.toolName;
-		if (!toolName || !args) return;
-		const name = toolName.toLowerCase();
-		if (name.includes("write") && args.path) selfVerifyMiddleware.recordEdit(String(args.path), "write");
-		else if (name.includes("edit") && args.path) selfVerifyMiddleware.recordEdit(String(args.path), "edit");
-		else selfVerifyMiddleware.recordVerification(toolName, args);
+		if (name === "exec_command") {
+			selfVerifyMiddleware.recordVerification(e.toolName, args, {
+				isError: e.isError,
+				result: e.result
+			}, context.sessionKey);
+			return;
+		}
+		if (!e.isError) {
+			const changedPaths = readChangedPathsFromToolEnd(e.toolName, args, e.result);
+			for (const path of changedPaths) selfVerifyMiddleware.recordEdit(path, name.includes("write") ? "write" : "edit", context.sessionKey);
+			if (changedPaths.length > 0) {
+				e.result = appendTextToToolResult(e.result, selfVerifyMiddleware.consumePostEditReminder(context.sessionKey));
+				return;
+			}
+			selfVerifyMiddleware.recordVerification(e.toolName, args, {
+				isError: e.isError,
+				result: e.result
+			}, context.sessionKey);
+		}
 	});
-	bus.on("tool_execution_end", (event) => {
-		const e = event;
-		const name = e.toolName?.toLowerCase() ?? "";
-		if (!name.includes("write") && !name.includes("edit")) return;
-		e.result = appendTextToToolResult(e.result, selfVerifyMiddleware.consumePostEditReminder());
+	bus.on("turn_start", (_event, context) => {
+		selfVerifyMiddleware.onTurnStart(context.sessionKey);
 	});
-	bus.on("turn_start", () => {
-		selfVerifyMiddleware.onTurnStart();
+}
+function installTurnDiffTrackerListener(bus, turnDiffTracker) {
+	bus.on("tool_execution_end", (event, context) => {
+		const e = event;
+		turnDiffTracker.recordToolResult({
+			sessionKey: context.sessionKey,
+			toolName: e.toolName,
+			args: e.args,
+			result: e.result,
+			isError: e.isError
+		});
 	});
 }
 /**
@@ -270,6 +324,7 @@ var AgentEventHandler = class {
 		});
 		installLifecycleHookListener(this.bus, config.lifecycleManager);
 		installSystemReminderListener(this.bus, config.systemReminder);
+		if (config.turnDiffTracker) installTurnDiffTrackerListener(this.bus, config.turnDiffTracker);
 		installSelfVerifyListener(this.bus, config.selfVerifyMiddleware);
 		installToolUsageListener(this.bus, config.toolUsageAnalyzer);
 		installToolChainListener(this.bus, config.toolChainTracker);

package/dist/src/agent/orchestration/agent-event-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-event-handler.js","names":[],"sources":["../../../../src/agent/orchestration/agent-event-handler.ts"],"sourcesContent":["/**\n * Agent Event Handler — coordinates listeners on pi-agent events.\n *\n * Previously a single god-handler with ten manager fields and one `switch`. Now a\n * thin façade around {@link SessionEventBus}: each concern (progress, lifecycle\n * hooks, tool-chain recording, error tracking, self-verify, etc.) registers its\n * own listener at construction time, and external code can add new listeners via\n * {@link AgentEventHandler.registerListener} without modifying this file (OCP).\n *\n * Ordering note: a few listeners are order-sensitive (notably the\n * `tool_execution_end` chain — `SystemReminder` mutates `event.result` in place\n * and downstream listeners read the mutated value). The `installX` calls below\n * preserve the exact order from the previous implementation.\n */\n\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { ProgressFeedbackManager } from '../lifecycle/progress.js';\nimport type { ToolErrorTracker } from '../tools/error-tracker.js';\nimport type { RequestLimiter } from '../models/request-limiter.js';\nimport type { LifecycleManager } from '../lifecycle/index.js';\nimport type { ToolChainTracker } from '../tools/chain-tracker.js';\nimport type { SelfVerifyMiddleware } from '../middleware/index.js';\nimport type { SystemReminder } from '../prompt/system-reminder.js';\nimport type { ToolUsageAnalyzer } from '../tools/usage-analyzer.js';\nimport type { ErrorPatternMatcher } from '../tools/error-pattern-matcher.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('AgentEventHandler');\n\n// ── Event bus ──────────────────────────────────────────────────────────────\n\nexport type SessionEventListener = (event: AgentEvent, context: SessionContext) => void;\nexport type SessionEventTypeFilter = AgentEvent['type'] | 'all';\n\n/**\n * Typed pub/sub for agent events. Listeners run in registration order; the bus\n * itself is synchronous — listeners that need async work must dispatch their own\n * promises (typically by awaiting and logging on error, like the lifecycle hooks).\n */\nexport class SessionEventBus {\n  private readonly listeners = new Map<SessionEventTypeFilter, SessionEventListener[]>();\n\n  on(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    const bucket = this.listeners.get(type) ?? [];\n    bucket.push(listener);\n    this.listeners.set(type, bucket);\n    return () => {\n      const current = this.listeners.get(type);\n      if (!current) return;\n      const idx = current.indexOf(listener);\n      if (idx >= 0) current.splice(idx, 1);\n    };\n  }\n\n  dispatch(event: AgentEvent, context: SessionContext | null): void {\n    if (!context) {\n      if (event.type !== 'message_update') {\n        log.warn(\n          { eventType: event.type },\n          `Agent event ignored (no SessionContext): ${event.type}`,\n        );\n      }\n      return;\n    }\n    const exact = this.listeners.get(event.type);\n    if (exact) {\n      for (const listener of exact) {\n        listener(event, context);\n      }\n    }\n    const all = this.listeners.get('all');\n    if (all) {\n      for (const listener of all) {\n        listener(event, context);\n      }\n    }\n  }\n}\n\n// ── Built-in listener installers ───────────────────────────────────────────\n\nfunction installProgressListener(bus: SessionEventBus, progressManager: ProgressFeedbackManager): void {\n  bus.on('agent_start', () => {\n    log.debug('Agent turn started');\n    progressManager.startTask();\n  });\n  bus.on('turn_start', () => {\n    log.debug('Turn started');\n    progressManager.onTurnStart();\n  });\n  bus.on('tool_execution_start', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    log.debug({ tool: e.toolName, args: e.args }, 'Tool execution started');\n    progressManager.onToolStart(e.toolName, e.args || {});\n  });\n  bus.on('tool_execution_update', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n    progressManager.onToolUpdate(e.toolName, e.partialResult);\n  });\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    log.debug({ tool: e.toolName, isError: e.isError }, 'Tool execution complete');\n    progressManager.onToolEnd(e.toolName, e.result, e.isError);\n  });\n  bus.on('agent_end', () => {\n    progressManager.endTask();\n  });\n}\n\nfunction installRequestLimitListener(\n  bus: SessionEventBus,\n  deps: {\n    requestLimiter: RequestLimiter;\n    progressManager: ProgressFeedbackManager;\n    lifecycleManager: LifecycleManager;\n  },\n): void {\n  bus.on('agent_start', (_event, context) => {\n    const result = deps.requestLimiter.recordRequest();\n\n    deps.lifecycleManager\n      .emit(\n        'llm_request',\n        context.sessionKey,\n        { requestNumber: result.count, maxRequests: result.limit },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          {\n            err,\n            errorMessage: em,\n            sessionKey: context.sessionKey,\n            requestNumber: result.count,\n            maxRequests: result.limit,\n          },\n          `Lifecycle emit llm_request failed: ${em}`,\n        );\n      });\n\n    deps.progressManager.onRequestLimitStatus(\n      result.count,\n      result.limit,\n      result.remaining,\n      result.isWarning,\n      result.shouldStop,\n    );\n\n    if (result.shouldStop) {\n      log.error(\n        { count: result.count, limit: result.limit, sessionKey: context.sessionKey },\n        `Request limit reached (${result.count}/${result.limit}) for session`,\n      );\n    }\n  });\n\n  bus.on('turn_end', () => {\n    deps.requestLimiter.reset();\n  });\n}\n\nfunction installLifecycleHookListener(bus: SessionEventBus, lifecycleManager: LifecycleManager): void {\n  bus.on('message_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'message_end' }>;\n    if (e.message?.role !== 'assistant') return;\n    const content = e.message.content;\n    const text = Array.isArray(content)\n      ? extractTextContent(content as Array<{ type: string; text?: string }>)\n      : String(content);\n    log.debug({ contentLength: text.length }, 'Assistant response complete');\n\n    lifecycleManager\n      .emit(\n        'llm_response',\n        context.sessionKey,\n        { response: text, usage: (e.message as { usage?: unknown }).usage },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, responseChars: text.length },\n          `Lifecycle emit llm_response failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    lifecycleManager\n      .emit(\n        'tool_call_start',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          arguments: e.args || {},\n          attemptNumber: 1,\n          maxAttempts: 3,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle emit tool_call_start failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    lifecycleManager\n      .emit(\n        'tool_call_end',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          success: !e.isError,\n          result: e.result,\n          error: e.isError ? String(e.result) : undefined,\n          durationMs,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle hook tool_call_end failed: ${em}`,\n        );\n      });\n  });\n}\n\nfunction installSystemReminderListener(bus: SessionEventBus, systemReminder: SystemReminder): void {\n  // MUTATES `event.result` so downstream listeners (tool-chain, error-tracking) see\n  // the decorated text. Must run AFTER progress + lifecycle hooks (they consume the\n  // original) and BEFORE tool-chain + error-tracking.\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & { result: unknown };\n    e.result = systemReminder.appendToResult(e.result, e.toolName);\n  });\n}\n\nfunction appendTextToToolResult(result: unknown, text: string): unknown {\n  if (!text.trim()) {\n    return result;\n  }\n  if (result && typeof result === 'object') {\n    const res = result as Record<string, unknown>;\n    if (Array.isArray(res.content)) {\n      res.content = [\n        ...res.content,\n        { type: 'text', text: `\\n${text}` },\n      ];\n      return res;\n    }\n    if (typeof res.content === 'string') {\n      res.content = `${res.content}\\n${text}`;\n      return res;\n    }\n  }\n  return result;\n}\n\nfunction installToolChainListener(bus: SessionEventBus, toolChainTracker: ToolChainTracker): void {\n  bus.on('turn_start', (_event, context) => {\n    // One chain per LLM turn (pi-agent emits turn_start each round; turn_end clears the chain).\n    toolChainTracker.startChain(context.sessionKey);\n  });\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    toolChainTracker.recordCall(context.sessionKey, e.toolName, e.args || {}, 0);\n  });\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    const chain = toolChainTracker.getCurrentChain(context.sessionKey);\n    if (!chain) return;\n    const lastNode = chain.nodes[chain.nodes.length - 1];\n    if (lastNode && lastNode.toolName === e.toolName) {\n      toolChainTracker.recordResult(\n        context.sessionKey,\n        lastNode.id,\n        e.result,\n        e.isError ? 'Tool execution failed' : undefined,\n        durationMs,\n      );\n    }\n  });\n  bus.on('turn_end', (_event, context) => {\n    toolChainTracker.endChain(context.sessionKey);\n  });\n}\n\nfunction installToolUsageListener(bus: SessionEventBus, toolUsageAnalyzer: ToolUsageAnalyzer): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    toolUsageAnalyzer.recordUsage(e.toolName, !e.isError, durationMs);\n  });\n}\n\nfunction extractErrorText(result: unknown): string {\n  if (typeof result === 'string') return result;\n  if (result && typeof result === 'object') {\n    const obj = result as Record<string, unknown>;\n    if (typeof obj.error === 'string') return obj.error;\n    if (typeof obj.message === 'string') return obj.message;\n    return JSON.stringify(result);\n  }\n  return String(result);\n}\n\nfunction installErrorTrackingListener(\n  bus: SessionEventBus,\n  deps: { errorTracker: ToolErrorTracker; errorPatternMatcher: ErrorPatternMatcher },\n): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    if (!e.isError) return;\n    const errorText = extractErrorText(e.result);\n    deps.errorTracker.recordFailure(e.toolName, errorText);\n\n    const errorMatch = deps.errorPatternMatcher.matchError(errorText);\n    if (errorMatch.matched && errorMatch.pattern) {\n      const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;\n      log.warn(\n        { tool: e.toolName, pattern: errorMatch.pattern.name, errorPreview: preview },\n        `Tool error matched pattern \"${errorMatch.pattern.name}\" (${e.toolName}): ${preview}`,\n      );\n    }\n  });\n  bus.on('turn_end', () => {\n    deps.errorTracker.reset();\n  });\n}\n\nfunction installSelfVerifyListener(bus: SessionEventBus, selfVerifyMiddleware: SelfVerifyMiddleware): void {\n  bus.on('tool_execution_start', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    const args = e.args;\n    const toolName = e.toolName;\n    if (!toolName || !args) return;\n    const name = toolName.toLowerCase();\n    if (name.includes('write') && args.path) {\n      selfVerifyMiddleware.recordEdit(String(args.path), 'write');\n    } else if (name.includes('edit') && args.path) {\n      selfVerifyMiddleware.recordEdit(String(args.path), 'edit');\n    } else {\n      selfVerifyMiddleware.recordVerification(toolName, args);\n    }\n  });\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & { result: unknown };\n    const name = e.toolName?.toLowerCase() ?? '';\n    if (!name.includes('write') && !name.includes('edit')) {\n      return;\n    }\n    e.result = appendTextToToolResult(e.result, selfVerifyMiddleware.consumePostEditReminder());\n  });\n  bus.on('turn_start', () => {\n    selfVerifyMiddleware.onTurnStart();\n  });\n}\n\n// ── Public façade ───────────────────────────────────────────────────────────\n\nexport interface AgentEventHandlerConfig {\n  progressManager: ProgressFeedbackManager;\n  errorTracker: ToolErrorTracker;\n  requestLimiter: RequestLimiter;\n  lifecycleManager: LifecycleManager;\n  toolChainTracker: ToolChainTracker;\n  selfVerifyMiddleware: SelfVerifyMiddleware;\n  systemReminder: SystemReminder;\n  toolUsageAnalyzer: ToolUsageAnalyzer;\n  errorPatternMatcher: ErrorPatternMatcher;\n}\n\n/**\n * Thin façade over {@link SessionEventBus} that pre-registers all built-in\n * listeners in their required order. `handle(event, ctx)` is the entry point\n * used by `AgentService.handleSessionEvent`; extensions can hook in via\n * {@link registerListener} without touching this class.\n */\nexport class AgentEventHandler {\n  private readonly bus: SessionEventBus;\n\n  constructor(config: AgentEventHandlerConfig) {\n    this.bus = new SessionEventBus();\n\n    // Order matters for `tool_execution_end`: SystemReminder mutates `event.result`\n    // and ToolChain + ErrorTracking depend on the mutated value. Keep these in this\n    // exact sequence.\n    installProgressListener(this.bus, config.progressManager);\n    installRequestLimitListener(this.bus, {\n      requestLimiter: config.requestLimiter,\n      progressManager: config.progressManager,\n      lifecycleManager: config.lifecycleManager,\n    });\n    installLifecycleHookListener(this.bus, config.lifecycleManager);\n    installSystemReminderListener(this.bus, config.systemReminder);\n    installSelfVerifyListener(this.bus, config.selfVerifyMiddleware);\n    installToolUsageListener(this.bus, config.toolUsageAnalyzer);\n    installToolChainListener(this.bus, config.toolChainTracker);\n    installErrorTrackingListener(this.bus, {\n      errorTracker: config.errorTracker,\n      errorPatternMatcher: config.errorPatternMatcher,\n    });\n  }\n\n  /** Dispatch a pi-agent event to all registered listeners. */\n  handle(event: AgentEvent, context: SessionContext | null): void {\n    this.bus.dispatch(event, context);\n  }\n\n  /**\n   * Register an additional listener (e.g. from an extension). Returns an\n   * unsubscribe function. Listeners run after the built-ins in registration\n   * order; if you need to run before a built-in, you must create your own\n   * {@link SessionEventBus} instance.\n   */\n  registerListener(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    return this.bus.on(type, listener);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-event-handler.js","names":[],"sources":["../../../../src/agent/orchestration/agent-event-handler.ts"],"sourcesContent":["/**\n * Agent Event Handler — coordinates listeners on pi-agent events.\n *\n * Previously a single god-handler with ten manager fields and one `switch`. Now a\n * thin façade around {@link SessionEventBus}: each concern (progress, lifecycle\n * hooks, tool-chain recording, error tracking, self-verify, etc.) registers its\n * own listener at construction time, and external code can add new listeners via\n * {@link AgentEventHandler.registerListener} without modifying this file (OCP).\n *\n * Ordering note: a few listeners are order-sensitive (notably the\n * `tool_execution_end` chain — `SystemReminder` mutates `event.result` in place\n * and downstream listeners read the mutated value). The `installX` calls below\n * preserve the exact order from the previous implementation.\n */\n\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { ProgressFeedbackManager } from '../lifecycle/progress.js';\nimport type { ToolErrorTracker } from '../tools/error-tracker.js';\nimport type { RequestLimiter } from '../models/request-limiter.js';\nimport type { LifecycleManager } from '../lifecycle/index.js';\nimport type { ToolChainTracker } from '../tools/chain-tracker.js';\nimport type { SelfVerifyMiddleware } from '../middleware/index.js';\nimport type { SystemReminder } from '../prompt/system-reminder.js';\nimport type { ToolUsageAnalyzer } from '../tools/usage-analyzer.js';\nimport type { ErrorPatternMatcher } from '../tools/error-pattern-matcher.js';\nimport type { TurnDiffTracker } from '../coding/index.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('AgentEventHandler');\n\n// ── Event bus ──────────────────────────────────────────────────────────────\n\nexport type SessionEventListener = (event: AgentEvent, context: SessionContext) => void;\nexport type SessionEventTypeFilter = AgentEvent['type'] | 'all';\n\n/**\n * Typed pub/sub for agent events. Listeners run in registration order; the bus\n * itself is synchronous — listeners that need async work must dispatch their own\n * promises (typically by awaiting and logging on error, like the lifecycle hooks).\n */\nexport class SessionEventBus {\n  private readonly listeners = new Map<SessionEventTypeFilter, SessionEventListener[]>();\n\n  on(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    const bucket = this.listeners.get(type) ?? [];\n    bucket.push(listener);\n    this.listeners.set(type, bucket);\n    return () => {\n      const current = this.listeners.get(type);\n      if (!current) return;\n      const idx = current.indexOf(listener);\n      if (idx >= 0) current.splice(idx, 1);\n    };\n  }\n\n  dispatch(event: AgentEvent, context: SessionContext | null): void {\n    if (!context) {\n      if (event.type !== 'message_update') {\n        log.warn(\n          { eventType: event.type },\n          `Agent event ignored (no SessionContext): ${event.type}`,\n        );\n      }\n      return;\n    }\n    const exact = this.listeners.get(event.type);\n    if (exact) {\n      for (const listener of exact) {\n        listener(event, context);\n      }\n    }\n    const all = this.listeners.get('all');\n    if (all) {\n      for (const listener of all) {\n        listener(event, context);\n      }\n    }\n  }\n}\n\n// ── Built-in listener installers ───────────────────────────────────────────\n\nfunction installProgressListener(bus: SessionEventBus, progressManager: ProgressFeedbackManager): void {\n  bus.on('agent_start', () => {\n    log.debug('Agent turn started');\n    progressManager.startTask();\n  });\n  bus.on('turn_start', () => {\n    log.debug('Turn started');\n    progressManager.onTurnStart();\n  });\n  bus.on('tool_execution_start', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    log.debug({ tool: e.toolName, args: e.args }, 'Tool execution started');\n    progressManager.onToolStart(e.toolName, e.args || {});\n  });\n  bus.on('tool_execution_update', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n    progressManager.onToolUpdate(e.toolName, e.partialResult);\n  });\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    log.debug({ tool: e.toolName, isError: e.isError }, 'Tool execution complete');\n    progressManager.onToolEnd(e.toolName, e.result, e.isError);\n  });\n  bus.on('agent_end', () => {\n    progressManager.endTask();\n  });\n}\n\nfunction installRequestLimitListener(\n  bus: SessionEventBus,\n  deps: {\n    requestLimiter: RequestLimiter;\n    progressManager: ProgressFeedbackManager;\n    lifecycleManager: LifecycleManager;\n  },\n): void {\n  bus.on('agent_start', (_event, context) => {\n    const result = deps.requestLimiter.recordRequest();\n\n    deps.lifecycleManager\n      .emit(\n        'llm_request',\n        context.sessionKey,\n        { requestNumber: result.count, maxRequests: result.limit },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          {\n            err,\n            errorMessage: em,\n            sessionKey: context.sessionKey,\n            requestNumber: result.count,\n            maxRequests: result.limit,\n          },\n          `Lifecycle emit llm_request failed: ${em}`,\n        );\n      });\n\n    deps.progressManager.onRequestLimitStatus(\n      result.count,\n      result.limit,\n      result.remaining,\n      result.isWarning,\n      result.shouldStop,\n    );\n\n    if (result.shouldStop) {\n      log.error(\n        { count: result.count, limit: result.limit, sessionKey: context.sessionKey },\n        `Request limit reached (${result.count}/${result.limit}) for session`,\n      );\n    }\n  });\n\n  bus.on('turn_end', () => {\n    deps.requestLimiter.reset();\n  });\n}\n\nfunction installLifecycleHookListener(bus: SessionEventBus, lifecycleManager: LifecycleManager): void {\n  bus.on('message_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'message_end' }>;\n    if (e.message?.role !== 'assistant') return;\n    const content = e.message.content;\n    const text = Array.isArray(content)\n      ? extractTextContent(content as Array<{ type: string; text?: string }>)\n      : String(content);\n    log.debug({ contentLength: text.length }, 'Assistant response complete');\n\n    lifecycleManager\n      .emit(\n        'llm_response',\n        context.sessionKey,\n        { response: text, usage: (e.message as { usage?: unknown }).usage },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, responseChars: text.length },\n          `Lifecycle emit llm_response failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    lifecycleManager\n      .emit(\n        'tool_call_start',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          arguments: e.args || {},\n          attemptNumber: 1,\n          maxAttempts: 3,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle emit tool_call_start failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    lifecycleManager\n      .emit(\n        'tool_call_end',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          success: !e.isError,\n          result: e.result,\n          error: e.isError ? String(e.result) : undefined,\n          durationMs,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle hook tool_call_end failed: ${em}`,\n        );\n      });\n  });\n}\n\nfunction installSystemReminderListener(bus: SessionEventBus, systemReminder: SystemReminder): void {\n  // MUTATES `event.result` so downstream listeners (tool-chain, error-tracking) see\n  // the decorated text. Must run AFTER progress + lifecycle hooks (they consume the\n  // original) and BEFORE tool-chain + error-tracking.\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & { result: unknown };\n    e.result = systemReminder.appendToResult(e.result, e.toolName);\n  });\n}\n\nfunction appendTextToToolResult(result: unknown, text: string): unknown {\n  if (!text.trim()) {\n    return result;\n  }\n  if (result && typeof result === 'object') {\n    const res = result as Record<string, unknown>;\n    if (Array.isArray(res.content)) {\n      res.content = [\n        ...res.content,\n        { type: 'text', text: `\\n${text}` },\n      ];\n      return res;\n    }\n    if (typeof res.content === 'string') {\n      res.content = `${res.content}\\n${text}`;\n      return res;\n    }\n  }\n  return result;\n}\n\nfunction readRecord(value: unknown): Record<string, unknown> | null {\n  return value && typeof value === 'object' ? (value as Record<string, unknown>) : null;\n}\n\nfunction readToolResultDetails(result: unknown): Record<string, unknown> | null {\n  const rec = readRecord(result);\n  if (!rec) return null;\n  return readRecord(rec.details);\n}\n\nfunction readStringArray(value: unknown): string[] {\n  return Array.isArray(value) ? value.filter((item): item is string => typeof item === 'string') : [];\n}\n\nfunction readChangedPathsFromToolEnd(toolName: string, args: unknown, result: unknown): string[] {\n  const name = toolName.toLowerCase();\n  const details = readToolResultDetails(result);\n\n  if (name === 'apply_patch') {\n    const files = readStringArray(details?.files);\n    if (files.length > 0) return files;\n\n    const changes = Array.isArray(details?.changes) ? details.changes : [];\n    return changes.flatMap((change) => {\n      const rec = readRecord(change);\n      if (!rec) return [];\n      return readStringArray([rec.moveTo, rec.path]);\n    });\n  }\n\n  if (name === 'write_file') {\n    if (typeof details?.size !== 'number') return [];\n    const rec = readRecord(args);\n    return typeof rec?.path === 'string' ? [rec.path] : [];\n  }\n\n  if (name.includes('write') || name.includes('edit')) {\n    const rec = readRecord(args);\n    return typeof rec?.path === 'string' ? [rec.path] : [];\n  }\n\n  return [];\n}\n\nfunction installToolChainListener(bus: SessionEventBus, toolChainTracker: ToolChainTracker): void {\n  bus.on('turn_start', (_event, context) => {\n    // One chain per LLM turn (pi-agent emits turn_start each round; turn_end clears the chain).\n    toolChainTracker.startChain(context.sessionKey);\n  });\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    toolChainTracker.recordCall(context.sessionKey, e.toolName, e.args || {}, 0);\n  });\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    const chain = toolChainTracker.getCurrentChain(context.sessionKey);\n    if (!chain) return;\n    const lastNode = chain.nodes[chain.nodes.length - 1];\n    if (lastNode && lastNode.toolName === e.toolName) {\n      toolChainTracker.recordResult(\n        context.sessionKey,\n        lastNode.id,\n        e.result,\n        e.isError ? 'Tool execution failed' : undefined,\n        durationMs,\n      );\n    }\n  });\n  bus.on('turn_end', (_event, context) => {\n    toolChainTracker.endChain(context.sessionKey);\n  });\n}\n\nfunction installToolUsageListener(bus: SessionEventBus, toolUsageAnalyzer: ToolUsageAnalyzer): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    toolUsageAnalyzer.recordUsage(e.toolName, !e.isError, durationMs);\n  });\n}\n\nfunction extractErrorText(result: unknown): string {\n  if (typeof result === 'string') return result;\n  if (result && typeof result === 'object') {\n    const obj = result as Record<string, unknown>;\n    if (typeof obj.error === 'string') return obj.error;\n    if (typeof obj.message === 'string') return obj.message;\n    return JSON.stringify(result);\n  }\n  return String(result);\n}\n\nfunction installErrorTrackingListener(\n  bus: SessionEventBus,\n  deps: { errorTracker: ToolErrorTracker; errorPatternMatcher: ErrorPatternMatcher },\n): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    if (!e.isError) return;\n    const errorText = extractErrorText(e.result);\n    deps.errorTracker.recordFailure(e.toolName, errorText);\n\n    const errorMatch = deps.errorPatternMatcher.matchError(errorText);\n    if (errorMatch.matched && errorMatch.pattern) {\n      const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;\n      log.warn(\n        { tool: e.toolName, pattern: errorMatch.pattern.name, errorPreview: preview },\n        `Tool error matched pattern \"${errorMatch.pattern.name}\" (${e.toolName}): ${preview}`,\n      );\n    }\n  });\n  bus.on('turn_end', () => {\n    deps.errorTracker.reset();\n  });\n}\n\nfunction installSelfVerifyListener(bus: SessionEventBus, selfVerifyMiddleware: SelfVerifyMiddleware): void {\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & { result: unknown };\n    const name = e.toolName?.toLowerCase() ?? '';\n    const args = (e as { args?: unknown }).args;\n\n    if (name === 'exec_command') {\n      selfVerifyMiddleware.recordVerification(e.toolName, args, {\n        isError: e.isError,\n        result: e.result,\n      }, context.sessionKey);\n      return;\n    }\n\n    if (!e.isError) {\n      const changedPaths = readChangedPathsFromToolEnd(e.toolName, args, e.result);\n      for (const path of changedPaths) {\n        selfVerifyMiddleware.recordEdit(\n          path,\n          name.includes('write') ? 'write' : 'edit',\n          context.sessionKey,\n        );\n      }\n      if (changedPaths.length > 0) {\n        e.result = appendTextToToolResult(\n          e.result,\n          selfVerifyMiddleware.consumePostEditReminder(context.sessionKey),\n        );\n        return;\n      }\n      selfVerifyMiddleware.recordVerification(e.toolName, args, {\n        isError: e.isError,\n        result: e.result,\n      }, context.sessionKey);\n    }\n  });\n  bus.on('turn_start', (_event, context) => {\n    selfVerifyMiddleware.onTurnStart(context.sessionKey);\n  });\n}\n\nfunction installTurnDiffTrackerListener(bus: SessionEventBus, turnDiffTracker: TurnDiffTracker): void {\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & {\n      args?: unknown;\n      result: unknown;\n    };\n    turnDiffTracker.recordToolResult({\n      sessionKey: context.sessionKey,\n      toolName: e.toolName,\n      args: e.args,\n      result: e.result,\n      isError: e.isError,\n    });\n  });\n}\n\n// ── Public façade ───────────────────────────────────────────────────────────\n\nexport interface AgentEventHandlerConfig {\n  progressManager: ProgressFeedbackManager;\n  errorTracker: ToolErrorTracker;\n  requestLimiter: RequestLimiter;\n  lifecycleManager: LifecycleManager;\n  toolChainTracker: ToolChainTracker;\n  selfVerifyMiddleware: SelfVerifyMiddleware;\n  systemReminder: SystemReminder;\n  toolUsageAnalyzer: ToolUsageAnalyzer;\n  errorPatternMatcher: ErrorPatternMatcher;\n  turnDiffTracker?: TurnDiffTracker;\n}\n\n/**\n * Thin façade over {@link SessionEventBus} that pre-registers all built-in\n * listeners in their required order. `handle(event, ctx)` is the entry point\n * used by `AgentService.handleSessionEvent`; extensions can hook in via\n * {@link registerListener} without touching this class.\n */\nexport class AgentEventHandler {\n  private readonly bus: SessionEventBus;\n\n  constructor(config: AgentEventHandlerConfig) {\n    this.bus = new SessionEventBus();\n\n    // Order matters for `tool_execution_end`: SystemReminder mutates `event.result`\n    // and ToolChain + ErrorTracking depend on the mutated value. Keep these in this\n    // exact sequence.\n    installProgressListener(this.bus, config.progressManager);\n    installRequestLimitListener(this.bus, {\n      requestLimiter: config.requestLimiter,\n      progressManager: config.progressManager,\n      lifecycleManager: config.lifecycleManager,\n    });\n    installLifecycleHookListener(this.bus, config.lifecycleManager);\n    installSystemReminderListener(this.bus, config.systemReminder);\n    if (config.turnDiffTracker) {\n      installTurnDiffTrackerListener(this.bus, config.turnDiffTracker);\n    }\n    installSelfVerifyListener(this.bus, config.selfVerifyMiddleware);\n    installToolUsageListener(this.bus, config.toolUsageAnalyzer);\n    installToolChainListener(this.bus, config.toolChainTracker);\n    installErrorTrackingListener(this.bus, {\n      errorTracker: config.errorTracker,\n      errorPatternMatcher: config.errorPatternMatcher,\n    });\n  }\n\n  /** Dispatch a pi-agent event to all registered listeners. */\n  handle(event: AgentEvent, context: SessionContext | null): void {\n    this.bus.dispatch(event, context);\n  }\n\n  /**\n   * Register an additional listener (e.g. from an extension). Returns an\n   * unsubscribe function. Listeners run after the built-ins in registration\n   * order; if you need to run before a built-in, you must create your own\n   * {@link SessionEventBus} instance.\n   */\n  registerListener(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    return this.bus.on(type, listener);\n  }\n}\n"],"mappings":";;;;aA4BqD;AAErD,MAAM,MAAM,aAAa,oBAAoB;;;;;;AAY7C,IAAa,kBAAb,MAA6B;CAC3B,4BAA6B,IAAI,KAAqD;CAEtF,GAAG,MAA8B,UAA4C;EAC3E,MAAM,SAAS,KAAK,UAAU,IAAI,KAAK,IAAI,EAAE;AAC7C,SAAO,KAAK,SAAS;AACrB,OAAK,UAAU,IAAI,MAAM,OAAO;AAChC,eAAa;GACX,MAAM,UAAU,KAAK,UAAU,IAAI,KAAK;AACxC,OAAI,CAAC,QAAS;GACd,MAAM,MAAM,QAAQ,QAAQ,SAAS;AACrC,OAAI,OAAO,EAAG,SAAQ,OAAO,KAAK,EAAE;;;CAIxC,SAAS,OAAmB,SAAsC;AAChE,MAAI,CAAC,SAAS;AACZ,OAAI,MAAM,SAAS,iBACjB,KAAI,KACF,EAAE,WAAW,MAAM,MAAM,EACzB,4CAA4C,MAAM,OACnD;AAEH;;EAEF,MAAM,QAAQ,KAAK,UAAU,IAAI,MAAM,KAAK;AAC5C,MAAI,MACF,MAAK,MAAM,YAAY,MACrB,UAAS,OAAO,QAAQ;EAG5B,MAAM,MAAM,KAAK,UAAU,IAAI,MAAM;AACrC,MAAI,IACF,MAAK,MAAM,YAAY,IACrB,UAAS,OAAO,QAAQ;;;AAQhC,SAAS,wBAAwB,KAAsB,iBAAgD;AACrG,KAAI,GAAG,qBAAqB;AAC1B,MAAI,MAAM,qBAAqB;AAC/B,kBAAgB,WAAW;GAC3B;AACF,KAAI,GAAG,oBAAoB;AACzB,MAAI,MAAM,eAAe;AACzB,kBAAgB,aAAa;GAC7B;AACF,KAAI,GAAG,yBAAyB,UAAU;EACxC,MAAM,IAAI;AACV,MAAI,MAAM;GAAE,MAAM,EAAE;GAAU,MAAM,EAAE;GAAM,EAAE,yBAAyB;AACvE,kBAAgB,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;GACrD;AACF,KAAI,GAAG,0BAA0B,UAAU;EACzC,MAAM,IAAI;AACV,kBAAgB,aAAa,EAAE,UAAU,EAAE,cAAc;GACzD;AACF,KAAI,GAAG,uBAAuB,UAAU;EACtC,MAAM,IAAI;AACV,MAAI,MAAM;GAAE,MAAM,EAAE;GAAU,SAAS,EAAE;GAAS,EAAE,0BAA0B;AAC9E,kBAAgB,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ;GAC1D;AACF,KAAI,GAAG,mBAAmB;AACxB,kBAAgB,SAAS;GACzB;;AAGJ,SAAS,4BACP,KACA,MAKM;AACN,KAAI,GAAG,gBAAgB,QAAQ,YAAY;EACzC,MAAM,SAAS,KAAK,eAAe,eAAe;AAElD,OAAK,iBACF,KACC,eACA,QAAQ,YACR;GAAE,eAAe,OAAO;GAAO,aAAa,OAAO;GAAO,EAC1D,QACD,CACA,OAAO,QAAQ;GACd,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KACF;IACE;IACA,cAAc;IACd,YAAY,QAAQ;IACpB,eAAe,OAAO;IACtB,aAAa,OAAO;IACrB,EACD,sCAAsC,KACvC;IACD;AAEJ,OAAK,gBAAgB,qBACnB,OAAO,OACP,OAAO,OACP,OAAO,WACP,OAAO,WACP,OAAO,WACR;AAED,MAAI,OAAO,WACT,KAAI,MACF;GAAE,OAAO,OAAO;GAAO,OAAO,OAAO;GAAO,YAAY,QAAQ;GAAY,EAC5E,0BAA0B,OAAO,MAAM,GAAG,OAAO,MAAM,eACxD;GAEH;AAEF,KAAI,GAAG,kBAAkB;AACvB,OAAK,eAAe,OAAO;GAC3B;;AAGJ,SAAS,6BAA6B,KAAsB,kBAA0C;AACpG,KAAI,GAAG,gBAAgB,OAAO,YAAY;EACxC,MAAM,IAAI;AACV,MAAI,EAAE,SAAS,SAAS,YAAa;EACrC,MAAM,UAAU,EAAE,QAAQ;EAC1B,MAAM,OAAO,MAAM,QAAQ,QAAQ,GAC/B,mBAAmB,QAAkD,GACrE,OAAO,QAAQ;AACnB,MAAI,MAAM,EAAE,eAAe,KAAK,QAAQ,EAAE,8BAA8B;AAExE,mBACG,KACC,gBACA,QAAQ,YACR;GAAE,UAAU;GAAM,OAAQ,EAAE,QAAgC;GAAO,EACnE,QACD,CACA,OAAO,QAAQ;GACd,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KACF;IAAE;IAAK,cAAc;IAAI,YAAY,QAAQ;IAAY,eAAe,KAAK;IAAQ,EACrF,uCAAuC,KACxC;IACD;GACJ;AAEF,KAAI,GAAG,yBAAyB,OAAO,YAAY;EACjD,MAAM,IAAI;AACV,mBACG,KACC,mBACA,QAAQ,YACR;GACE,UAAU,EAAE;GACZ,WAAW,EAAE,QAAQ,EAAE;GACvB,eAAe;GACf,aAAa;GACd,EACD,QACD,CACA,OAAO,QAAQ;GACd,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KACF;IAAE;IAAK,cAAc;IAAI,YAAY,QAAQ;IAAY,MAAM,EAAE;IAAU,EAC3E,0CAA0C,KAC3C;IACD;GACJ;AAEF,KAAI,GAAG,uBAAuB,OAAO,YAAY;EAC/C,MAAM,IAAI;EACV,MAAM,aAAc,EAA8B,cAAc;AAChE,mBACG,KACC,iBACA,QAAQ,YACR;GACE,UAAU,EAAE;GACZ,SAAS,CAAC,EAAE;GACZ,QAAQ,EAAE;GACV,OAAO,EAAE,UAAU,OAAO,EAAE,OAAO,GAAG,KAAA;GACtC;GACD,EACD,QACD,CACA,OAAO,QAAQ;GACd,MAAM,KAAK,eAAe,QAAQ,IAAI,UAAU,OAAO,IAAI;AAC3D,OAAI,KACF;IAAE;IAAK,cAAc;IAAI,YAAY,QAAQ;IAAY,MAAM,EAAE;IAAU,EAC3E,wCAAwC,KACzC;IACD;GACJ;;AAGJ,SAAS,8BAA8B,KAAsB,gBAAsC;AAIjG,KAAI,GAAG,uBAAuB,UAAU;EACtC,MAAM,IAAI;AACV,IAAE,SAAS,eAAe,eAAe,EAAE,QAAQ,EAAE,SAAS;GAC9D;;AAGJ,SAAS,uBAAuB,QAAiB,MAAuB;AACtE,KAAI,CAAC,KAAK,MAAM,CACd,QAAO;AAET,KAAI,UAAU,OAAO,WAAW,UAAU;EACxC,MAAM,MAAM;AACZ,MAAI,MAAM,QAAQ,IAAI,QAAQ,EAAE;AAC9B,OAAI,UAAU,CACZ,GAAG,IAAI,SACP;IAAE,MAAM;IAAQ,MAAM,KAAK;IAAQ,CACpC;AACD,UAAO;;AAET,MAAI,OAAO,IAAI,YAAY,UAAU;AACnC,OAAI,UAAU,GAAG,IAAI,QAAQ,IAAI;AACjC,UAAO;;;AAGX,QAAO;;AAGT,SAAS,WAAW,OAAgD;AAClE,QAAO,SAAS,OAAO,UAAU,WAAY,QAAoC;;AAGnF,SAAS,sBAAsB,QAAiD;CAC9E,MAAM,MAAM,WAAW,OAAO;AAC9B,KAAI,CAAC,IAAK,QAAO;AACjB,QAAO,WAAW,IAAI,QAAQ;;AAGhC,SAAS,gBAAgB,OAA0B;AACjD,QAAO,MAAM,QAAQ,MAAM,GAAG,MAAM,QAAQ,SAAyB,OAAO,SAAS,SAAS,GAAG,EAAE;;AAGrG,SAAS,4BAA4B,UAAkB,MAAe,QAA2B;CAC/F,MAAM,OAAO,SAAS,aAAa;CACnC,MAAM,UAAU,sBAAsB,OAAO;AAE7C,KAAI,SAAS,eAAe;EAC1B,MAAM,QAAQ,gBAAgB,SAAS,MAAM;AAC7C,MAAI,MAAM,SAAS,EAAG,QAAO;AAG7B,UADgB,MAAM,QAAQ,SAAS,QAAQ,GAAG,QAAQ,UAAU,EAAE,EACvD,SAAS,WAAW;GACjC,MAAM,MAAM,WAAW,OAAO;AAC9B,OAAI,CAAC,IAAK,QAAO,EAAE;AACnB,UAAO,gBAAgB,CAAC,IAAI,QAAQ,IAAI,KAAK,CAAC;IAC9C;;AAGJ,KAAI,SAAS,cAAc;AACzB,MAAI,OAAO,SAAS,SAAS,SAAU,QAAO,EAAE;EAChD,MAAM,MAAM,WAAW,KAAK;AAC5B,SAAO,OAAO,KAAK,SAAS,WAAW,CAAC,IAAI,KAAK,GAAG,EAAE;;AAGxD,KAAI,KAAK,SAAS,QAAQ,IAAI,KAAK,SAAS,OAAO,EAAE;EACnD,MAAM,MAAM,WAAW,KAAK;AAC5B,SAAO,OAAO,KAAK,SAAS,WAAW,CAAC,IAAI,KAAK,GAAG,EAAE;;AAGxD,QAAO,EAAE;;AAGX,SAAS,yBAAyB,KAAsB,kBAA0C;AAChG,KAAI,GAAG,eAAe,QAAQ,YAAY;AAExC,mBAAiB,WAAW,QAAQ,WAAW;GAC/C;AACF,KAAI,GAAG,yBAAyB,OAAO,YAAY;EACjD,MAAM,IAAI;AACV,mBAAiB,WAAW,QAAQ,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;GAC5E;AACF,KAAI,GAAG,uBAAuB,OAAO,YAAY;EAC/C,MAAM,IAAI;EACV,MAAM,aAAc,EAA8B,cAAc;EAChE,MAAM,QAAQ,iBAAiB,gBAAgB,QAAQ,WAAW;AAClE,MAAI,CAAC,MAAO;EACZ,MAAM,WAAW,MAAM,MAAM,MAAM,MAAM,SAAS;AAClD,MAAI,YAAY,SAAS,aAAa,EAAE,SACtC,kBAAiB,aACf,QAAQ,YACR,SAAS,IACT,EAAE,QACF,EAAE,UAAU,0BAA0B,KAAA,GACtC,WACD;GAEH;AACF,KAAI,GAAG,aAAa,QAAQ,YAAY;AACtC,mBAAiB,SAAS,QAAQ,WAAW;GAC7C;;AAGJ,SAAS,yBAAyB,KAAsB,mBAA4C;AAClG,KAAI,GAAG,uBAAuB,UAAU;EACtC,MAAM,IAAI;EACV,MAAM,aAAc,EAA8B,cAAc;AAChE,oBAAkB,YAAY,EAAE,UAAU,CAAC,EAAE,SAAS,WAAW;GACjE;;AAGJ,SAAS,iBAAiB,QAAyB;AACjD,KAAI,OAAO,WAAW,SAAU,QAAO;AACvC,KAAI,UAAU,OAAO,WAAW,UAAU;EACxC,MAAM,MAAM;AACZ,MAAI,OAAO,IAAI,UAAU,SAAU,QAAO,IAAI;AAC9C,MAAI,OAAO,IAAI,YAAY,SAAU,QAAO,IAAI;AAChD,SAAO,KAAK,UAAU,OAAO;;AAE/B,QAAO,OAAO,OAAO;;AAGvB,SAAS,6BACP,KACA,MACM;AACN,KAAI,GAAG,uBAAuB,UAAU;EACtC,MAAM,IAAI;AACV,MAAI,CAAC,EAAE,QAAS;EAChB,MAAM,YAAY,iBAAiB,EAAE,OAAO;AAC5C,OAAK,aAAa,cAAc,EAAE,UAAU,UAAU;EAEtD,MAAM,aAAa,KAAK,oBAAoB,WAAW,UAAU;AACjE,MAAI,WAAW,WAAW,WAAW,SAAS;GAC5C,MAAM,UAAU,UAAU,SAAS,MAAM,GAAG,UAAU,MAAM,GAAG,IAAI,CAAC,KAAK;AACzE,OAAI,KACF;IAAE,MAAM,EAAE;IAAU,SAAS,WAAW,QAAQ;IAAM,cAAc;IAAS,EAC7E,+BAA+B,WAAW,QAAQ,KAAK,KAAK,EAAE,SAAS,KAAK,UAC7E;;GAEH;AACF,KAAI,GAAG,kBAAkB;AACvB,OAAK,aAAa,OAAO;GACzB;;AAGJ,SAAS,0BAA0B,KAAsB,sBAAkD;AACzG,KAAI,GAAG,uBAAuB,OAAO,YAAY;EAC/C,MAAM,IAAI;EACV,MAAM,OAAO,EAAE,UAAU,aAAa,IAAI;EAC1C,MAAM,OAAQ,EAAyB;AAEvC,MAAI,SAAS,gBAAgB;AAC3B,wBAAqB,mBAAmB,EAAE,UAAU,MAAM;IACxD,SAAS,EAAE;IACX,QAAQ,EAAE;IACX,EAAE,QAAQ,WAAW;AACtB;;AAGF,MAAI,CAAC,EAAE,SAAS;GACd,MAAM,eAAe,4BAA4B,EAAE,UAAU,MAAM,EAAE,OAAO;AAC5E,QAAK,MAAM,QAAQ,aACjB,sBAAqB,WACnB,MACA,KAAK,SAAS,QAAQ,GAAG,UAAU,QACnC,QAAQ,WACT;AAEH,OAAI,aAAa,SAAS,GAAG;AAC3B,MAAE,SAAS,uBACT,EAAE,QACF,qBAAqB,wBAAwB,QAAQ,WAAW,CACjE;AACD;;AAEF,wBAAqB,mBAAmB,EAAE,UAAU,MAAM;IACxD,SAAS,EAAE;IACX,QAAQ,EAAE;IACX,EAAE,QAAQ,WAAW;;GAExB;AACF,KAAI,GAAG,eAAe,QAAQ,YAAY;AACxC,uBAAqB,YAAY,QAAQ,WAAW;GACpD;;AAGJ,SAAS,+BAA+B,KAAsB,iBAAwC;AACpG,KAAI,GAAG,uBAAuB,OAAO,YAAY;EAC/C,MAAM,IAAI;AAIV,kBAAgB,iBAAiB;GAC/B,YAAY,QAAQ;GACpB,UAAU,EAAE;GACZ,MAAM,EAAE;GACR,QAAQ,EAAE;GACV,SAAS,EAAE;GACZ,CAAC;GACF;;;;;;;;AAwBJ,IAAa,oBAAb,MAA+B;CAC7B;CAEA,YAAY,QAAiC;AAC3C,OAAK,MAAM,IAAI,iBAAiB;AAKhC,0BAAwB,KAAK,KAAK,OAAO,gBAAgB;AACzD,8BAA4B,KAAK,KAAK;GACpC,gBAAgB,OAAO;GACvB,iBAAiB,OAAO;GACxB,kBAAkB,OAAO;GAC1B,CAAC;AACF,+BAA6B,KAAK,KAAK,OAAO,iBAAiB;AAC/D,gCAA8B,KAAK,KAAK,OAAO,eAAe;AAC9D,MAAI,OAAO,gBACT,gCAA+B,KAAK,KAAK,OAAO,gBAAgB;AAElE,4BAA0B,KAAK,KAAK,OAAO,qBAAqB;AAChE,2BAAyB,KAAK,KAAK,OAAO,kBAAkB;AAC5D,2BAAyB,KAAK,KAAK,OAAO,iBAAiB;AAC3D,+BAA6B,KAAK,KAAK;GACrC,cAAc,OAAO;GACrB,qBAAqB,OAAO;GAC7B,CAAC;;;CAIJ,OAAO,OAAmB,SAAsC;AAC9D,OAAK,IAAI,SAAS,OAAO,QAAQ;;;;;;;;CASnC,iBAAiB,MAA8B,UAA4C;AACzF,SAAO,KAAK,IAAI,GAAG,MAAM,SAAS"}

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

@@ -1,7 +1,8 @@
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import "../memory/dreaming/constants.js";
-import { resolveDreamingConfig } from "../memory/dreaming/config.js";
+import { resolveDreamingAgentScope } from "../memory/dreaming/scope.js";
 import { persistInboundAttachments } from "../../channels/attachments/inbound-persist.js";
 import { buildTranscriptUserMessage, clearPendingTranscriptUserMessage, hydrateUserTurnForLlm, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 import { extractAgentUserPlainText } from "../memory/user-message-text.js";
@@ -52,15 +53,20 @@ var AgentOrchestrator = class {
 		if (typeof msg.content === "string" && (sessionKey.startsWith("cron:") || sessionKey.includes(":cron:") || sessionKey.includes(":automation:") || context.channel === "cron" || context.channel === "automation")) {
 			const content = msg.content;
 			if (content.includes("__xopc_memory_dreaming_sweep__") || content.includes("__xopc_memory_dreaming_light_sweep__") || content.includes("__xopc_memory_dreaming_rem_sweep__")) {
-				const workspaceDir = this.agentManager.getResolvedWorkspaceForSession(sessionKey);
-				const resolved = resolveDreamingConfig(this.getConfig?.());
+				const cfg = this.getConfig?.();
+				if (!cfg) {
+					log.warn({ sessionKey }, "Dreaming sweep skipped: config unavailable");
+					return;
+				}
+				const scope = resolveDreamingAgentScope(cfg, resolveEffectiveAgentProfileForSession(cfg, sessionKey).agentId);
+				const resolved = scope.config;
 				const t0 = Date.now();
 				if (content.includes("__xopc_memory_dreaming_light_sweep__")) {
 					const result = await runLightSweep({
-						workspaceDir,
+						dreamingRoot: scope.memoriesDir,
 						config: resolved.phases.light
 					});
-					await appendDreamingEvent(workspaceDir, {
+					const event = {
 						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
 						phase: "light",
 						ok: result.ok,
@@ -69,13 +75,14 @@ var AgentOrchestrator = class {
 						scannedEntries: result.scannedEntries,
 						newSignals: result.newSignals,
 						deduped: result.deduped
-					});
+					};
+					await appendDreamingEvent(scope.memoriesDir, event);
 				} else if (content.includes("__xopc_memory_dreaming_rem_sweep__")) {
 					const result = await runRemPatterns({
-						workspaceDir,
+						dreamingRoot: scope.memoriesDir,
 						config: resolved.phases.rem
 					});
-					await appendDreamingEvent(workspaceDir, {
+					const event = {
 						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
 						phase: "rem",
 						ok: result.ok,
@@ -83,14 +90,16 @@ var AgentOrchestrator = class {
 						durationMs: Date.now() - t0,
 						patternsDiscovered: result.patternsDiscovered,
 						entriesAnalyzed: result.entriesAnalyzed
-					});
+					};
+					await appendDreamingEvent(scope.memoriesDir, event);
 				} else {
 					const result = await runDreamingDeepPromotion({
-						workspaceDir,
+						workspaceDir: scope.workspaceDir,
+						dreamingRoot: scope.memoriesDir,
 						config: resolved.phases.deep,
 						memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey)
 					});
-					await appendDreamingEvent(workspaceDir, {
+					const event = {
 						timestamp: (/* @__PURE__ */ new Date()).toISOString(),
 						phase: "deep",
 						ok: result.ok,
@@ -98,7 +107,8 @@ var AgentOrchestrator = class {
 						durationMs: Date.now() - t0,
 						candidates: result.candidates,
 						applied: result.applied
-					});
+					};
+					await appendDreamingEvent(scope.memoriesDir, event);
 				}
 				return;
 			}

package/dist/src/agent/orchestration/agent-orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-orchestrator.js","names":[],"sources":["../../../../src/agent/orchestration/agent-orchestrator.ts"],"sourcesContent":["/**\n * Agent Orchestrator - Coordinates Agent execution flow\n *\n * Manages the complete agent execution pipeline from message processing\n * to response generation.\n */\n\nimport type { Config } from '../../config/schema.js';\nimport type { InboundMessage } from '../../infra/bus/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { SessionHydrator } from '../session/index.js';\nimport { resolveEffectiveThinkingLevel } from '../../session/thinking-resolve.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { AgentEventHandler } from './agent-event-handler.js';\nimport type { FeedbackCoordinator } from '../feedback/feedback-coordinator.js';\nimport type { AgentManager } from '../agent-manager.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport { persistInboundAttachments } from '../../channels/attachments/inbound-persist.js';\nimport {\n  buildTranscriptUserMessage,\n  clearPendingTranscriptUserMessage,\n  hydrateUserTurnForLlm,\n  setPendingTranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\nimport {\n  DREAMING_SWEEP_TOKEN,\n  DREAMING_LIGHT_SWEEP_TOKEN,\n  DREAMING_REM_SWEEP_TOKEN,\n} from '../memory/dreaming/constants.js';\nimport { resolveDreamingConfig } from '../memory/dreaming/config.js';\nimport { runDreamingDeepPromotion } from '../memory/dreaming/deep-promotion.js';\nimport { appendDreamingEvent, type DreamingEvent } from '../memory/dreaming/events.js';\nimport { runLightSweep } from '../memory/dreaming/light-sweep.js';\nimport { runRemPatterns } from '../memory/dreaming/rem-patterns.js';\n\nconst log = createLogger('AgentOrchestrator');\n\nexport interface AgentOrchestratorConfig {\n  agentManager: AgentManager;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  eventHandler: AgentEventHandler;\n  feedbackCoordinator: FeedbackCoordinator;\n  sessionConfigStore: SessionConfigStore;\n  /** Per-session hydration (workspace override + model override) before the agent runs. */\n  sessionHydrator: SessionHydrator;\n  getThinkingDefault: () => ThinkLevel | undefined;\n  /** Per-session default from merged `agents.list` / defaults (optional). */\n  getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  /** Default workspace root when no per-session resolver is set. */\n  workspaceRoot: string;\n  /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */\n  getWorkspaceRootForSession?: (sessionKey: string) => string;\n  /** Agent home (`…/agents/<id>/`) for inbound/TTS files — keeps internal state out of the markdown workspace. */\n  getAgentInternalStorageRootForSession?: (sessionKey: string) => string;\n  /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */\n  enqueueAutoTitle?: (sessionKey: string) => void;\n  /** For per-turn timeout. */\n  getConfig?: () => Config | undefined;\n  /** Channel streaming: token/tool events from pi embedded session. */\n  onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  /** Called after a successful embedded turn with assistant plain text. */\n  onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n}\n\nexport class AgentOrchestrator {\n  private agentManager: AgentManager;\n  private sessionStore: SessionStore;\n  private modelManager: ModelManager;\n  private feedbackCoordinator: FeedbackCoordinator;\n  private sessionConfigStore: SessionConfigStore;\n  private sessionHydrator: SessionHydrator;\n  private getThinkingDefault: () => ThinkLevel | undefined;\n  private getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  private enqueueAutoTitle?: (sessionKey: string) => void;\n  private getConfig?: () => Config | undefined;\n  private onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  private onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n\n  constructor(config: AgentOrchestratorConfig) {\n    this.agentManager = config.agentManager;\n    this.sessionStore = config.sessionStore;\n    this.modelManager = config.modelManager;\n    this.feedbackCoordinator = config.feedbackCoordinator;\n    this.sessionConfigStore = config.sessionConfigStore;\n    this.sessionHydrator = config.sessionHydrator;\n    this.getThinkingDefault = config.getThinkingDefault;\n    this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;\n    this.enqueueAutoTitle = config.enqueueAutoTitle;\n    this.getConfig = config.getConfig;\n    this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;\n    this.onEmbeddedTurnComplete = config.onEmbeddedTurnComplete;\n  }\n\n  /**\n   * Process a message through the agent orchestration pipeline\n   */\n  async process(msg: InboundMessage, context: SessionContext): Promise<void> {\n    const { sessionKey } = context;\n\n    log.debug({ sessionKey }, 'Processing message through agent orchestrator');\n\n    await this.sessionHydrator.workspace(sessionKey);\n\n    // Dreaming: short-circuit scheduled maintenance tokens into local runs.\n    // This avoids spending LLM tokens for scheduled memory consolidation.\n    if (\n      typeof msg.content === 'string' &&\n      (\n        sessionKey.startsWith('cron:') ||\n        sessionKey.includes(':cron:') ||\n        sessionKey.includes(':automation:') ||\n        context.channel === 'cron' ||\n        context.channel === 'automation'\n      )\n    ) {\n      const content = msg.content;\n      const isDreamingSweep =\n        content.includes(DREAMING_SWEEP_TOKEN) ||\n        content.includes(DREAMING_LIGHT_SWEEP_TOKEN) ||\n        content.includes(DREAMING_REM_SWEEP_TOKEN);\n\n      if (isDreamingSweep) {\n        const workspaceDir = this.agentManager.getResolvedWorkspaceForSession(sessionKey);\n        const resolved = resolveDreamingConfig(this.getConfig?.());\n        const t0 = Date.now();\n\n        if (content.includes(DREAMING_LIGHT_SWEEP_TOKEN)) {\n          const result = await runLightSweep({ workspaceDir, config: resolved.phases.light });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'light',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            scannedEntries: result.scannedEntries, newSignals: result.newSignals, deduped: result.deduped,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else if (content.includes(DREAMING_REM_SWEEP_TOKEN)) {\n          const result = await runRemPatterns({ workspaceDir, config: resolved.phases.rem });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'rem',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            patternsDiscovered: result.patternsDiscovered, entriesAnalyzed: result.entriesAnalyzed,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        } else {\n          const result = await runDreamingDeepPromotion({\n            workspaceDir,\n            config: resolved.phases.deep,\n            memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey),\n          });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'deep',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            candidates: result.candidates, applied: result.applied,\n          };\n          await appendDreamingEvent(workspaceDir, event);\n        }\n        return;\n      }\n    }\n\n    try {\n      await this.sessionHydrator.model(sessionKey);\n\n      const channelSystemPrompt =\n        typeof context.metadata?.channelSystemPrompt === 'string'\n          ? context.metadata.channelSystemPrompt.trim()\n          : '';\n      if (channelSystemPrompt) {\n        this.agentManager.getOrCreateAgent(sessionKey);\n        this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);\n      }\n\n      const thinkingDefault =\n        this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();\n      const thinkingLevel = await resolveEffectiveThinkingLevel(\n        this.sessionConfigStore,\n        sessionKey,\n        null,\n        thinkingDefault,\n      );\n      this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);\n\n      const persistedAttachments = await persistInboundAttachments(msg.attachments);\n      const modelRef = this.modelManager.getModelForSession(sessionKey);\n      const userMessage = await buildTranscriptUserMessage({\n        text: msg.content,\n        prepared: persistedAttachments,\n        sessionKey,\n        modelRef,\n        config: this.getConfig?.(),\n        agentManager: this.agentManager,\n      });\n      setPendingTranscriptUserMessage(sessionKey, userMessage);\n\n      const userPlainForMemory = extractAgentUserPlainText(userMessage);\n      const userMessageForModel = await this.agentManager.applyMemoryPrefetchToUserMessage(\n        userMessage,\n        sessionKey,\n      );\n\n      const llmTurn = await hydrateUserTurnForLlm({\n        message: userMessage,\n        modelRef,\n      });\n\n      this.feedbackCoordinator.startTask();\n\n      const turnResult = await (async () => {\n        try {\n          return await runEmbeddedTurnForSession({\n            sessionKey,\n            userMessage: userMessageForModel,\n            llmImages: llmTurn.images,\n            sessionStore: this.sessionStore,\n            agentManager: this.agentManager,\n            modelManager: this.modelManager,\n            thinkingOverride: thinkingLevel,\n            getConfig: this.getConfig,\n            beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey),\n            onEvent: (event) => this.onEmbeddedStreamEvent?.(sessionKey, event),\n          });\n        } finally {\n          clearPendingTranscriptUserMessage(sessionKey, userMessage);\n        }\n      })();\n\n      this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory);\n      this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);\n\n      if (turnResult.ok) {\n        this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);\n        this.enqueueAutoTitle?.(sessionKey);\n      } else if (turnResult.errorMessage) {\n        log.warn({ sessionKey, errorMessage: turnResult.errorMessage }, 'Embedded inbound turn failed');\n      }\n\n      this.feedbackCoordinator.endTask();\n\n    } catch (error) {\n      log.error({ err: error, sessionKey }, 'Error in agent orchestration');\n      this.feedbackCoordinator.endTask();\n      throw error;\n    }\n  }\n\n  /**\n   * Get the current agent model ID\n   */\n  getCurrentModel(): string {\n    return this.modelManager.getCurrentModel();\n  }\n\n  /**\n   * Check if agent is currently processing for a session\n   */\n  isProcessing(sessionKey: string): boolean {\n    const agent = this.agentManager.getAgent(sessionKey);\n    if (!agent) {\n      return false;\n    }\n    return agent.state.messages.length > 0;\n  }\n\n  /**\n   * Abort current agent execution for a session\n   */\n  abort(sessionKey: string): void {\n    void abortEmbeddedRun(sessionKey);\n    const agent = this.agentManager.getAgent(sessionKey);\n    agent?.abort();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-orchestrator.js","names":[],"sources":["../../../../src/agent/orchestration/agent-orchestrator.ts"],"sourcesContent":["/**\n * Agent Orchestrator - Coordinates Agent execution flow\n *\n * Manages the complete agent execution pipeline from message processing\n * to response generation.\n */\n\nimport type { Config } from '../../config/schema.js';\nimport { resolveEffectiveAgentProfileForSession } from '../../config/agent-profile.js';\nimport type { InboundMessage } from '../../infra/bus/index.js';\nimport type { SessionConfigStore, SessionStore } from '../../session/index.js';\nimport type { SessionHydrator } from '../session/index.js';\nimport { resolveEffectiveThinkingLevel } from '../../session/thinking-resolve.js';\nimport type { ThinkLevel } from '../transcript/thinking-types.js';\nimport type { ModelManager } from '../models/index.js';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { AgentEventHandler } from './agent-event-handler.js';\nimport type { FeedbackCoordinator } from '../feedback/feedback-coordinator.js';\nimport type { AgentManager } from '../agent-manager.js';\nimport { createLogger } from '../../utils/logger.js';\nimport { extractAgentUserPlainText } from '../memory/user-message-text.js';\nimport { abortEmbeddedRun } from '../embedded/runs.js';\nimport { runEmbeddedTurnForSession } from '../embedded/run-for-session.js';\nimport type { EmbeddedStreamEvent } from '../embedded/types.js';\nimport { persistInboundAttachments } from '../../channels/attachments/inbound-persist.js';\nimport {\n  buildTranscriptUserMessage,\n  clearPendingTranscriptUserMessage,\n  hydrateUserTurnForLlm,\n  setPendingTranscriptUserMessage,\n} from '../inbound/attachment-pipeline.js';\nimport {\n  DREAMING_SWEEP_TOKEN,\n  DREAMING_LIGHT_SWEEP_TOKEN,\n  DREAMING_REM_SWEEP_TOKEN,\n} from '../memory/dreaming/constants.js';\nimport { runDreamingDeepPromotion } from '../memory/dreaming/deep-promotion.js';\nimport { appendDreamingEvent, type DreamingEvent } from '../memory/dreaming/events.js';\nimport { runLightSweep } from '../memory/dreaming/light-sweep.js';\nimport { runRemPatterns } from '../memory/dreaming/rem-patterns.js';\nimport { resolveDreamingAgentScope } from '../memory/dreaming/scope.js';\n\nconst log = createLogger('AgentOrchestrator');\n\nexport interface AgentOrchestratorConfig {\n  agentManager: AgentManager;\n  sessionStore: SessionStore;\n  modelManager: ModelManager;\n  eventHandler: AgentEventHandler;\n  feedbackCoordinator: FeedbackCoordinator;\n  sessionConfigStore: SessionConfigStore;\n  /** Per-session hydration (workspace override + model override) before the agent runs. */\n  sessionHydrator: SessionHydrator;\n  getThinkingDefault: () => ThinkLevel | undefined;\n  /** Per-session default from merged `agents.list` / defaults (optional). */\n  getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  /** Default workspace root when no per-session resolver is set. */\n  workspaceRoot: string;\n  /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */\n  getWorkspaceRootForSession?: (sessionKey: string) => string;\n  /** Agent home (`…/agents/<id>/`) for inbound/TTS files — keeps internal state out of the markdown workspace. */\n  getAgentInternalStorageRootForSession?: (sessionKey: string) => string;\n  /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */\n  enqueueAutoTitle?: (sessionKey: string) => void;\n  /** For per-turn timeout. */\n  getConfig?: () => Config | undefined;\n  /** Channel streaming: token/tool events from pi embedded session. */\n  onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  /** Called after a successful embedded turn with assistant plain text. */\n  onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n}\n\nexport class AgentOrchestrator {\n  private agentManager: AgentManager;\n  private sessionStore: SessionStore;\n  private modelManager: ModelManager;\n  private feedbackCoordinator: FeedbackCoordinator;\n  private sessionConfigStore: SessionConfigStore;\n  private sessionHydrator: SessionHydrator;\n  private getThinkingDefault: () => ThinkLevel | undefined;\n  private getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;\n  private enqueueAutoTitle?: (sessionKey: string) => void;\n  private getConfig?: () => Config | undefined;\n  private onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;\n  private onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;\n\n  constructor(config: AgentOrchestratorConfig) {\n    this.agentManager = config.agentManager;\n    this.sessionStore = config.sessionStore;\n    this.modelManager = config.modelManager;\n    this.feedbackCoordinator = config.feedbackCoordinator;\n    this.sessionConfigStore = config.sessionConfigStore;\n    this.sessionHydrator = config.sessionHydrator;\n    this.getThinkingDefault = config.getThinkingDefault;\n    this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;\n    this.enqueueAutoTitle = config.enqueueAutoTitle;\n    this.getConfig = config.getConfig;\n    this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;\n    this.onEmbeddedTurnComplete = config.onEmbeddedTurnComplete;\n  }\n\n  /**\n   * Process a message through the agent orchestration pipeline\n   */\n  async process(msg: InboundMessage, context: SessionContext): Promise<void> {\n    const { sessionKey } = context;\n\n    log.debug({ sessionKey }, 'Processing message through agent orchestrator');\n\n    await this.sessionHydrator.workspace(sessionKey);\n\n    // Dreaming: short-circuit scheduled maintenance tokens into local runs.\n    // This avoids spending LLM tokens for scheduled memory consolidation.\n    if (\n      typeof msg.content === 'string' &&\n      (\n        sessionKey.startsWith('cron:') ||\n        sessionKey.includes(':cron:') ||\n        sessionKey.includes(':automation:') ||\n        context.channel === 'cron' ||\n        context.channel === 'automation'\n      )\n    ) {\n      const content = msg.content;\n      const isDreamingSweep =\n        content.includes(DREAMING_SWEEP_TOKEN) ||\n        content.includes(DREAMING_LIGHT_SWEEP_TOKEN) ||\n        content.includes(DREAMING_REM_SWEEP_TOKEN);\n\n      if (isDreamingSweep) {\n        const cfg = this.getConfig?.();\n        if (!cfg) {\n          log.warn({ sessionKey }, 'Dreaming sweep skipped: config unavailable');\n          return;\n        }\n        const profile = resolveEffectiveAgentProfileForSession(cfg, sessionKey);\n        const scope = resolveDreamingAgentScope(cfg, profile.agentId);\n        const resolved = scope.config;\n        const t0 = Date.now();\n\n        if (content.includes(DREAMING_LIGHT_SWEEP_TOKEN)) {\n          const result = await runLightSweep({ dreamingRoot: scope.memoriesDir, config: resolved.phases.light });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'light',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            scannedEntries: result.scannedEntries, newSignals: result.newSignals, deduped: result.deduped,\n          };\n          await appendDreamingEvent(scope.memoriesDir, event);\n        } else if (content.includes(DREAMING_REM_SWEEP_TOKEN)) {\n          const result = await runRemPatterns({ dreamingRoot: scope.memoriesDir, config: resolved.phases.rem });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'rem',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            patternsDiscovered: result.patternsDiscovered, entriesAnalyzed: result.entriesAnalyzed,\n          };\n          await appendDreamingEvent(scope.memoriesDir, event);\n        } else {\n          const result = await runDreamingDeepPromotion({\n            workspaceDir: scope.workspaceDir,\n            dreamingRoot: scope.memoriesDir,\n            config: resolved.phases.deep,\n            memoryManager: this.agentManager.getMemoryManagerForSession(sessionKey),\n          });\n          const event: DreamingEvent = {\n            timestamp: new Date().toISOString(), phase: 'deep',\n            ok: result.ok, reason: result.reason, durationMs: Date.now() - t0,\n            candidates: result.candidates, applied: result.applied,\n          };\n          await appendDreamingEvent(scope.memoriesDir, event);\n        }\n        return;\n      }\n    }\n\n    try {\n      await this.sessionHydrator.model(sessionKey);\n\n      const channelSystemPrompt =\n        typeof context.metadata?.channelSystemPrompt === 'string'\n          ? context.metadata.channelSystemPrompt.trim()\n          : '';\n      if (channelSystemPrompt) {\n        this.agentManager.getOrCreateAgent(sessionKey);\n        this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);\n      }\n\n      const thinkingDefault =\n        this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();\n      const thinkingLevel = await resolveEffectiveThinkingLevel(\n        this.sessionConfigStore,\n        sessionKey,\n        null,\n        thinkingDefault,\n      );\n      this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);\n\n      const persistedAttachments = await persistInboundAttachments(msg.attachments);\n      const modelRef = this.modelManager.getModelForSession(sessionKey);\n      const userMessage = await buildTranscriptUserMessage({\n        text: msg.content,\n        prepared: persistedAttachments,\n        sessionKey,\n        modelRef,\n        config: this.getConfig?.(),\n        agentManager: this.agentManager,\n      });\n      setPendingTranscriptUserMessage(sessionKey, userMessage);\n\n      const userPlainForMemory = extractAgentUserPlainText(userMessage);\n      const userMessageForModel = await this.agentManager.applyMemoryPrefetchToUserMessage(\n        userMessage,\n        sessionKey,\n      );\n\n      const llmTurn = await hydrateUserTurnForLlm({\n        message: userMessage,\n        modelRef,\n      });\n\n      this.feedbackCoordinator.startTask();\n\n      const turnResult = await (async () => {\n        try {\n          return await runEmbeddedTurnForSession({\n            sessionKey,\n            userMessage: userMessageForModel,\n            llmImages: llmTurn.images,\n            sessionStore: this.sessionStore,\n            agentManager: this.agentManager,\n            modelManager: this.modelManager,\n            thinkingOverride: thinkingLevel,\n            getConfig: this.getConfig,\n            beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey),\n            onEvent: (event) => this.onEmbeddedStreamEvent?.(sessionKey, event),\n          });\n        } finally {\n          clearPendingTranscriptUserMessage(sessionKey, userMessage);\n        }\n      })();\n\n      this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory);\n      this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);\n\n      if (turnResult.ok) {\n        this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);\n        this.enqueueAutoTitle?.(sessionKey);\n      } else if (turnResult.errorMessage) {\n        log.warn({ sessionKey, errorMessage: turnResult.errorMessage }, 'Embedded inbound turn failed');\n      }\n\n      this.feedbackCoordinator.endTask();\n\n    } catch (error) {\n      log.error({ err: error, sessionKey }, 'Error in agent orchestration');\n      this.feedbackCoordinator.endTask();\n      throw error;\n    }\n  }\n\n  /**\n   * Get the current agent model ID\n   */\n  getCurrentModel(): string {\n    return this.modelManager.getCurrentModel();\n  }\n\n  /**\n   * Check if agent is currently processing for a session\n   */\n  isProcessing(sessionKey: string): boolean {\n    const agent = this.agentManager.getAgent(sessionKey);\n    if (!agent) {\n      return false;\n    }\n    return agent.state.messages.length > 0;\n  }\n\n  /**\n   * Abort current agent execution for a session\n   */\n  abort(sessionKey: string): void {\n    void abortEmbeddedRun(sessionKey);\n    const agent = this.agentManager.getAgent(sessionKey);\n    agent?.abort();\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/prompt/sections/tooling.js

@@ -2,11 +2,12 @@
 const CORE_TOOL_ORDER = [
 	"read_file",
 	"write_file",
-	"edit_file",
+	"apply_patch",
 	"grep",
 	"find",
 	"list_dir",
-	"shell",
+	"exec_command",
+	"update_plan",
 	"web_search",
 	"web_fetch",
 	"web_extract",
@@ -34,13 +35,14 @@ const CORE_TOOL_ORDER = [
 	"execute_code"
 ];
 const CORE_TOOL_SUMMARIES = {
-	read_file: "Read targeted file contents; prefer this over shell cat/sed for inspection",
-	write_file: "Create new files or intentional complete rewrites",
-	edit_file: "Make precise, minimal edits to existing files",
+	read_file: "Read targeted file contents before editing",
+	write_file: "Create new files or intentional complete rewrites; prefer apply_patch for code changes",
+	apply_patch: "Apply strict patches for source edits",
 	grep: "Search file contents for literals, errors, config values, and docs",
 	find: "Find files by glob pattern",
 	list_dir: "List directory contents",
-	shell: "Run tests, type checks, builds, package scripts, and safe inspection commands",
+	exec_command: "Run tests, type checks, builds, package scripts, and safe inspection commands",
+	update_plan: "Keep the current multi-step coding plan visible and accurate",
 	web_search: "Search the web",
 	web_fetch: "Fetch and extract readable content from a URL",
 	web_extract: "Extract structured content from a URL",
@@ -94,9 +96,10 @@ function buildToolingSection(params) {
 		const name = resolveToolName(tool);
 		toolLines.push(summary ? `- ${name}: ${summary}` : `- ${name}`);
 	}
-	const shellToolName = resolveToolName("shell");
+	const execToolName = resolveToolName("exec_command");
+	const planToolName = resolveToolName("update_plan");
 	const readToolName = resolveToolName("read_file");
-	const editToolName = resolveToolName("edit_file");
+	const patchToolName = resolveToolName("apply_patch");
 	const writeToolName = resolveToolName("write_file");
 	const grepToolName = resolveToolName("grep");
 	const findToolName = resolveToolName("find");
@@ -104,11 +107,12 @@ function buildToolingSection(params) {
 	const hasWorkflow = availableTools.has("workflow");
 	const hasToolManual = availableTools.has("tool_manual");
 	const hasRead = availableTools.has("read_file");
-	const hasEdit = availableTools.has("edit_file");
+	const hasPatch = availableTools.has("apply_patch");
 	const hasWrite = availableTools.has("write_file");
 	const hasGrep = availableTools.has("grep");
 	const hasFind = availableTools.has("find");
-	const hasShell = availableTools.has("shell");
+	const hasExec = availableTools.has("exec_command");
+	const hasPlan = availableTools.has("update_plan");
 	const orchestrationLines = [];
 	if (hasDelegate) orchestrationLines.push("- Sub-agent delegation → use `delegate_task(goal, context?, toolset?)` for focused parallel work; results return to you automatically.");
 	if (hasWorkflow) orchestrationLines.push("- Multi-phase workflows → use `workflow` to start persisted runs with subagents when a script defines phases.");
@@ -117,12 +121,13 @@ function buildToolingSection(params) {
 		"Tool availability (filtered by policy):",
 		"Tool names are case-sensitive. Call tools exactly as listed.",
 		toolLines.length > 0 ? toolLines.join("\n") : "- No tools are registered for this session.",
-		`For long waits, avoid rapid poll loops: use \`${shellToolName}\` with enough yieldMs or poll in reasonable intervals.`,
+		`For long waits, avoid rapid poll loops: use \`${execToolName}\` with a sufficient timeout or poll in reasonable intervals.`,
 		hasRead ? `Use \`${readToolName}\` for targeted file inspection before editing; do not rely on filenames alone.` : "",
-		hasEdit ? `Use \`${editToolName}\` for small source changes; keep patches focused.` : "",
+		hasPatch ? `Use \`${patchToolName}\` for source changes; keep patches focused and inspect failures carefully.` : "",
 		hasWrite ? `Use \`${writeToolName}\` only for new files or intentional complete rewrites.` : "",
 		hasGrep || hasFind ? `Use ${[hasGrep ? `\`${grepToolName}\`` : "", hasFind ? `\`${findToolName}\`` : ""].filter(Boolean).join(" and ")} for text/file discovery; use code graph or symbol tools when available for definitions and call relationships.` : "",
-		hasShell ? `Use \`${shellToolName}\` for verification and safe inspection, not routine file editing.` : "",
+		hasExec ? `Use \`${execToolName}\` for verification and safe inspection, not routine file editing.` : "",
+		hasPlan ? `Use \`${planToolName}\` for multi-step coding work: keep exactly one active step when work is in progress, and update it after meaningful progress or review.` : "",
 		hasToolManual ? "Some complex tools have built-in manuals. Use `tool_manual(tool)` before non-trivial use." : "",
 		hasDelegate ? "If a task is complex or long-running, delegate it. Completion is push-based: the sub-agent result returns when done." : "",
 		...orchestrationLines,

package/dist/src/agent/prompt/sections/tooling.js.map

@@ -1 +1 @@
-{"version":3,"file":"tooling.js","names":[],"sources":["../../../../../src/agent/prompt/sections/tooling.ts"],"sourcesContent":["const CORE_TOOL_ORDER = [\n  'read_file',\n  'write_file',\n  'edit_file',\n  'grep',\n  'find',\n  'list_dir',\n  'shell',\n  'web_search',\n  'web_fetch',\n  'web_extract',\n  'browser_use',\n  'send_message',\n  'send_media',\n  'memory_search',\n  'memory_get',\n  'session_search',\n  'curated_memory',\n  'session_status',\n  'tool_manual',\n  'delegate_task',\n  'workflow',\n  'automation',\n  'skills_list',\n  'skill_view',\n  'skill_manage',\n  'todo',\n  'clarify',\n  'text_to_speech',\n  'image',\n  'image_generate',\n  'create_share',\n  'execute_code',\n] as const;\n\nconst CORE_TOOL_SUMMARIES: Record<string, string> = {\n  read_file: 'Read targeted file contents; prefer this over shell cat/sed for inspection',\n  write_file: 'Create new files or intentional complete rewrites',\n  edit_file: 'Make precise, minimal edits to existing files',\n  grep: 'Search file contents for literals, errors, config values, and docs',\n  find: 'Find files by glob pattern',\n  list_dir: 'List directory contents',\n  shell: 'Run tests, type checks, builds, package scripts, and safe inspection commands',\n  web_search: 'Search the web',\n  web_fetch: 'Fetch and extract readable content from a URL',\n  web_extract: 'Extract structured content from a URL',\n  browser_use: 'Control the configured browser',\n  send_message: 'Send messages to the current channel',\n  send_media: 'Send media attachments to the current channel',\n  memory_search: 'Semantic search over indexed memory sources',\n  memory_get: 'Read specific lines from memory sources returned by search',\n  session_search: 'Search other chat sessions or list recent sessions',\n  curated_memory: 'Read/write structured notes under agent home memories/',\n  session_status: 'Show session usage/time/model state',\n  tool_manual: 'Load built-in usage manuals for complex tools',\n  delegate_task: 'Spawn an isolated sub-agent for a delegated task',\n  workflow: 'Start a persisted multi-phase workflow run',\n  automation: 'Manage product automations',\n  skills_list: 'List available skills',\n  skill_view: 'Load a skill SKILL.md or sub-documents',\n  skill_manage: 'Create or update skills on disk',\n  todo: 'Manage in-session todo items',\n  clarify: 'Ask the user a blocking clarification question',\n  text_to_speech: 'Send a standalone voice message',\n  image: 'Analyze an image with the configured vision model',\n  image_generate: 'Generate images with the configured image model',\n  create_share: 'Create a shareable link for workspace files',\n  execute_code: 'Run code in a sandbox with a restricted tool subset',\n};\n\nexport function buildToolingSection(params: {\n  toolNames?: string[];\n  toolSummaries?: Record<string, string>;\n}): string {\n  const rawToolNames = (params.toolNames ?? []).map((tool) => tool.trim()).filter(Boolean);\n  const canonicalByNormalized = new Map<string, string>();\n  for (const name of rawToolNames) {\n    const normalized = name.toLowerCase();\n    if (!canonicalByNormalized.has(normalized)) {\n      canonicalByNormalized.set(normalized, name);\n    }\n  }\n  const resolveToolName = (normalized: string) =>\n    canonicalByNormalized.get(normalized) ?? normalized;\n\n  const normalizedTools = rawToolNames.map((tool) => tool.toLowerCase());\n  const availableTools = new Set(normalizedTools);\n\n  const externalToolSummaries = new Map<string, string>();\n  for (const [key, value] of Object.entries(params.toolSummaries ?? {})) {\n    const normalized = key.trim().toLowerCase();\n    if (!normalized || !value?.trim()) {\n      continue;\n    }\n    externalToolSummaries.set(normalized, value.trim());\n  }\n\n  const extraTools = Array.from(\n    new Set(normalizedTools.filter((tool) => !CORE_TOOL_ORDER.includes(tool as (typeof CORE_TOOL_ORDER)[number]))),\n  );\n  const enabledTools = CORE_TOOL_ORDER.filter((tool) => availableTools.has(tool));\n  const toolLines = enabledTools.map((tool) => {\n    const summary = CORE_TOOL_SUMMARIES[tool] ?? externalToolSummaries.get(tool);\n    const name = resolveToolName(tool);\n    return summary ? `- ${name}: ${summary}` : `- ${name}`;\n  });\n  for (const tool of extraTools.toSorted()) {\n    const summary = CORE_TOOL_SUMMARIES[tool] ?? externalToolSummaries.get(tool);\n    const name = resolveToolName(tool);\n    toolLines.push(summary ? `- ${name}: ${summary}` : `- ${name}`);\n  }\n\n  const shellToolName = resolveToolName('shell');\n  const readToolName = resolveToolName('read_file');\n  const editToolName = resolveToolName('edit_file');\n  const writeToolName = resolveToolName('write_file');\n  const grepToolName = resolveToolName('grep');\n  const findToolName = resolveToolName('find');\n  const hasDelegate = availableTools.has('delegate_task');\n  const hasWorkflow = availableTools.has('workflow');\n  const hasToolManual = availableTools.has('tool_manual');\n  const hasRead = availableTools.has('read_file');\n  const hasEdit = availableTools.has('edit_file');\n  const hasWrite = availableTools.has('write_file');\n  const hasGrep = availableTools.has('grep');\n  const hasFind = availableTools.has('find');\n  const hasShell = availableTools.has('shell');\n\n  const orchestrationLines: string[] = [];\n  if (hasDelegate) {\n    orchestrationLines.push(\n      '- Sub-agent delegation → use `delegate_task(goal, context?, toolset?)` for focused parallel work; results return to you automatically.',\n    );\n  }\n  if (hasWorkflow) {\n    orchestrationLines.push(\n      '- Multi-phase workflows → use `workflow` to start persisted runs with subagents when a script defines phases.',\n    );\n  }\n\n  return [\n    '## Tooling',\n    'Tool availability (filtered by policy):',\n    'Tool names are case-sensitive. Call tools exactly as listed.',\n    toolLines.length > 0\n      ? toolLines.join('\\n')\n      : '- No tools are registered for this session.',\n    `For long waits, avoid rapid poll loops: use \\`${shellToolName}\\` with enough yieldMs or poll in reasonable intervals.`,\n    hasRead\n      ? `Use \\`${readToolName}\\` for targeted file inspection before editing; do not rely on filenames alone.`\n      : '',\n    hasEdit\n      ? `Use \\`${editToolName}\\` for small source changes; keep patches focused.`\n      : '',\n    hasWrite\n      ? `Use \\`${writeToolName}\\` only for new files or intentional complete rewrites.`\n      : '',\n    hasGrep || hasFind\n      ? `Use ${[\n          hasGrep ? `\\`${grepToolName}\\`` : '',\n          hasFind ? `\\`${findToolName}\\`` : '',\n        ].filter(Boolean).join(' and ')} for text/file discovery; use code graph or symbol tools when available for definitions and call relationships.`\n      : '',\n    hasShell\n      ? `Use \\`${shellToolName}\\` for verification and safe inspection, not routine file editing.`\n      : '',\n    hasToolManual\n      ? 'Some complex tools have built-in manuals. Use `tool_manual(tool)` before non-trivial use.'\n      : '',\n    hasDelegate\n      ? 'If a task is complex or long-running, delegate it. Completion is push-based: the sub-agent result returns when done.'\n      : '',\n    ...orchestrationLines,\n    'Do not poll delegate/workflow status in a tight loop; check on-demand or wait for completion.',\n  ]\n    .filter(Boolean)\n    .join('\\n');\n}\n\nexport function hasSkillsTools(toolNames: string[]): boolean {\n  const normalized = new Set(toolNames.map((t) => t.toLowerCase()));\n  return normalized.has('skills_list') || normalized.has('skill_view');\n}\n"],"mappings":"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"}
+{"version":3,"file":"tooling.js","names":[],"sources":["../../../../../src/agent/prompt/sections/tooling.ts"],"sourcesContent":["const CORE_TOOL_ORDER = [\n  'read_file',\n  'write_file',\n  'apply_patch',\n  'grep',\n  'find',\n  'list_dir',\n  'exec_command',\n  'update_plan',\n  'web_search',\n  'web_fetch',\n  'web_extract',\n  'browser_use',\n  'send_message',\n  'send_media',\n  'memory_search',\n  'memory_get',\n  'session_search',\n  'curated_memory',\n  'session_status',\n  'tool_manual',\n  'delegate_task',\n  'workflow',\n  'automation',\n  'skills_list',\n  'skill_view',\n  'skill_manage',\n  'todo',\n  'clarify',\n  'text_to_speech',\n  'image',\n  'image_generate',\n  'create_share',\n  'execute_code',\n] as const;\n\nconst CORE_TOOL_SUMMARIES: Record<string, string> = {\n  read_file: 'Read targeted file contents before editing',\n  write_file: 'Create new files or intentional complete rewrites; prefer apply_patch for code changes',\n  apply_patch: 'Apply strict patches for source edits',\n  grep: 'Search file contents for literals, errors, config values, and docs',\n  find: 'Find files by glob pattern',\n  list_dir: 'List directory contents',\n  exec_command: 'Run tests, type checks, builds, package scripts, and safe inspection commands',\n  update_plan: 'Keep the current multi-step coding plan visible and accurate',\n  web_search: 'Search the web',\n  web_fetch: 'Fetch and extract readable content from a URL',\n  web_extract: 'Extract structured content from a URL',\n  browser_use: 'Control the configured browser',\n  send_message: 'Send messages to the current channel',\n  send_media: 'Send media attachments to the current channel',\n  memory_search: 'Semantic search over indexed memory sources',\n  memory_get: 'Read specific lines from memory sources returned by search',\n  session_search: 'Search other chat sessions or list recent sessions',\n  curated_memory: 'Read/write structured notes under agent home memories/',\n  session_status: 'Show session usage/time/model state',\n  tool_manual: 'Load built-in usage manuals for complex tools',\n  delegate_task: 'Spawn an isolated sub-agent for a delegated task',\n  workflow: 'Start a persisted multi-phase workflow run',\n  automation: 'Manage product automations',\n  skills_list: 'List available skills',\n  skill_view: 'Load a skill SKILL.md or sub-documents',\n  skill_manage: 'Create or update skills on disk',\n  todo: 'Manage in-session todo items',\n  clarify: 'Ask the user a blocking clarification question',\n  text_to_speech: 'Send a standalone voice message',\n  image: 'Analyze an image with the configured vision model',\n  image_generate: 'Generate images with the configured image model',\n  create_share: 'Create a shareable link for workspace files',\n  execute_code: 'Run code in a sandbox with a restricted tool subset',\n};\n\nexport function buildToolingSection(params: {\n  toolNames?: string[];\n  toolSummaries?: Record<string, string>;\n}): string {\n  const rawToolNames = (params.toolNames ?? []).map((tool) => tool.trim()).filter(Boolean);\n  const canonicalByNormalized = new Map<string, string>();\n  for (const name of rawToolNames) {\n    const normalized = name.toLowerCase();\n    if (!canonicalByNormalized.has(normalized)) {\n      canonicalByNormalized.set(normalized, name);\n    }\n  }\n  const resolveToolName = (normalized: string) =>\n    canonicalByNormalized.get(normalized) ?? normalized;\n\n  const normalizedTools = rawToolNames.map((tool) => tool.toLowerCase());\n  const availableTools = new Set(normalizedTools);\n\n  const externalToolSummaries = new Map<string, string>();\n  for (const [key, value] of Object.entries(params.toolSummaries ?? {})) {\n    const normalized = key.trim().toLowerCase();\n    if (!normalized || !value?.trim()) {\n      continue;\n    }\n    externalToolSummaries.set(normalized, value.trim());\n  }\n\n  const extraTools = Array.from(\n    new Set(normalizedTools.filter((tool) => !CORE_TOOL_ORDER.includes(tool as (typeof CORE_TOOL_ORDER)[number]))),\n  );\n  const enabledTools = CORE_TOOL_ORDER.filter((tool) => availableTools.has(tool));\n  const toolLines = enabledTools.map((tool) => {\n    const summary = CORE_TOOL_SUMMARIES[tool] ?? externalToolSummaries.get(tool);\n    const name = resolveToolName(tool);\n    return summary ? `- ${name}: ${summary}` : `- ${name}`;\n  });\n  for (const tool of extraTools.toSorted()) {\n    const summary = CORE_TOOL_SUMMARIES[tool] ?? externalToolSummaries.get(tool);\n    const name = resolveToolName(tool);\n    toolLines.push(summary ? `- ${name}: ${summary}` : `- ${name}`);\n  }\n\n  const execToolName = resolveToolName('exec_command');\n  const planToolName = resolveToolName('update_plan');\n  const readToolName = resolveToolName('read_file');\n  const patchToolName = resolveToolName('apply_patch');\n  const writeToolName = resolveToolName('write_file');\n  const grepToolName = resolveToolName('grep');\n  const findToolName = resolveToolName('find');\n  const hasDelegate = availableTools.has('delegate_task');\n  const hasWorkflow = availableTools.has('workflow');\n  const hasToolManual = availableTools.has('tool_manual');\n  const hasRead = availableTools.has('read_file');\n  const hasPatch = availableTools.has('apply_patch');\n  const hasWrite = availableTools.has('write_file');\n  const hasGrep = availableTools.has('grep');\n  const hasFind = availableTools.has('find');\n  const hasExec = availableTools.has('exec_command');\n  const hasPlan = availableTools.has('update_plan');\n\n  const orchestrationLines: string[] = [];\n  if (hasDelegate) {\n    orchestrationLines.push(\n      '- Sub-agent delegation → use `delegate_task(goal, context?, toolset?)` for focused parallel work; results return to you automatically.',\n    );\n  }\n  if (hasWorkflow) {\n    orchestrationLines.push(\n      '- Multi-phase workflows → use `workflow` to start persisted runs with subagents when a script defines phases.',\n    );\n  }\n\n  return [\n    '## Tooling',\n    'Tool availability (filtered by policy):',\n    'Tool names are case-sensitive. Call tools exactly as listed.',\n    toolLines.length > 0\n      ? toolLines.join('\\n')\n      : '- No tools are registered for this session.',\n    `For long waits, avoid rapid poll loops: use \\`${execToolName}\\` with a sufficient timeout or poll in reasonable intervals.`,\n    hasRead\n      ? `Use \\`${readToolName}\\` for targeted file inspection before editing; do not rely on filenames alone.`\n      : '',\n    hasPatch\n      ? `Use \\`${patchToolName}\\` for source changes; keep patches focused and inspect failures carefully.`\n      : '',\n    hasWrite\n      ? `Use \\`${writeToolName}\\` only for new files or intentional complete rewrites.`\n      : '',\n    hasGrep || hasFind\n      ? `Use ${[\n          hasGrep ? `\\`${grepToolName}\\`` : '',\n          hasFind ? `\\`${findToolName}\\`` : '',\n        ].filter(Boolean).join(' and ')} for text/file discovery; use code graph or symbol tools when available for definitions and call relationships.`\n      : '',\n    hasExec\n      ? `Use \\`${execToolName}\\` for verification and safe inspection, not routine file editing.`\n      : '',\n    hasPlan\n      ? `Use \\`${planToolName}\\` for multi-step coding work: keep exactly one active step when work is in progress, and update it after meaningful progress or review.`\n      : '',\n    hasToolManual\n      ? 'Some complex tools have built-in manuals. Use `tool_manual(tool)` before non-trivial use.'\n      : '',\n    hasDelegate\n      ? 'If a task is complex or long-running, delegate it. Completion is push-based: the sub-agent result returns when done.'\n      : '',\n    ...orchestrationLines,\n    'Do not poll delegate/workflow status in a tight loop; check on-demand or wait for completion.',\n  ]\n    .filter(Boolean)\n    .join('\\n');\n}\n\nexport function hasSkillsTools(toolNames: string[]): boolean {\n  const normalized = new Set(toolNames.map((t) => t.toLowerCase()));\n  return normalized.has('skills_list') || normalized.has('skill_view');\n}\n"],"mappings":"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"}

package/dist/src/agent/prompt/system-reminder.js

@@ -3,9 +3,9 @@ const DEFAULT_CONFIG = {
 	enabled: true,
 	defaultReminders: [],
 	contextualReminders: {
-		"file.write": ["💡 Tip: edit > write for small changes"],
+		"file.write": ["Tip: apply_patch > write_file for small changes"],
 		"file.delete": ["⚠️ Confirming: file deletion"],
-		"shell.exec": ["🐚 Shell: use pty=true for interactive commands"],
+		exec_command: ["Command: use non-interactive commands with clear timeouts"],
 		"web.fetch": ["🌐 Web: check for rate limits on repeated calls"]
 	},
 	appendToToolResults: true,

package/dist/src/agent/prompt/system-reminder.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-reminder.js","names":[],"sources":["../../../../src/agent/prompt/system-reminder.ts"],"sourcesContent":["/**\n * System Reminder - Contextual tips after tool execution\n * \n * Based on Agent Harness theory: \"Fixed system reminders appended after \n * tool execution are more effective than instructions in System Prompt alone\"\n * \n * Optimized: Contextual reminders instead of fixed spam\n */\n\nexport interface SystemReminderConfig {\n  enabled: boolean;\n  defaultReminders: string[];\n  contextualReminders: Record<string, string[]>;\n  appendToToolResults: boolean;\n  maxRemindersPerTurn: number;\n}\n\n// Default minimal reminders (only essentials)\nconst DEFAULT_REMINDERS: string[] = [];\n\n// Contextual reminders based on tool type\nconst CONTEXTUAL_REMINDERS: Record<string, string[]> = {\n  'file.write': ['💡 Tip: edit > write for small changes'],\n  'file.delete': ['⚠️ Confirming: file deletion'],\n  'shell.exec': ['🐚 Shell: use pty=true for interactive commands'],\n  'web.fetch': ['🌐 Web: check for rate limits on repeated calls'],\n};\n\nconst DEFAULT_CONFIG: SystemReminderConfig = {\n  enabled: true,\n  defaultReminders: DEFAULT_REMINDERS,\n  contextualReminders: CONTEXTUAL_REMINDERS,\n  appendToToolResults: true,\n  maxRemindersPerTurn: 2, // Reduced from 3\n};\n\nexport class SystemReminder {\n  private config: SystemReminderConfig;\n  private reminderCountThisTurn = 0;\n\n  constructor(config: Partial<SystemReminderConfig> = {}) {\n    this.config = { ...DEFAULT_CONFIG, ...config };\n  }\n\n  /**\n   * Append default reminders (when configured and under per-turn cap).\n   */\n  getReminderText(): string {\n    if (!this.config.enabled) {\n      return '';\n    }\n\n    if (this.reminderCountThisTurn >= this.config.maxRemindersPerTurn) {\n      return ''; // Don't spam too many reminders\n    }\n\n    if (this.config.defaultReminders.length === 0) {\n      return '';\n    }\n\n    this.reminderCountThisTurn++;\n    return this.config.defaultReminders.join('\\n');\n  }\n\n  /**\n   * Get contextual reminder based on tool name\n   */\n  getContextualReminder(toolName: string): string {\n    if (!this.config.enabled) {\n      return '';\n    }\n\n    if (this.reminderCountThisTurn >= this.config.maxRemindersPerTurn) {\n      return '';\n    }\n\n    const reminders = this.config.contextualReminders[toolName];\n    if (!reminders || reminders.length === 0) {\n      return '';\n    }\n\n    this.reminderCountThisTurn++;\n    // Pick first matching reminder (could randomize if multiple)\n    return reminders[0];\n  }\n\n  /**\n   * Append reminder to tool result content\n   */\n  appendToResult(result: unknown, toolName?: string): unknown {\n    if (!this.config.enabled || !this.config.appendToToolResults) {\n      return result;\n    }\n\n    // Try contextual reminder first, fall back to default\n    const reminderText = toolName \n      ? this.getContextualReminder(toolName) \n      : this.getReminderText();\n      \n    if (!reminderText) {\n      return result;\n    }\n\n    // Handle different result formats\n    if (result && typeof result === 'object') {\n      const res = result as Record<string, unknown>;\n      \n      if (res.content && Array.isArray(res.content)) {\n        // Append to content array\n        res.content = [\n          ...res.content,\n          { type: 'text', text: `\\n${reminderText}` },\n        ];\n      } else if (typeof res.content === 'string') {\n        // Append to string content\n        res.content = `${res.content}\\n${reminderText}`;\n      }\n      \n      return res;\n    }\n\n    return result;\n  }\n\n  /**\n   * Reset turn counter (called at end of turn)\n   */\n  resetTurn(): void {\n    this.reminderCountThisTurn = 0;\n  }\n\n  /**\n   * Update configuration\n   */\n  setConfig(config: Partial<SystemReminderConfig>): void {\n    this.config = { ...this.config, ...config };\n  }\n\n  /**\n   * Get current config\n   */\n  getConfig(): SystemReminderConfig {\n    return { ...this.config };\n  }\n}\n"],"mappings":";AA4BA,MAAM,iBAAuC;CAC3C,SAAS;CACT,kBAAkB,EAAiB;CACnC,qBAAqB;EATrB,cAAc,CAAC,yCAAyC;EACxD,eAAe,CAAC,+BAA+B;EAC/C,cAAc,CAAC,kDAAkD;EACjE,aAAa,CAAC,kDAAkD;EAMvB;CACzC,qBAAqB;CACrB,qBAAqB;CACtB;AAED,IAAa,iBAAb,MAA4B;CAC1B;CACA,wBAAgC;CAEhC,YAAY,SAAwC,EAAE,EAAE;AACtD,OAAK,SAAS;GAAE,GAAG;GAAgB,GAAG;GAAQ;;;;;CAMhD,kBAA0B;AACxB,MAAI,CAAC,KAAK,OAAO,QACf,QAAO;AAGT,MAAI,KAAK,yBAAyB,KAAK,OAAO,oBAC5C,QAAO;AAGT,MAAI,KAAK,OAAO,iBAAiB,WAAW,EAC1C,QAAO;AAGT,OAAK;AACL,SAAO,KAAK,OAAO,iBAAiB,KAAK,KAAK;;;;;CAMhD,sBAAsB,UAA0B;AAC9C,MAAI,CAAC,KAAK,OAAO,QACf,QAAO;AAGT,MAAI,KAAK,yBAAyB,KAAK,OAAO,oBAC5C,QAAO;EAGT,MAAM,YAAY,KAAK,OAAO,oBAAoB;AAClD,MAAI,CAAC,aAAa,UAAU,WAAW,EACrC,QAAO;AAGT,OAAK;AAEL,SAAO,UAAU;;;;;CAMnB,eAAe,QAAiB,UAA4B;AAC1D,MAAI,CAAC,KAAK,OAAO,WAAW,CAAC,KAAK,OAAO,oBACvC,QAAO;EAIT,MAAM,eAAe,WACjB,KAAK,sBAAsB,SAAS,GACpC,KAAK,iBAAiB;AAE1B,MAAI,CAAC,aACH,QAAO;AAIT,MAAI,UAAU,OAAO,WAAW,UAAU;GACxC,MAAM,MAAM;AAEZ,OAAI,IAAI,WAAW,MAAM,QAAQ,IAAI,QAAQ,CAE3C,KAAI,UAAU,CACZ,GAAG,IAAI,SACP;IAAE,MAAM;IAAQ,MAAM,KAAK;IAAgB,CAC5C;YACQ,OAAO,IAAI,YAAY,SAEhC,KAAI,UAAU,GAAG,IAAI,QAAQ,IAAI;AAGnC,UAAO;;AAGT,SAAO;;;;;CAMT,YAAkB;AAChB,OAAK,wBAAwB;;;;;CAM/B,UAAU,QAA6C;AACrD,OAAK,SAAS;GAAE,GAAG,KAAK;GAAQ,GAAG;GAAQ;;;;;CAM7C,YAAkC;AAChC,SAAO,EAAE,GAAG,KAAK,QAAQ"}
+{"version":3,"file":"system-reminder.js","names":[],"sources":["../../../../src/agent/prompt/system-reminder.ts"],"sourcesContent":["/**\n * System Reminder - Contextual tips after tool execution\n * \n * Based on Agent Harness theory: \"Fixed system reminders appended after \n * tool execution are more effective than instructions in System Prompt alone\"\n * \n * Optimized: Contextual reminders instead of fixed spam\n */\n\nexport interface SystemReminderConfig {\n  enabled: boolean;\n  defaultReminders: string[];\n  contextualReminders: Record<string, string[]>;\n  appendToToolResults: boolean;\n  maxRemindersPerTurn: number;\n}\n\n// Default minimal reminders (only essentials)\nconst DEFAULT_REMINDERS: string[] = [];\n\n// Contextual reminders based on tool type\nconst CONTEXTUAL_REMINDERS: Record<string, string[]> = {\n  'file.write': ['Tip: apply_patch > write_file for small changes'],\n  'file.delete': ['⚠️ Confirming: file deletion'],\n  exec_command: ['Command: use non-interactive commands with clear timeouts'],\n  'web.fetch': ['🌐 Web: check for rate limits on repeated calls'],\n};\n\nconst DEFAULT_CONFIG: SystemReminderConfig = {\n  enabled: true,\n  defaultReminders: DEFAULT_REMINDERS,\n  contextualReminders: CONTEXTUAL_REMINDERS,\n  appendToToolResults: true,\n  maxRemindersPerTurn: 2, // Reduced from 3\n};\n\nexport class SystemReminder {\n  private config: SystemReminderConfig;\n  private reminderCountThisTurn = 0;\n\n  constructor(config: Partial<SystemReminderConfig> = {}) {\n    this.config = { ...DEFAULT_CONFIG, ...config };\n  }\n\n  /**\n   * Append default reminders (when configured and under per-turn cap).\n   */\n  getReminderText(): string {\n    if (!this.config.enabled) {\n      return '';\n    }\n\n    if (this.reminderCountThisTurn >= this.config.maxRemindersPerTurn) {\n      return ''; // Don't spam too many reminders\n    }\n\n    if (this.config.defaultReminders.length === 0) {\n      return '';\n    }\n\n    this.reminderCountThisTurn++;\n    return this.config.defaultReminders.join('\\n');\n  }\n\n  /**\n   * Get contextual reminder based on tool name\n   */\n  getContextualReminder(toolName: string): string {\n    if (!this.config.enabled) {\n      return '';\n    }\n\n    if (this.reminderCountThisTurn >= this.config.maxRemindersPerTurn) {\n      return '';\n    }\n\n    const reminders = this.config.contextualReminders[toolName];\n    if (!reminders || reminders.length === 0) {\n      return '';\n    }\n\n    this.reminderCountThisTurn++;\n    // Pick first matching reminder (could randomize if multiple)\n    return reminders[0];\n  }\n\n  /**\n   * Append reminder to tool result content\n   */\n  appendToResult(result: unknown, toolName?: string): unknown {\n    if (!this.config.enabled || !this.config.appendToToolResults) {\n      return result;\n    }\n\n    // Try contextual reminder first, fall back to default\n    const reminderText = toolName \n      ? this.getContextualReminder(toolName) \n      : this.getReminderText();\n      \n    if (!reminderText) {\n      return result;\n    }\n\n    // Handle different result formats\n    if (result && typeof result === 'object') {\n      const res = result as Record<string, unknown>;\n      \n      if (res.content && Array.isArray(res.content)) {\n        // Append to content array\n        res.content = [\n          ...res.content,\n          { type: 'text', text: `\\n${reminderText}` },\n        ];\n      } else if (typeof res.content === 'string') {\n        // Append to string content\n        res.content = `${res.content}\\n${reminderText}`;\n      }\n      \n      return res;\n    }\n\n    return result;\n  }\n\n  /**\n   * Reset turn counter (called at end of turn)\n   */\n  resetTurn(): void {\n    this.reminderCountThisTurn = 0;\n  }\n\n  /**\n   * Update configuration\n   */\n  setConfig(config: Partial<SystemReminderConfig>): void {\n    this.config = { ...this.config, ...config };\n  }\n\n  /**\n   * Get current config\n   */\n  getConfig(): SystemReminderConfig {\n    return { ...this.config };\n  }\n}\n"],"mappings":";AA4BA,MAAM,iBAAuC;CAC3C,SAAS;CACT,kBAAkB,EAAiB;CACnC,qBAAqB;EATrB,cAAc,CAAC,kDAAkD;EACjE,eAAe,CAAC,+BAA+B;EAC/C,cAAc,CAAC,4DAA4D;EAC3E,aAAa,CAAC,kDAAkD;EAMvB;CACzC,qBAAqB;CACrB,qBAAqB;CACtB;AAED,IAAa,iBAAb,MAA4B;CAC1B;CACA,wBAAgC;CAEhC,YAAY,SAAwC,EAAE,EAAE;AACtD,OAAK,SAAS;GAAE,GAAG;GAAgB,GAAG;GAAQ;;;;;CAMhD,kBAA0B;AACxB,MAAI,CAAC,KAAK,OAAO,QACf,QAAO;AAGT,MAAI,KAAK,yBAAyB,KAAK,OAAO,oBAC5C,QAAO;AAGT,MAAI,KAAK,OAAO,iBAAiB,WAAW,EAC1C,QAAO;AAGT,OAAK;AACL,SAAO,KAAK,OAAO,iBAAiB,KAAK,KAAK;;;;;CAMhD,sBAAsB,UAA0B;AAC9C,MAAI,CAAC,KAAK,OAAO,QACf,QAAO;AAGT,MAAI,KAAK,yBAAyB,KAAK,OAAO,oBAC5C,QAAO;EAGT,MAAM,YAAY,KAAK,OAAO,oBAAoB;AAClD,MAAI,CAAC,aAAa,UAAU,WAAW,EACrC,QAAO;AAGT,OAAK;AAEL,SAAO,UAAU;;;;;CAMnB,eAAe,QAAiB,UAA4B;AAC1D,MAAI,CAAC,KAAK,OAAO,WAAW,CAAC,KAAK,OAAO,oBACvC,QAAO;EAIT,MAAM,eAAe,WACjB,KAAK,sBAAsB,SAAS,GACpC,KAAK,iBAAiB;AAE1B,MAAI,CAAC,aACH,QAAO;AAIT,MAAI,UAAU,OAAO,WAAW,UAAU;GACxC,MAAM,MAAM;AAEZ,OAAI,IAAI,WAAW,MAAM,QAAQ,IAAI,QAAQ,CAE3C,KAAI,UAAU,CACZ,GAAG,IAAI,SACP;IAAE,MAAM;IAAQ,MAAM,KAAK;IAAgB,CAC5C;YACQ,OAAO,IAAI,YAAY,SAEhC,KAAI,UAAU,GAAG,IAAI,QAAQ,IAAI;AAGnC,UAAO;;AAGT,SAAO;;;;;CAMT,YAAkB;AAChB,OAAK,wBAAwB;;;;;CAM/B,UAAU,QAA6C;AACrD,OAAK,SAAS;GAAE,GAAG,KAAK;GAAQ,GAAG;GAAQ;;;;;CAM7C,YAAkC;AAChC,SAAO,EAAE,GAAG,KAAK,QAAQ"}

package/dist/src/agent/sandbox/command-validator.js

@@ -122,6 +122,18 @@ const HIGH_PATTERNS = [
 		pattern: /\blaunchctl\s+(load|unload|start|stop)\b/,
 		reason: "macOS launchctl manipulation"
 	},
+	{
+		pattern: /\bgit\s+(?:-[^\s]+\s+)*(?!push\s+--force\b)(commit|push|checkout|switch|restore|reset|rebase|merge|cherry-pick|clean|apply|am|stash)\b/,
+		reason: "Git command may mutate repository state or publish changes"
+	},
+	{
+		pattern: /\bgit\s+(?:-[^\s]+\s+)*branch\s+(-[dD]|--delete|--move|-m|-M|--set-upstream-to)\b/,
+		reason: "Git branch mutation"
+	},
+	{
+		pattern: /\bgit\s+(?:-[^\s]+\s+)*tag\s+(-[adfs]|--delete|--annotate|--force|--sign)\b/,
+		reason: "Git tag mutation"
+	},
 	{
 		pattern: /\bsudo\s+/,
 		reason: "Sudo command execution"