@xopcai/xopc 0.0.110 → 0.0.111

package/dist/src/agent/tools/write.d.ts

@@ -1,7 +1,9 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
+import type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';
 export interface CreateWriteFileToolOptions {
     /** When set and the path is a bare profile filename (e.g. SOUL.md), write to this root. */
     profileMarkdownRoot?: string;
+    recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;
 }
 export declare function createWriteFileTool(workspace: string, options?: CreateWriteFileToolOptions): AgentTool;
 export declare const writeFileTool: AgentTool;

package/dist/src/agent/tools/write.js

@@ -52,6 +52,17 @@ function createWriteFileTool(workspace, options) {
 				const target = writesProfileFile ? resolveProfileMarkdownPathIfBareName(p.path, options.profileMarkdownRoot) : resolvePathUnderWorkspace(p.path, workspace);
 				await mkdir(dirname(target), { recursive: true });
 				await writeFile(target, p.content, "utf-8");
+				await options?.recordGoalEvidence?.({
+					kind: "file",
+					title: `File written: ${target}`,
+					summary: `${contentBytes} bytes written`,
+					uri: target,
+					data: {
+						path: target,
+						size: contentBytes,
+						operation: "write"
+					}
+				});
 				return {
 					content: [{
 						type: "text",

package/dist/src/agent/tools/write.js.map

@@ -1 +1 @@
-{"version":3,"file":"write.js","names":[],"sources":["../../../../src/agent/tools/write.ts"],"sourcesContent":["// Write file tool\nimport { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\nimport { writeFile, mkdir } from 'fs/promises';\nimport { dirname } from 'path';\nimport { checkFileSafety } from '../prompt/safety.js';\nimport {\n  isBareProfileMarkdownFileName,\n  resolveProfileMarkdownPathIfBareName,\n  resolvePathUnderWorkspace,\n} from './tool-paths.js';\nimport { evaluateFilePolicy } from '../sandbox/exec-policy.js';\n\nconst MAX_FILE_SIZE = 10 * 1024 * 1024;\n\nconst WriteFileSchema = Type.Object({\n  path: Type.String({ description: 'File path to write' }),\n  content: Type.String({ description: 'Content to write' }),\n});\n\ntype WriteFileParams = { path: string; content: string };\n\nexport interface CreateWriteFileToolOptions {\n  /** When set and the path is a bare profile filename (e.g. SOUL.md), write to this root. */\n  profileMarkdownRoot?: string;\n}\n\nexport function createWriteFileTool(\n  workspace: string,\n  options?: CreateWriteFileToolOptions,\n): AgentTool {\n  return {\n    name: 'write_file',\n    description:\n      'Create or overwrite a file. Relative paths are under the current agent workspace; profile Markdown (SOUL.md, etc.) is written automatically when given by filename.',\n    parameters: WriteFileSchema,\n    label: '📝 Write',\n\n    async execute(\n      _toolCallId: string,\n      params: any,\n      _signal?: AbortSignal,\n    ): Promise<AgentToolResult<{}>> {\n      try {\n        const p = params as WriteFileParams;\n        const safety = checkFileSafety('write', p.path);\n        if (!safety.allowed) {\n          return { content: [{ type: 'text', text: `🚫 ${safety.message}` }], details: {} };\n        }\n\n        const writesProfileFile = Boolean(\n          options?.profileMarkdownRoot && isBareProfileMarkdownFileName(p.path),\n        );\n        const workspaceRoot = writesProfileFile ? options!.profileMarkdownRoot! : workspace;\n\n        // Sandbox path-policy check (blocked dirs, symlink escape, config protection)\n        const pathPolicy = evaluateFilePolicy({\n          operation: 'write',\n          path: p.path,\n          workspaceRoot,\n        });\n        if (!pathPolicy.allowed) {\n          return { content: [{ type: 'text', text: `🚫 Sandbox: ${pathPolicy.reason}` }], details: {} };\n        }\n\n        const contentBytes = Buffer.byteLength(p.content, 'utf-8');\n        if (contentBytes > MAX_FILE_SIZE) {\n          return { content: [{ type: 'text', text: `🚫 File too large: ${contentBytes} bytes` }], details: {} };\n        }\n\n        const target = writesProfileFile\n          ? resolveProfileMarkdownPathIfBareName(p.path, options!.profileMarkdownRoot!)\n          : resolvePathUnderWorkspace(p.path, workspace);\n        await mkdir(dirname(target), { recursive: true });\n        await writeFile(target, p.content, 'utf-8');\n        return { content: [{ type: 'text', text: `File written: ${target}` }], details: { size: contentBytes } };\n      } catch (error) {\n        return { content: [{ type: 'text', text: `Error: ${error instanceof Error ? error.message : String(error)}` }], details: {} };\n      }\n    },\n  } as any;\n}\n\nexport const writeFileTool: AgentTool = createWriteFileTool(process.cwd());\n"],"mappings":";;;;;;;AAaA,MAAM,gBAAgB,KAAK,OAAO;AAElC,MAAM,kBAAkB,KAAK,OAAO;CAClC,MAAM,KAAK,OAAO,EAAE,aAAa,sBAAsB,CAAC;CACxD,SAAS,KAAK,OAAO,EAAE,aAAa,oBAAoB,CAAC;CAC1D,CAAC;AASF,SAAgB,oBACd,WACA,SACW;AACX,QAAO;EACL,MAAM;EACN,aACE;EACF,YAAY;EACZ,OAAO;EAEP,MAAM,QACJ,aACA,QACA,SAC8B;AAC9B,OAAI;IACF,MAAM,IAAI;IACV,MAAM,SAAS,gBAAgB,SAAS,EAAE,KAAK;AAC/C,QAAI,CAAC,OAAO,QACV,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,MAAM,OAAO;MAAW,CAAC;KAAE,SAAS,EAAE;KAAE;IAGnF,MAAM,oBAAoB,QACxB,SAAS,uBAAuB,8BAA8B,EAAE,KAAK,CACtE;IACD,MAAM,gBAAgB,oBAAoB,QAAS,sBAAuB;IAG1E,MAAM,aAAa,mBAAmB;KACpC,WAAW;KACX,MAAM,EAAE;KACR;KACD,CAAC;AACF,QAAI,CAAC,WAAW,QACd,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,eAAe,WAAW;MAAU,CAAC;KAAE,SAAS,EAAE;KAAE;IAG/F,MAAM,eAAe,OAAO,WAAW,EAAE,SAAS,QAAQ;AAC1D,QAAI,eAAe,cACjB,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,sBAAsB,aAAa;MAAS,CAAC;KAAE,SAAS,EAAE;KAAE;IAGvG,MAAM,SAAS,oBACX,qCAAqC,EAAE,MAAM,QAAS,oBAAqB,GAC3E,0BAA0B,EAAE,MAAM,UAAU;AAChD,UAAM,MAAM,QAAQ,OAAO,EAAE,EAAE,WAAW,MAAM,CAAC;AACjD,UAAM,UAAU,QAAQ,EAAE,SAAS,QAAQ;AAC3C,WAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,iBAAiB;MAAU,CAAC;KAAE,SAAS,EAAE,MAAM,cAAc;KAAE;YACjG,OAAO;AACd,WAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;MAAI,CAAC;KAAE,SAAS,EAAE;KAAE;;;EAGlI;;AAGH,MAAa,gBAA2B,oBAAoB,QAAQ,KAAK,CAAC"}
+{"version":3,"file":"write.js","names":[],"sources":["../../../../src/agent/tools/write.ts"],"sourcesContent":["// Write file tool\nimport { Type } from '@sinclair/typebox';\nimport type { AgentTool, AgentToolResult } from '@earendil-works/pi-agent-core';\nimport { writeFile, mkdir } from 'fs/promises';\nimport { dirname } from 'path';\nimport { checkFileSafety } from '../prompt/safety.js';\nimport {\n  isBareProfileMarkdownFileName,\n  resolveProfileMarkdownPathIfBareName,\n  resolvePathUnderWorkspace,\n} from './tool-paths.js';\nimport { evaluateFilePolicy } from '../sandbox/exec-policy.js';\nimport type { GoalEvidenceRecordInput } from './goal-evidence-recorder.js';\n\nconst MAX_FILE_SIZE = 10 * 1024 * 1024;\n\nconst WriteFileSchema = Type.Object({\n  path: Type.String({ description: 'File path to write' }),\n  content: Type.String({ description: 'Content to write' }),\n});\n\ntype WriteFileParams = { path: string; content: string };\n\nexport interface CreateWriteFileToolOptions {\n  /** When set and the path is a bare profile filename (e.g. SOUL.md), write to this root. */\n  profileMarkdownRoot?: string;\n  recordGoalEvidence?: (input: GoalEvidenceRecordInput) => Promise<void> | void;\n}\n\nexport function createWriteFileTool(\n  workspace: string,\n  options?: CreateWriteFileToolOptions,\n): AgentTool {\n  return {\n    name: 'write_file',\n    description:\n      'Create or overwrite a file. Relative paths are under the current agent workspace; profile Markdown (SOUL.md, etc.) is written automatically when given by filename.',\n    parameters: WriteFileSchema,\n    label: '📝 Write',\n\n    async execute(\n      _toolCallId: string,\n      params: any,\n      _signal?: AbortSignal,\n    ): Promise<AgentToolResult<{}>> {\n      try {\n        const p = params as WriteFileParams;\n        const safety = checkFileSafety('write', p.path);\n        if (!safety.allowed) {\n          return { content: [{ type: 'text', text: `🚫 ${safety.message}` }], details: {} };\n        }\n\n        const writesProfileFile = Boolean(\n          options?.profileMarkdownRoot && isBareProfileMarkdownFileName(p.path),\n        );\n        const workspaceRoot = writesProfileFile ? options!.profileMarkdownRoot! : workspace;\n\n        // Sandbox path-policy check (blocked dirs, symlink escape, config protection)\n        const pathPolicy = evaluateFilePolicy({\n          operation: 'write',\n          path: p.path,\n          workspaceRoot,\n        });\n        if (!pathPolicy.allowed) {\n          return { content: [{ type: 'text', text: `🚫 Sandbox: ${pathPolicy.reason}` }], details: {} };\n        }\n\n        const contentBytes = Buffer.byteLength(p.content, 'utf-8');\n        if (contentBytes > MAX_FILE_SIZE) {\n          return { content: [{ type: 'text', text: `🚫 File too large: ${contentBytes} bytes` }], details: {} };\n        }\n\n        const target = writesProfileFile\n          ? resolveProfileMarkdownPathIfBareName(p.path, options!.profileMarkdownRoot!)\n          : resolvePathUnderWorkspace(p.path, workspace);\n        await mkdir(dirname(target), { recursive: true });\n        await writeFile(target, p.content, 'utf-8');\n        await options?.recordGoalEvidence?.({\n          kind: 'file',\n          title: `File written: ${target}`,\n          summary: `${contentBytes} bytes written`,\n          uri: target,\n          data: { path: target, size: contentBytes, operation: 'write' },\n        });\n        return { content: [{ type: 'text', text: `File written: ${target}` }], details: { size: contentBytes } };\n      } catch (error) {\n        return { content: [{ type: 'text', text: `Error: ${error instanceof Error ? error.message : String(error)}` }], details: {} };\n      }\n    },\n  } as any;\n}\n\nexport const writeFileTool: AgentTool = createWriteFileTool(process.cwd());\n"],"mappings":";;;;;;;AAcA,MAAM,gBAAgB,KAAK,OAAO;AAElC,MAAM,kBAAkB,KAAK,OAAO;CAClC,MAAM,KAAK,OAAO,EAAE,aAAa,sBAAsB,CAAC;CACxD,SAAS,KAAK,OAAO,EAAE,aAAa,oBAAoB,CAAC;CAC1D,CAAC;AAUF,SAAgB,oBACd,WACA,SACW;AACX,QAAO;EACL,MAAM;EACN,aACE;EACF,YAAY;EACZ,OAAO;EAEP,MAAM,QACJ,aACA,QACA,SAC8B;AAC9B,OAAI;IACF,MAAM,IAAI;IACV,MAAM,SAAS,gBAAgB,SAAS,EAAE,KAAK;AAC/C,QAAI,CAAC,OAAO,QACV,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,MAAM,OAAO;MAAW,CAAC;KAAE,SAAS,EAAE;KAAE;IAGnF,MAAM,oBAAoB,QACxB,SAAS,uBAAuB,8BAA8B,EAAE,KAAK,CACtE;IACD,MAAM,gBAAgB,oBAAoB,QAAS,sBAAuB;IAG1E,MAAM,aAAa,mBAAmB;KACpC,WAAW;KACX,MAAM,EAAE;KACR;KACD,CAAC;AACF,QAAI,CAAC,WAAW,QACd,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,eAAe,WAAW;MAAU,CAAC;KAAE,SAAS,EAAE;KAAE;IAG/F,MAAM,eAAe,OAAO,WAAW,EAAE,SAAS,QAAQ;AAC1D,QAAI,eAAe,cACjB,QAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,sBAAsB,aAAa;MAAS,CAAC;KAAE,SAAS,EAAE;KAAE;IAGvG,MAAM,SAAS,oBACX,qCAAqC,EAAE,MAAM,QAAS,oBAAqB,GAC3E,0BAA0B,EAAE,MAAM,UAAU;AAChD,UAAM,MAAM,QAAQ,OAAO,EAAE,EAAE,WAAW,MAAM,CAAC;AACjD,UAAM,UAAU,QAAQ,EAAE,SAAS,QAAQ;AAC3C,UAAM,SAAS,qBAAqB;KAClC,MAAM;KACN,OAAO,iBAAiB;KACxB,SAAS,GAAG,aAAa;KACzB,KAAK;KACL,MAAM;MAAE,MAAM;MAAQ,MAAM;MAAc,WAAW;MAAS;KAC/D,CAAC;AACF,WAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,iBAAiB;MAAU,CAAC;KAAE,SAAS,EAAE,MAAM,cAAc;KAAE;YACjG,OAAO;AACd,WAAO;KAAE,SAAS,CAAC;MAAE,MAAM;MAAQ,MAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;MAAI,CAAC;KAAE,SAAS,EAAE;KAAE;;;EAGlI;;AAGH,MAAa,gBAA2B,oBAAoB,QAAQ,KAAK,CAAC"}

package/dist/src/channels/attachments/inbound-persist.d.ts

@@ -12,6 +12,13 @@ export declare function decodeInboundAttachmentBase64(data: string): Buffer;
  */
 export declare function persistInboundAttachments(attachments: InboundAttachmentInput[] | undefined, opts?: {
     maxBytes?: number;
+    resolveUri?: (uri: string, attachment: InboundAttachmentInput) => Promise<{
+        buffer: Buffer;
+        path: string;
+        mimeType: string;
+        name: string;
+        size: number;
+    } | null>;
 }): Promise<MediaRef[] | undefined>;
 /** Read attachment bytes by media URI (voice STT, tools). */
 export declare function readInboundAttachmentBuffer(uri: string): Promise<Buffer>;

package/dist/src/channels/attachments/inbound-persist.js

@@ -23,8 +23,26 @@ async function persistInboundAttachments(attachments, opts) {
 	const out = [];
 	for (const att of attachments) {
 		if (att.uri?.trim()) {
-			const resolved = await resolveMediaReference(att.uri.trim());
-			out.push(mediaRefFromUri(att, resolved.uri, resolved.path, resolved.bucket, resolved.id));
+			const uri = att.uri.trim();
+			if (uri.startsWith("media://")) {
+				const resolved = await resolveMediaReference(uri);
+				out.push(mediaRefFromUri(att, resolved.uri, resolved.path, resolved.bucket, resolved.id));
+			} else {
+				const resolved = await opts?.resolveUri?.(uri, att);
+				if (!resolved) throw new Error(`Inbound attachment "${att.name ?? "file"}" has unsupported uri`);
+				const saved = await saveMediaBuffer(resolved.buffer, {
+					contentType: resolved.mimeType,
+					bucket: "inbound",
+					maxBytes,
+					originalFilename: resolved.name
+				});
+				out.push(toMediaRef({
+					...att,
+					mimeType: resolved.mimeType,
+					name: resolved.name,
+					size: resolved.size
+				}, saved));
+			}
 			continue;
 		}
 		if (!att.data || att.data.length === 0) throw new Error(`Inbound attachment "${att.name ?? "file"}" is missing data and uri`);

package/dist/src/channels/attachments/inbound-persist.js.map

@@ -1 +1 @@
-{"version":3,"file":"inbound-persist.js","names":[],"sources":["../../../../src/channels/attachments/inbound-persist.ts"],"sourcesContent":["/**\n * Persist inbound uploads to the global media store (`{stateDir}/media/inbound/`).\n */\n\nimport { createLogger } from '../../utils/logger.js';\nimport {\n  MEDIA_MAX_BYTES,\n  parseMediaUri,\n  readMediaReference,\n  resolveMediaReference,\n  saveMediaBuffer,\n} from '../../media/index.js';\nimport type { InboundAttachmentInput, MediaRef } from '../../media/types.js';\nimport { mediaRefFromUri, toMediaRef } from './inbound-types.js';\n\nconst log = createLogger('InboundPersist');\n\nexport type { InboundAttachmentInput, MediaRef } from '../../media/types.js';\nexport { isImageInboundAttachment, isVoiceInboundAttachment } from './attachment-classifiers.js';\nexport { toMediaRef, mediaRefFromUri } from './inbound-types.js';\n\n/** Decode base64 or data-URL payload (composer wire + voice STT). */\nexport function decodeInboundAttachmentBase64(data: string): Buffer {\n  const trimmed = data.trim();\n  const b64 = trimmed.startsWith('data:') ? (trimmed.split(/base64,/)[1] ?? trimmed) : trimmed;\n  return Buffer.from(b64.replace(/\\s/g, ''), 'base64');\n}\n\n/**\n * Write attachments with binary `data` to the media store; returns metadata-only refs.\n */\nexport async function persistInboundAttachments(\n  attachments: InboundAttachmentInput[] | undefined,\n  opts?: { maxBytes?: number },\n): Promise<MediaRef[] | undefined> {\n  if (!attachments?.length) return undefined;\n\n  const maxBytes = opts?.maxBytes ?? MEDIA_MAX_BYTES;\n  const out: MediaRef[] = [];\n\n  for (const att of attachments) {\n    if (att.uri?.trim()) {\n      const resolved = await resolveMediaReference(att.uri.trim());\n      out.push(\n        mediaRefFromUri(att, resolved.uri, resolved.path, resolved.bucket, resolved.id),\n      );\n      continue;\n    }\n\n    if (!att.data || att.data.length === 0) {\n      throw new Error(`Inbound attachment \"${att.name ?? 'file'}\" is missing data and uri`);\n    }\n\n    const buf = decodeInboundAttachmentBase64(att.data);\n    const saved = await saveMediaBuffer(buf, {\n      contentType: att.mimeType,\n      bucket: 'inbound',\n      maxBytes,\n      originalFilename: att.name,\n    });\n\n    log.debug({ uri: saved.uri, bytes: saved.size, name: att.name }, 'Inbound attachment persisted');\n\n    out.push(toMediaRef(att, saved));\n  }\n\n  return out.length ? out : undefined;\n}\n\n/** Read attachment bytes by media URI (voice STT, tools). */\nexport async function readInboundAttachmentBuffer(uri: string): Promise<Buffer> {\n  const { buffer } = await readMediaReference(uri);\n  return buffer;\n}\n\nexport function assertMediaUri(uri: string): void {\n  parseMediaUri(uri);\n}\n"],"mappings":";;;;;;;;aAIqD;AAWrD,MAAM,MAAM,aAAa,iBAAiB;;AAO1C,SAAgB,8BAA8B,MAAsB;CAClE,MAAM,UAAU,KAAK,MAAM;CAC3B,MAAM,MAAM,QAAQ,WAAW,QAAQ,GAAI,QAAQ,MAAM,UAAU,CAAC,MAAM,UAAW;AACrF,QAAO,OAAO,KAAK,IAAI,QAAQ,OAAO,GAAG,EAAE,SAAS;;;;;AAMtD,eAAsB,0BACpB,aACA,MACiC;AACjC,KAAI,CAAC,aAAa,OAAQ,QAAO,KAAA;CAEjC,MAAM,WAAW,MAAM,YAAA;CACvB,MAAM,MAAkB,EAAE;AAE1B,MAAK,MAAM,OAAO,aAAa;AAC7B,MAAI,IAAI,KAAK,MAAM,EAAE;GACnB,MAAM,WAAW,MAAM,sBAAsB,IAAI,IAAI,MAAM,CAAC;AAC5D,OAAI,KACF,gBAAgB,KAAK,SAAS,KAAK,SAAS,MAAM,SAAS,QAAQ,SAAS,GAAG,CAChF;AACD;;AAGF,MAAI,CAAC,IAAI,QAAQ,IAAI,KAAK,WAAW,EACnC,OAAM,IAAI,MAAM,uBAAuB,IAAI,QAAQ,OAAO,2BAA2B;EAIvF,MAAM,QAAQ,MAAM,gBADR,8BAA8B,IAAI,KACP,EAAE;GACvC,aAAa,IAAI;GACjB,QAAQ;GACR;GACA,kBAAkB,IAAI;GACvB,CAAC;AAEF,MAAI,MAAM;GAAE,KAAK,MAAM;GAAK,OAAO,MAAM;GAAM,MAAM,IAAI;GAAM,EAAE,+BAA+B;AAEhG,MAAI,KAAK,WAAW,KAAK,MAAM,CAAC;;AAGlC,QAAO,IAAI,SAAS,MAAM,KAAA;;;AAI5B,eAAsB,4BAA4B,KAA8B;CAC9E,MAAM,EAAE,WAAW,MAAM,mBAAmB,IAAI;AAChD,QAAO;;AAGT,SAAgB,eAAe,KAAmB;AAChD,eAAc,IAAI"}
+{"version":3,"file":"inbound-persist.js","names":[],"sources":["../../../../src/channels/attachments/inbound-persist.ts"],"sourcesContent":["/**\n * Persist inbound uploads to the global media store (`{stateDir}/media/inbound/`).\n */\n\nimport { createLogger } from '../../utils/logger.js';\nimport {\n  MEDIA_MAX_BYTES,\n  parseMediaUri,\n  readMediaReference,\n  resolveMediaReference,\n  saveMediaBuffer,\n} from '../../media/index.js';\nimport type { InboundAttachmentInput, MediaRef } from '../../media/types.js';\nimport { mediaRefFromUri, toMediaRef } from './inbound-types.js';\n\nconst log = createLogger('InboundPersist');\n\nexport type { InboundAttachmentInput, MediaRef } from '../../media/types.js';\nexport { isImageInboundAttachment, isVoiceInboundAttachment } from './attachment-classifiers.js';\nexport { toMediaRef, mediaRefFromUri } from './inbound-types.js';\n\n/** Decode base64 or data-URL payload (composer wire + voice STT). */\nexport function decodeInboundAttachmentBase64(data: string): Buffer {\n  const trimmed = data.trim();\n  const b64 = trimmed.startsWith('data:') ? (trimmed.split(/base64,/)[1] ?? trimmed) : trimmed;\n  return Buffer.from(b64.replace(/\\s/g, ''), 'base64');\n}\n\n/**\n * Write attachments with binary `data` to the media store; returns metadata-only refs.\n */\nexport async function persistInboundAttachments(\n  attachments: InboundAttachmentInput[] | undefined,\n  opts?: {\n    maxBytes?: number;\n    resolveUri?: (uri: string, attachment: InboundAttachmentInput) => Promise<{\n      buffer: Buffer;\n      path: string;\n      mimeType: string;\n      name: string;\n      size: number;\n    } | null>;\n  },\n): Promise<MediaRef[] | undefined> {\n  if (!attachments?.length) return undefined;\n\n  const maxBytes = opts?.maxBytes ?? MEDIA_MAX_BYTES;\n  const out: MediaRef[] = [];\n\n  for (const att of attachments) {\n    if (att.uri?.trim()) {\n      const uri = att.uri.trim();\n      if (uri.startsWith('media://')) {\n        const resolved = await resolveMediaReference(uri);\n        out.push(\n          mediaRefFromUri(att, resolved.uri, resolved.path, resolved.bucket, resolved.id),\n        );\n      } else {\n        const resolved = await opts?.resolveUri?.(uri, att);\n        if (!resolved) {\n          throw new Error(`Inbound attachment \"${att.name ?? 'file'}\" has unsupported uri`);\n        }\n        const saved = await saveMediaBuffer(resolved.buffer, {\n          contentType: resolved.mimeType,\n          bucket: 'inbound',\n          maxBytes,\n          originalFilename: resolved.name,\n        });\n        out.push(toMediaRef({ ...att, mimeType: resolved.mimeType, name: resolved.name, size: resolved.size }, saved));\n      }\n      continue;\n    }\n\n    if (!att.data || att.data.length === 0) {\n      throw new Error(`Inbound attachment \"${att.name ?? 'file'}\" is missing data and uri`);\n    }\n\n    const buf = decodeInboundAttachmentBase64(att.data);\n    const saved = await saveMediaBuffer(buf, {\n      contentType: att.mimeType,\n      bucket: 'inbound',\n      maxBytes,\n      originalFilename: att.name,\n    });\n\n    log.debug({ uri: saved.uri, bytes: saved.size, name: att.name }, 'Inbound attachment persisted');\n\n    out.push(toMediaRef(att, saved));\n  }\n\n  return out.length ? out : undefined;\n}\n\n/** Read attachment bytes by media URI (voice STT, tools). */\nexport async function readInboundAttachmentBuffer(uri: string): Promise<Buffer> {\n  const { buffer } = await readMediaReference(uri);\n  return buffer;\n}\n\nexport function assertMediaUri(uri: string): void {\n  parseMediaUri(uri);\n}\n"],"mappings":";;;;;;;;aAIqD;AAWrD,MAAM,MAAM,aAAa,iBAAiB;;AAO1C,SAAgB,8BAA8B,MAAsB;CAClE,MAAM,UAAU,KAAK,MAAM;CAC3B,MAAM,MAAM,QAAQ,WAAW,QAAQ,GAAI,QAAQ,MAAM,UAAU,CAAC,MAAM,UAAW;AACrF,QAAO,OAAO,KAAK,IAAI,QAAQ,OAAO,GAAG,EAAE,SAAS;;;;;AAMtD,eAAsB,0BACpB,aACA,MAUiC;AACjC,KAAI,CAAC,aAAa,OAAQ,QAAO,KAAA;CAEjC,MAAM,WAAW,MAAM,YAAA;CACvB,MAAM,MAAkB,EAAE;AAE1B,MAAK,MAAM,OAAO,aAAa;AAC7B,MAAI,IAAI,KAAK,MAAM,EAAE;GACnB,MAAM,MAAM,IAAI,IAAI,MAAM;AAC1B,OAAI,IAAI,WAAW,WAAW,EAAE;IAC9B,MAAM,WAAW,MAAM,sBAAsB,IAAI;AACjD,QAAI,KACF,gBAAgB,KAAK,SAAS,KAAK,SAAS,MAAM,SAAS,QAAQ,SAAS,GAAG,CAChF;UACI;IACL,MAAM,WAAW,MAAM,MAAM,aAAa,KAAK,IAAI;AACnD,QAAI,CAAC,SACH,OAAM,IAAI,MAAM,uBAAuB,IAAI,QAAQ,OAAO,uBAAuB;IAEnF,MAAM,QAAQ,MAAM,gBAAgB,SAAS,QAAQ;KACnD,aAAa,SAAS;KACtB,QAAQ;KACR;KACA,kBAAkB,SAAS;KAC5B,CAAC;AACF,QAAI,KAAK,WAAW;KAAE,GAAG;KAAK,UAAU,SAAS;KAAU,MAAM,SAAS;KAAM,MAAM,SAAS;KAAM,EAAE,MAAM,CAAC;;AAEhH;;AAGF,MAAI,CAAC,IAAI,QAAQ,IAAI,KAAK,WAAW,EACnC,OAAM,IAAI,MAAM,uBAAuB,IAAI,QAAQ,OAAO,2BAA2B;EAIvF,MAAM,QAAQ,MAAM,gBADR,8BAA8B,IAAI,KACP,EAAE;GACvC,aAAa,IAAI;GACjB,QAAQ;GACR;GACA,kBAAkB,IAAI;GACvB,CAAC;AAEF,MAAI,MAAM;GAAE,KAAK,MAAM;GAAK,OAAO,MAAM;GAAM,MAAM,IAAI;GAAM,EAAE,+BAA+B;AAEhG,MAAI,KAAK,WAAW,KAAK,MAAM,CAAC;;AAGlC,QAAO,IAAI,SAAS,MAAM,KAAA;;;AAI5B,eAAsB,4BAA4B,KAA8B;CAC9E,MAAM,EAAE,WAAW,MAAM,mBAAmB,IAAI;AAChD,QAAO;;AAGT,SAAgB,eAAe,KAAmB;AAChD,eAAc,IAAI"}

package/dist/src/chat-commands/builtins/goal.d.ts

@@ -1,4 +1,4 @@
 /**
- * Persistent `/goal` (Hermes-style Ralph loop) on any channel with session metadata.
+ * `/goal` — first-class goal control from any command surface.
  */
 export declare function registerGoalCommand(): void;

package/dist/src/chat-commands/builtins/goal.js

@@ -1,33 +1,29 @@
+import { getDefaultAgentId, init_resolve_route } from "../../routing/resolve-route.js";
+import { GoalService } from "../../goals/goal-service.js";
+import "../../goals/index.js";
 import { commandRegistry } from "../registry.js";
-import { PERSISTENT_GOAL_CUSTOM_KEY, defaultMaxTurns, mergeCustomDataPatch, readPersistentGoal, serializePersistentGoal } from "../../agent/goals/state.js";
-import { applyPersistentGoalUserAction } from "../../agent/goals/patch-from-user-action.js";
 //#region src/chat-commands/builtins/goal.ts
-function statusLine(state) {
-	const turns = `${state.turnsUsed}/${state.maxTurns} turns`;
-	if (state.status === "active") return `⊙ Goal (active, ${turns}): ${state.goal}`;
-	if (state.status === "paused") return `⏸ Goal (paused, ${turns}${state.pausedReason ? ` — ${state.pausedReason}` : ""}): ${state.goal}`;
-	if (state.status === "done") return `✓ Goal done (${turns}): ${state.goal}`;
-	return `Goal (${state.status}, ${turns}): ${state.goal}`;
+init_resolve_route();
+const goals = new GoalService();
+function statusLine(goal) {
+	const turns = `${goal.turnsUsed}/${goal.maxTurns} turns`;
+	const progress = goal.checklist.length ? ` · ${goal.checklist.filter((it) => it.status === "completed" || it.status === "impossible").length}/${goal.checklist.length} criteria` : "";
+	if (goal.status === "active") return `⊙ Goal (active, ${turns}${progress}): ${goal.title}`;
+	if (goal.status === "paused") return `⏸ Goal (paused, ${turns}${progress}): ${goal.title}`;
+	if (goal.status === "blocked" || goal.status === "needs_input") {
+		const reason = goal.blockedReason ? ` — ${goal.blockedReason}` : "";
+		return `⏸ Goal (${goal.status}, ${turns}${progress}${reason}): ${goal.title}`;
+	}
+	if (goal.status === "done") return `✓ Goal done (${turns}${progress}): ${goal.title}`;
+	return `Goal (${goal.status}, ${turns}${progress}): ${goal.title}`;
 }
-async function patchGoalMetadata(ctx, patchCustom) {
-	const apis = ctx.persistentGoalApis;
-	if (!apis) return {
-		ok: false,
-		error: "Goals unavailable on this surface."
-	};
-	const meta = await apis.getSessionMetadata(ctx.sessionKey);
-	if (!meta) return {
-		ok: false,
-		error: "Session not found"
-	};
-	const customData = patchCustom({ ...meta.customData });
-	await apis.updateSessionMetadata(ctx.sessionKey, { customData });
-	return { ok: true };
+function activeGoal(ctx) {
+	return goals.getActiveForSession(ctx.sessionKey);
 }
 const goalCommand = {
 	id: "system.goal",
 	name: "goal",
-	description: "Set or manage a standing goal (Hermes-style): checklist + judge loop; /subgoal edits criteria; pause, resume, clear",
+	description: "Create and manage a durable goal: checklist + judge loop; /subgoal edits criteria",
 	category: "system",
 	scope: [
 		"global",
@@ -43,111 +39,73 @@ const goalCommand = {
 		"/goal clear"
 	],
 	handler: async (ctx, args) => {
-		const apis = ctx.persistentGoalApis;
-		if (!apis) return {
-			content: "Goals unavailable on this surface.",
-			success: false
-		};
 		const t = args.trim();
 		const lower = t.toLowerCase();
 		if (!t || lower === "status") {
-			const s = readPersistentGoal((await apis.getSessionMetadata(ctx.sessionKey))?.customData);
-			if (!s || s.status === "cleared") return {
-				content: "No active goal. Set one with /goal <text>.",
-				success: true
-			};
+			const goal = activeGoal(ctx);
 			return {
-				content: statusLine(s),
+				content: goal ? statusLine(goal) : "No active goal. Set one with /goal <text>.",
 				success: true
 			};
 		}
 		if (lower === "pause") {
-			const applied = applyPersistentGoalUserAction((await apis.getSessionMetadata(ctx.sessionKey))?.customData, "pause");
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
+			const goal = activeGoal(ctx);
+			if (!goal) return {
+				content: "No active goal.",
 				success: true
 			};
-			const r = await patchGoalMetadata(ctx, () => applied.customData);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
 			return {
-				content: `⏸ Goal paused: ${readPersistentGoal(applied.customData)?.goal ?? ""}`,
+				content: `⏸ Goal paused: ${goals.pause(goal.id)?.title ?? goal.title}`,
 				success: true
 			};
 		}
 		if (lower === "resume") {
-			const applied = applyPersistentGoalUserAction((await apis.getSessionMetadata(ctx.sessionKey))?.customData, "resume");
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
+			const goal = activeGoal(ctx);
+			if (!goal) return {
+				content: "No goal to resume.",
 				success: true
 			};
-			const r = await patchGoalMetadata(ctx, () => applied.customData);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
+			const next = goals.resume(goal.id);
+			ctx.persistentGoalApis?.scheduleContinuation(ctx.sessionKey, next?.nextAction || next?.title || goal.title);
 			return {
-				content: `▶ Goal resumed: ${readPersistentGoal(applied.customData)?.goal ?? ""}\nSend any message to continue, or wait — the next assistant turn will pick up from here.`,
+				content: `▶ Goal resumed: ${next?.title ?? goal.title}`,
 				success: true
 			};
 		}
-		if (lower === "clear" || lower === "stop" || lower === "done") {
-			const meta = await apis.getSessionMetadata(ctx.sessionKey);
-			const had = !!readPersistentGoal(meta?.customData);
-			const applied = applyPersistentGoalUserAction(meta?.customData, "clear");
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
+		if (lower === "clear" || lower === "stop" || lower === "archive") {
+			const goal = activeGoal(ctx);
+			if (!goal) return {
+				content: "No active goal.",
 				success: true
 			};
-			const r = await patchGoalMetadata(ctx, () => applied.customData);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
+			goals.archive(goal.id);
+			try {
+				await ctx.abortCurrentTurn?.();
+			} catch {
+				return {
+					content: "✓ Goal archived. Current turn could not be stopped automatically.",
+					success: true
+				};
+			}
 			return {
-				content: had ? "✓ Goal cleared." : "No active goal.",
+				content: "✓ Goal archived.",
 				success: true
 			};
 		}
-		if (apis.inboundConcurrentDepth(ctx.sessionKey) > 1) return {
+		if ((ctx.persistentGoalApis?.inboundConcurrentDepth(ctx.sessionKey) ?? 0) > 1) return {
 			content: "Agent is running — use /goal status / pause / clear mid-run, or wait for the current turn to finish before setting a new goal.",
 			success: false
 		};
-		const maxTurns = defaultMaxTurns(ctx.config.goals);
-		const judgeModelRef = typeof ctx.config.goals?.judgeModelRef === "string" ? ctx.config.goals.judgeModelRef.trim() : void 0;
-		const next = {
-			goal: t,
-			status: "active",
-			turnsUsed: 0,
-			maxTurns,
-			createdAt: Date.now(),
-			lastTurnAt: 0,
-			decomposed: false,
-			consecutiveParseFailures: 0,
-			...judgeModelRef ? { judgeModelRef } : {}
-		};
-		const r = await patchGoalMetadata(ctx, (base) => mergeCustomDataPatch(base, { [PERSISTENT_GOAL_CUSTOM_KEY]: serializePersistentGoal(next) }));
-		if (!r.ok) return {
-			content: "error" in r ? r.error : "Failed",
-			success: false
-		};
-		apis.scheduleContinuation(ctx.sessionKey, next.goal);
+		const goal = goals.create({
+			title: t,
+			sessionKey: ctx.sessionKey,
+			agentId: getDefaultAgentId(ctx.config),
+			config: ctx.config,
+			source: ctx.source === "cli" ? "cli" : ctx.source === "api" ? "api" : "channel"
+		});
+		ctx.persistentGoalApis?.scheduleContinuation(ctx.sessionKey, goal.title);
 		return {
-			content: `⊙ Goal set (${next.maxTurns}-turn budget): ${next.goal}\nI'll keep working until the goal is done, you pause/clear it, or the budget is exhausted.
+			content: `⊙ Goal set (${goal.maxTurns}-turn budget): ${goal.title}\nI'll keep working until the goal is done, you pause/archive it, or the budget is exhausted.
 Controls: /goal status · /goal pause · /goal resume · /goal clear · /subgoal`,
 			success: true
 		};

package/dist/src/chat-commands/builtins/goal.js.map

@@ -1 +1 @@
-{"version":3,"file":"goal.js","names":[],"sources":["../../../../src/chat-commands/builtins/goal.ts"],"sourcesContent":["/**\n * Persistent `/goal` (Hermes-style Ralph loop) on any channel with session metadata.\n */\n\nimport type { CommandContext, CommandDefinition } from '../types.js';\nimport { commandRegistry } from '../registry.js';\n\nimport {\n  defaultMaxTurns,\n  mergeCustomDataPatch,\n  readPersistentGoal,\n  serializePersistentGoal,\n  PERSISTENT_GOAL_CUSTOM_KEY,\n  type PersistentGoalState,\n} from '../../agent/goals/state.js';\nimport { applyPersistentGoalUserAction } from '../../agent/goals/patch-from-user-action.js';\n\nfunction statusLine(state: NonNullable<ReturnType<typeof readPersistentGoal>>): string {\n  const turns = `${state.turnsUsed}/${state.maxTurns} turns`;\n  if (state.status === 'active') {\n    return `⊙ Goal (active, ${turns}): ${state.goal}`;\n  }\n  if (state.status === 'paused') {\n    const extra = state.pausedReason ? ` — ${state.pausedReason}` : '';\n    return `⏸ Goal (paused, ${turns}${extra}): ${state.goal}`;\n  }\n  if (state.status === 'done') {\n    return `✓ Goal done (${turns}): ${state.goal}`;\n  }\n  return `Goal (${state.status}, ${turns}): ${state.goal}`;\n}\n\nasync function patchGoalMetadata(\n  ctx: CommandContext,\n  patchCustom: (base: Record<string, unknown>) => Record<string, unknown>,\n): Promise<{ ok: true } | { ok: false; error: string }> {\n  const apis = ctx.persistentGoalApis;\n  if (!apis) return { ok: false, error: 'Goals unavailable on this surface.' };\n  const meta = await apis.getSessionMetadata(ctx.sessionKey);\n  if (!meta) return { ok: false, error: 'Session not found' };\n  const base = { ...(meta.customData as Record<string, unknown> | undefined) };\n  const customData = patchCustom(base);\n  await apis.updateSessionMetadata(ctx.sessionKey, { customData });\n  return { ok: true };\n}\n\nconst goalCommand: CommandDefinition = {\n  id: 'system.goal',\n  name: 'goal',\n  description:\n    'Set or manage a standing goal (Hermes-style): checklist + judge loop; /subgoal edits criteria; pause, resume, clear',\n  category: 'system',\n  scope: ['global', 'private', 'group'],\n  acceptsArgs: true,\n  examples: ['/goal Ship the fix', '/goal status', '/goal pause', '/goal resume', '/goal clear'],\n  handler: async (ctx: CommandContext, args: string) => {\n    const apis = ctx.persistentGoalApis;\n    if (!apis) {\n      return {\n        content: 'Goals unavailable on this surface.',\n        success: false,\n      };\n    }\n\n    const t = args.trim();\n    const lower = t.toLowerCase();\n\n    if (!t || lower === 'status') {\n      const meta = await apis.getSessionMetadata(ctx.sessionKey);\n      const s = readPersistentGoal(meta?.customData as Record<string, unknown> | undefined);\n      if (!s || s.status === 'cleared') {\n        return {\n          content: 'No active goal. Set one with /goal <text>.',\n          success: true,\n        };\n      }\n      return { content: statusLine(s), success: true };\n    }\n\n    if (lower === 'pause') {\n      const meta = await apis.getSessionMetadata(ctx.sessionKey);\n      const applied = applyPersistentGoalUserAction(\n        meta?.customData as Record<string, unknown> | undefined,\n        'pause',\n      );\n      if (applied.kind === 'error') {\n        return { content: applied.error, success: false };\n      }\n      if (applied.kind === 'noop') {\n        return { content: applied.message, success: true };\n      }\n      const r = await patchGoalMetadata(ctx, () => applied.customData);\n      if (!r.ok) return { content: 'error' in r ? r.error : 'Failed', success: false };\n      const s = readPersistentGoal(applied.customData);\n      return { content: `⏸ Goal paused: ${s?.goal ?? ''}`, success: true };\n    }\n\n    if (lower === 'resume') {\n      const meta = await apis.getSessionMetadata(ctx.sessionKey);\n      const applied = applyPersistentGoalUserAction(\n        meta?.customData as Record<string, unknown> | undefined,\n        'resume',\n      );\n      if (applied.kind === 'error') {\n        return { content: applied.error, success: false };\n      }\n      if (applied.kind === 'noop') {\n        return { content: applied.message, success: true };\n      }\n      const r = await patchGoalMetadata(ctx, () => applied.customData);\n      if (!r.ok) return { content: 'error' in r ? r.error : 'Failed', success: false };\n      const s = readPersistentGoal(applied.customData);\n      return {\n        content:\n          `▶ Goal resumed: ${s?.goal ?? ''}\\n` +\n          'Send any message to continue, or wait — the next assistant turn will pick up from here.',\n        success: true,\n      };\n    }\n\n    if (lower === 'clear' || lower === 'stop' || lower === 'done') {\n      const meta = await apis.getSessionMetadata(ctx.sessionKey);\n      const had = !!readPersistentGoal(meta?.customData as Record<string, unknown> | undefined);\n      const applied = applyPersistentGoalUserAction(\n        meta?.customData as Record<string, unknown> | undefined,\n        'clear',\n      );\n      if (applied.kind === 'error') {\n        return { content: applied.error, success: false };\n      }\n      if (applied.kind === 'noop') {\n        return { content: applied.message, success: true };\n      }\n      const r = await patchGoalMetadata(ctx, () => applied.customData);\n      if (!r.ok) return { content: 'error' in r ? r.error : 'Failed', success: false };\n      return { content: had ? '✓ Goal cleared.' : 'No active goal.', success: true };\n    }\n\n    // New goal text — Hermes rejects when another inbound turn is in flight for this session.\n    const depth = apis.inboundConcurrentDepth(ctx.sessionKey);\n    if (depth > 1) {\n      return {\n        content:\n          'Agent is running — use /goal status / pause / clear mid-run, or wait for the current turn to finish before setting a new goal.',\n        success: false,\n      };\n    }\n\n    const maxTurns = defaultMaxTurns(ctx.config.goals);\n    const judgeModelRef =\n      typeof ctx.config.goals?.judgeModelRef === 'string' ? ctx.config.goals.judgeModelRef.trim() : undefined;\n\n    const next: PersistentGoalState = {\n      goal: t,\n      status: 'active',\n      turnsUsed: 0,\n      maxTurns,\n      createdAt: Date.now(),\n      lastTurnAt: 0,\n      decomposed: false,\n      consecutiveParseFailures: 0,\n      ...(judgeModelRef ? { judgeModelRef } : {}),\n    };\n\n    const r = await patchGoalMetadata(ctx, (base) =>\n      mergeCustomDataPatch(base, { [PERSISTENT_GOAL_CUSTOM_KEY]: serializePersistentGoal(next) }),\n    );\n    if (!r.ok) return { content: 'error' in r ? r.error : 'Failed', success: false };\n\n    apis.scheduleContinuation(ctx.sessionKey, next.goal);\n\n    return {\n      content:\n        `⊙ Goal set (${next.maxTurns}-turn budget): ${next.goal}\\n` +\n        \"I'll keep working until the goal is done, you pause/clear it, or the budget is exhausted.\\n\" +\n        'Controls: /goal status · /goal pause · /goal resume · /goal clear · /subgoal',\n      success: true,\n    };\n  },\n};\n\nexport function registerGoalCommand(): void {\n  commandRegistry.register(goalCommand);\n}\n"],"mappings":";;;;AAiBA,SAAS,WAAW,OAAmE;CACrF,MAAM,QAAQ,GAAG,MAAM,UAAU,GAAG,MAAM,SAAS;AACnD,KAAI,MAAM,WAAW,SACnB,QAAO,mBAAmB,MAAM,KAAK,MAAM;AAE7C,KAAI,MAAM,WAAW,SAEnB,QAAO,mBAAmB,QADZ,MAAM,eAAe,MAAM,MAAM,iBAAiB,GACxB,KAAK,MAAM;AAErD,KAAI,MAAM,WAAW,OACnB,QAAO,gBAAgB,MAAM,KAAK,MAAM;AAE1C,QAAO,SAAS,MAAM,OAAO,IAAI,MAAM,KAAK,MAAM;;AAGpD,eAAe,kBACb,KACA,aACsD;CACtD,MAAM,OAAO,IAAI;AACjB,KAAI,CAAC,KAAM,QAAO;EAAE,IAAI;EAAO,OAAO;EAAsC;CAC5E,MAAM,OAAO,MAAM,KAAK,mBAAmB,IAAI,WAAW;AAC1D,KAAI,CAAC,KAAM,QAAO;EAAE,IAAI;EAAO,OAAO;EAAqB;CAE3D,MAAM,aAAa,YAAY,EADhB,GAAI,KAAK,YACW,CAAC;AACpC,OAAM,KAAK,sBAAsB,IAAI,YAAY,EAAE,YAAY,CAAC;AAChE,QAAO,EAAE,IAAI,MAAM;;AAGrB,MAAM,cAAiC;CACrC,IAAI;CACJ,MAAM;CACN,aACE;CACF,UAAU;CACV,OAAO;EAAC;EAAU;EAAW;EAAQ;CACrC,aAAa;CACb,UAAU;EAAC;EAAsB;EAAgB;EAAe;EAAgB;EAAc;CAC9F,SAAS,OAAO,KAAqB,SAAiB;EACpD,MAAM,OAAO,IAAI;AACjB,MAAI,CAAC,KACH,QAAO;GACL,SAAS;GACT,SAAS;GACV;EAGH,MAAM,IAAI,KAAK,MAAM;EACrB,MAAM,QAAQ,EAAE,aAAa;AAE7B,MAAI,CAAC,KAAK,UAAU,UAAU;GAE5B,MAAM,IAAI,oBAAmB,MADV,KAAK,mBAAmB,IAAI,WAAW,GACvB,WAAkD;AACrF,OAAI,CAAC,KAAK,EAAE,WAAW,UACrB,QAAO;IACL,SAAS;IACT,SAAS;IACV;AAEH,UAAO;IAAE,SAAS,WAAW,EAAE;IAAE,SAAS;IAAM;;AAGlD,MAAI,UAAU,SAAS;GAErB,MAAM,UAAU,+BACd,MAFiB,KAAK,mBAAmB,IAAI,WAAW,GAElD,YACN,QACD;AACD,OAAI,QAAQ,SAAS,QACnB,QAAO;IAAE,SAAS,QAAQ;IAAO,SAAS;IAAO;AAEnD,OAAI,QAAQ,SAAS,OACnB,QAAO;IAAE,SAAS,QAAQ;IAAS,SAAS;IAAM;GAEpD,MAAM,IAAI,MAAM,kBAAkB,WAAW,QAAQ,WAAW;AAChE,OAAI,CAAC,EAAE,GAAI,QAAO;IAAE,SAAS,WAAW,IAAI,EAAE,QAAQ;IAAU,SAAS;IAAO;AAEhF,UAAO;IAAE,SAAS,kBADR,mBAAmB,QAAQ,WACA,EAAE,QAAQ;IAAM,SAAS;IAAM;;AAGtE,MAAI,UAAU,UAAU;GAEtB,MAAM,UAAU,+BACd,MAFiB,KAAK,mBAAmB,IAAI,WAAW,GAElD,YACN,SACD;AACD,OAAI,QAAQ,SAAS,QACnB,QAAO;IAAE,SAAS,QAAQ;IAAO,SAAS;IAAO;AAEnD,OAAI,QAAQ,SAAS,OACnB,QAAO;IAAE,SAAS,QAAQ;IAAS,SAAS;IAAM;GAEpD,MAAM,IAAI,MAAM,kBAAkB,WAAW,QAAQ,WAAW;AAChE,OAAI,CAAC,EAAE,GAAI,QAAO;IAAE,SAAS,WAAW,IAAI,EAAE,QAAQ;IAAU,SAAS;IAAO;AAEhF,UAAO;IACL,SACE,mBAHM,mBAAmB,QAAQ,WAGb,EAAE,QAAQ,GAAG;IAEnC,SAAS;IACV;;AAGH,MAAI,UAAU,WAAW,UAAU,UAAU,UAAU,QAAQ;GAC7D,MAAM,OAAO,MAAM,KAAK,mBAAmB,IAAI,WAAW;GAC1D,MAAM,MAAM,CAAC,CAAC,mBAAmB,MAAM,WAAkD;GACzF,MAAM,UAAU,8BACd,MAAM,YACN,QACD;AACD,OAAI,QAAQ,SAAS,QACnB,QAAO;IAAE,SAAS,QAAQ;IAAO,SAAS;IAAO;AAEnD,OAAI,QAAQ,SAAS,OACnB,QAAO;IAAE,SAAS,QAAQ;IAAS,SAAS;IAAM;GAEpD,MAAM,IAAI,MAAM,kBAAkB,WAAW,QAAQ,WAAW;AAChE,OAAI,CAAC,EAAE,GAAI,QAAO;IAAE,SAAS,WAAW,IAAI,EAAE,QAAQ;IAAU,SAAS;IAAO;AAChF,UAAO;IAAE,SAAS,MAAM,oBAAoB;IAAmB,SAAS;IAAM;;AAKhF,MADc,KAAK,uBAAuB,IAAI,WACrC,GAAG,EACV,QAAO;GACL,SACE;GACF,SAAS;GACV;EAGH,MAAM,WAAW,gBAAgB,IAAI,OAAO,MAAM;EAClD,MAAM,gBACJ,OAAO,IAAI,OAAO,OAAO,kBAAkB,WAAW,IAAI,OAAO,MAAM,cAAc,MAAM,GAAG,KAAA;EAEhG,MAAM,OAA4B;GAChC,MAAM;GACN,QAAQ;GACR,WAAW;GACX;GACA,WAAW,KAAK,KAAK;GACrB,YAAY;GACZ,YAAY;GACZ,0BAA0B;GAC1B,GAAI,gBAAgB,EAAE,eAAe,GAAG,EAAE;GAC3C;EAED,MAAM,IAAI,MAAM,kBAAkB,MAAM,SACtC,qBAAqB,MAAM,GAAG,6BAA6B,wBAAwB,KAAK,EAAE,CAAC,CAC5F;AACD,MAAI,CAAC,EAAE,GAAI,QAAO;GAAE,SAAS,WAAW,IAAI,EAAE,QAAQ;GAAU,SAAS;GAAO;AAEhF,OAAK,qBAAqB,IAAI,YAAY,KAAK,KAAK;AAEpD,SAAO;GACL,SACE,eAAe,KAAK,SAAS,iBAAiB,KAAK,KAAK;;GAG1D,SAAS;GACV;;CAEJ;AAED,SAAgB,sBAA4B;AAC1C,iBAAgB,SAAS,YAAY"}
+{"version":3,"file":"goal.js","names":[],"sources":["../../../../src/chat-commands/builtins/goal.ts"],"sourcesContent":["/**\n * `/goal` — first-class goal control from any command surface.\n */\n\nimport { getDefaultAgentId } from '../../routing/resolve-route.js';\nimport { GoalService, type GoalWithDetails } from '../../goals/index.js';\nimport type { CommandContext, CommandDefinition } from '../types.js';\nimport { commandRegistry } from '../registry.js';\n\nconst goals = new GoalService();\n\nfunction statusLine(goal: GoalWithDetails): string {\n  const turns = `${goal.turnsUsed}/${goal.maxTurns} turns`;\n  const progress = goal.checklist.length\n    ? ` · ${goal.checklist.filter((it) => it.status === 'completed' || it.status === 'impossible').length}/${goal.checklist.length} criteria`\n    : '';\n  if (goal.status === 'active') return `⊙ Goal (active, ${turns}${progress}): ${goal.title}`;\n  if (goal.status === 'paused') return `⏸ Goal (paused, ${turns}${progress}): ${goal.title}`;\n  if (goal.status === 'blocked' || goal.status === 'needs_input') {\n    const reason = goal.blockedReason ? ` — ${goal.blockedReason}` : '';\n    return `⏸ Goal (${goal.status}, ${turns}${progress}${reason}): ${goal.title}`;\n  }\n  if (goal.status === 'done') return `✓ Goal done (${turns}${progress}): ${goal.title}`;\n  return `Goal (${goal.status}, ${turns}${progress}): ${goal.title}`;\n}\n\nfunction activeGoal(ctx: CommandContext): GoalWithDetails | null {\n  return goals.getActiveForSession(ctx.sessionKey);\n}\n\nconst goalCommand: CommandDefinition = {\n  id: 'system.goal',\n  name: 'goal',\n  description: 'Create and manage a durable goal: checklist + judge loop; /subgoal edits criteria',\n  category: 'system',\n  scope: ['global', 'private', 'group'],\n  acceptsArgs: true,\n  examples: ['/goal Ship the fix', '/goal status', '/goal pause', '/goal resume', '/goal clear'],\n  handler: async (ctx: CommandContext, args: string) => {\n    const t = args.trim();\n    const lower = t.toLowerCase();\n\n    if (!t || lower === 'status') {\n      const goal = activeGoal(ctx);\n      return {\n        content: goal ? statusLine(goal) : 'No active goal. Set one with /goal <text>.',\n        success: true,\n      };\n    }\n\n    if (lower === 'pause') {\n      const goal = activeGoal(ctx);\n      if (!goal) return { content: 'No active goal.', success: true };\n      const next = goals.pause(goal.id);\n      return { content: `⏸ Goal paused: ${next?.title ?? goal.title}`, success: true };\n    }\n\n    if (lower === 'resume') {\n      const goal = activeGoal(ctx);\n      if (!goal) return { content: 'No goal to resume.', success: true };\n      const next = goals.resume(goal.id);\n      ctx.persistentGoalApis?.scheduleContinuation(ctx.sessionKey, next?.nextAction || next?.title || goal.title);\n      return { content: `▶ Goal resumed: ${next?.title ?? goal.title}`, success: true };\n    }\n\n    if (lower === 'clear' || lower === 'stop' || lower === 'archive') {\n      const goal = activeGoal(ctx);\n      if (!goal) return { content: 'No active goal.', success: true };\n      goals.archive(goal.id);\n      try {\n        await ctx.abortCurrentTurn?.();\n      } catch {\n        return { content: '✓ Goal archived. Current turn could not be stopped automatically.', success: true };\n      }\n      return { content: '✓ Goal archived.', success: true };\n    }\n\n    const depth = ctx.persistentGoalApis?.inboundConcurrentDepth(ctx.sessionKey) ?? 0;\n    if (depth > 1) {\n      return {\n        content:\n          'Agent is running — use /goal status / pause / clear mid-run, or wait for the current turn to finish before setting a new goal.',\n        success: false,\n      };\n    }\n\n    const goal = goals.create({\n      title: t,\n      sessionKey: ctx.sessionKey,\n      agentId: getDefaultAgentId(ctx.config),\n      config: ctx.config,\n      source: ctx.source === 'cli' ? 'cli' : ctx.source === 'api' ? 'api' : 'channel',\n    });\n\n    ctx.persistentGoalApis?.scheduleContinuation(ctx.sessionKey, goal.title);\n\n    return {\n      content:\n        `⊙ Goal set (${goal.maxTurns}-turn budget): ${goal.title}\\n` +\n        \"I'll keep working until the goal is done, you pause/archive it, or the budget is exhausted.\\n\" +\n        'Controls: /goal status · /goal pause · /goal resume · /goal clear · /subgoal',\n      success: true,\n    };\n  },\n};\n\nexport function registerGoalCommand(): void {\n  commandRegistry.register(goalCommand);\n}\n"],"mappings":"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"}

package/dist/src/chat-commands/builtins/subgoal.d.ts

@@ -1,4 +1,4 @@
 /**
- * `/subgoal` — view or edit the standing goal checklist (Hermes parity).
+ * `/subgoal` — view or edit checklist criteria for the active first-class goal.
  */
 export declare function registerSubgoalCommand(): void;

package/dist/src/chat-commands/builtins/subgoal.js

@@ -1,27 +1,28 @@
+import { GoalService } from "../../goals/goal-service.js";
+import "../../goals/index.js";
 import { commandRegistry } from "../registry.js";
-import { checklistCounts } from "../../agent/goals/checklist-types.js";
-import { readPersistentGoal, renderChecklistNumbered } from "../../agent/goals/state.js";
-import { applyChecklistUserMutation } from "../../agent/goals/checklist-user.js";
 //#region src/chat-commands/builtins/subgoal.ts
-async function patchMetadata(ctx, patchCustom) {
-	const apis = ctx.persistentGoalApis;
-	if (!apis) return {
-		ok: false,
-		error: "Goals unavailable on this surface."
-	};
-	const meta = await apis.getSessionMetadata(ctx.sessionKey);
-	if (!meta) return {
-		ok: false,
-		error: "Session not found"
-	};
-	const customData = patchCustom({ ...meta.customData });
-	await apis.updateSessionMetadata(ctx.sessionKey, { customData });
-	return { ok: true };
+/**
+* `/subgoal` — view or edit checklist criteria for the active first-class goal.
+*/
+const goals = new GoalService();
+function activeGoal(ctx) {
+	return goals.getActiveForSession(ctx.sessionKey);
+}
+function renderChecklist(goal) {
+	if (!goal.checklist.length) return "Checklist is empty. Add criteria with /subgoal add <text>.";
+	const done = goal.checklist.filter((it) => it.status === "completed" || it.status === "impossible").length;
+	const lines = goal.checklist.map((it, index) => {
+		const marker = it.status === "completed" ? "[x]" : it.status === "impossible" ? "[!]" : "[ ]";
+		const evidence = it.evidenceSummary ? ` (${it.evidenceSummary})` : "";
+		return `${index + 1}. ${marker} ${it.text}${evidence}`;
+	});
+	return `Checklist (${done}/${goal.checklist.length} terminal):\n${lines.join("\n")}`;
 }
 const subgoalCommand = {
 	id: "system.subgoal",
 	name: "subgoal",
-	description: "View or edit checklist criteria for the active /goal (add, mark, remove, reset)",
+	description: "View or edit checklist criteria for the active goal (add, mark, remove, reset)",
 	category: "system",
 	scope: [
 		"global",
@@ -37,73 +38,31 @@ const subgoalCommand = {
 		"/subgoal reset"
 	],
 	handler: async (ctx, args) => {
-		const apis = ctx.persistentGoalApis;
-		if (!apis) return {
-			content: "Goals unavailable on this surface.",
-			success: false
+		const goal = activeGoal(ctx);
+		if (!goal) return {
+			content: "No active goal. Set one with /goal <text> first.",
+			success: true
 		};
 		const t = args.trim();
 		const lower = t.toLowerCase();
-		const custom = (await apis.getSessionMetadata(ctx.sessionKey))?.customData;
-		const s = readPersistentGoal(custom);
-		if (!t || lower === "list" || lower === "status") {
-			if (!s || s.status === "cleared") return {
-				content: "No active goal. Set one with /goal <text> first.",
-				success: true
-			};
-			const items = s.checklist ?? [];
-			if (!items.length) return {
-				content: s.decomposed === true ? "Checklist is empty (decomposition produced no items). The judge will use freeform mode." : "Checklist not built yet — it appears after the first assistant turn once decomposition runs.",
-				success: true
-			};
-			const { total, completed, impossible } = checklistCounts(items);
-			return {
-				content: `Checklist (${completed + impossible}/${total} terminal):\n` + renderChecklistNumbered(items),
-				success: true
-			};
-		}
+		if (!t || lower === "list" || lower === "status") return {
+			content: renderChecklist(goal),
+			success: true
+		};
 		if (lower === "reset" || lower === "clear") {
-			const applied = applyChecklistUserMutation(custom, { type: "reset" });
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
-				success: true
-			};
-			const cd = applied.customData;
-			const r = await patchMetadata(ctx, () => cd);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
+			goals.updateChecklist(goal.id, { type: "reset" });
 			return {
-				content: "✓ Checklist cleared. Decomposition will run again on the next goal evaluation turn (or set /goal anew).",
+				content: "✓ Checklist cleared.",
 				success: true
 			};
 		}
 		const addM = t.match(/^add\s+([\s\S]+)$/i);
 		if (addM) {
 			const text = addM[1].trim();
-			const applied = applyChecklistUserMutation(custom, {
+			goals.updateChecklist(goal.id, {
 				type: "add",
 				text
 			});
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
-				success: true
-			};
-			const cd = applied.customData;
-			const r = await patchMetadata(ctx, () => cd);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
 			return {
 				content: `⊙ Added checklist item: ${text}`,
 				success: true
@@ -111,60 +70,42 @@ const subgoalCommand = {
 		}
 		const removeM = t.match(/^remove\s+(\d+)\s*$/i);
 		if (removeM) {
-			const idx = Number(removeM[1]);
-			const applied = applyChecklistUserMutation(custom, {
-				type: "remove",
-				index1Based: idx
-			});
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
-				success: true
-			};
-			const cd = applied.customData;
-			const r = await patchMetadata(ctx, () => cd);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
+			const index = Number(removeM[1]);
+			const item = goal.checklist[index - 1];
+			if (!item) return {
+				content: `No checklist item #${index}.`,
 				success: false
 			};
+			goals.updateChecklist(goal.id, {
+				type: "remove",
+				itemId: item.id
+			});
 			return {
-				content: `✓ Removed item #${idx}.`,
+				content: `✓ Removed item #${index}.`,
 				success: true
 			};
 		}
 		const markM = t.match(/^mark\s+(\d+)\s+(pending|completed|impossible)\s*$/i);
 		if (markM) {
-			const idx = Number(markM[1]);
+			const index = Number(markM[1]);
 			const status = markM[2].toLowerCase();
-			const applied = applyChecklistUserMutation(custom, {
+			const item = goal.checklist[index - 1];
+			if (!item) return {
+				content: `No checklist item #${index}.`,
+				success: false
+			};
+			goals.updateChecklist(goal.id, {
 				type: "mark",
-				index1Based: idx,
+				itemId: item.id,
 				status
 			});
-			if (applied.kind === "error") return {
-				content: applied.error,
-				success: false
-			};
-			if (applied.kind === "noop") return {
-				content: applied.message,
-				success: true
-			};
-			const cd = applied.customData;
-			const r = await patchMetadata(ctx, () => cd);
-			if (!r.ok) return {
-				content: "error" in r ? r.error : "Failed",
-				success: false
-			};
 			return {
-				content: `⊙ Item #${idx} → ${status}.`,
+				content: `⊙ Item #${index} -> ${status}.`,
 				success: true
 			};
 		}
 		return {
-			content: "Usage:\n• /subgoal — show checklist\n• /subgoal add <text>\n• /subgoal mark <n> pending|completed|impossible\n• /subgoal remove <n>\n• /subgoal reset — wipe checklist (re-decompose on next turn)",
+			content: "Usage:\n• /subgoal — show checklist\n• /subgoal add <text>\n• /subgoal mark <n> pending|completed|impossible\n• /subgoal remove <n>\n• /subgoal reset",
 			success: true
 		};
 	}