@jungjaehoon/mama-os 0.51.2 → 0.52.1

package/dist/agent/code-act/tool-catalog.js

@@ -24,17 +24,27 @@ class ProjectedToolCatalog {
         const category = optionalNormalizedString(input.category, 'tool_search category');
         const limit = searchLimit(input.limit);
         const offset = input.cursor === undefined ? 0 : this.decodeCursor(input.cursor, query, category);
-        const matches = this.definitions.filter((definition) => {
+        // Token AND, not phrase: a multi-word query ("board class vocabulary html")
+        // must find the tool whose description carries those words apart. Phrase
+        // matching silently returned nothing and cost extra model steps.
+        const tokens = query ? query.split(/\s+/).filter((token) => token.length > 0) : [];
+        const filtered = this.definitions.filter((definition) => {
             if (category && definition.category.toLowerCase() !== category) {
                 return false;
             }
-            if (!query) {
+            if (tokens.length === 0) {
                 return true;
             }
-            return `${definition.name}\n${definition.description}\n${definition.category}`
-                .toLowerCase()
-                .includes(query);
+            const haystack = `${definition.name}\n${definition.description}\n${definition.category}`.toLowerCase();
+            return tokens.every((token) => haystack.includes(token));
         });
+        // Deterministic rank: exact name match first, then catalog (name:asc) order.
+        const matches = tokens.length === 0
+            ? filtered
+            : [
+                ...filtered.filter((definition) => definition.name.toLowerCase() === query),
+                ...filtered.filter((definition) => definition.name.toLowerCase() !== query),
+            ];
         if (offset > matches.length) {
             throw new Error(CURSOR_ERROR);
         }
@@ -65,11 +75,14 @@ class ProjectedToolCatalog {
             throw new Error('tool_describe names must contain 1 to 4 distinct tool names.');
         }
         const definitions = names.map((name) => this.definitionsByName.get(name));
-        if (definitions.some((definition) => definition === undefined)) {
+        const available = definitions.filter((definition) => definition !== undefined);
+        if (available.length === 0) {
             throw new Error('Requested tool is unavailable.');
         }
+        const unavailable = names.filter((name) => !this.definitionsByName.has(name));
         return {
-            contracts: definitions.map((definition) => type_definition_generator_js_1.TypeDefinitionGenerator.generateContract(definition)),
+            contracts: available.map((definition) => type_definition_generator_js_1.TypeDefinitionGenerator.generateContract(definition)),
+            ...(unavailable.length ? { unavailable } : {}),
         };
     }
     encodeCursor(query, category, offset) {

package/dist/agent/code-act/tool-catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-catalog.js","sourceRoot":"","sources":["../../../src/agent/code-act/tool-catalog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-catalog.js","sourceRoot":"","sources":["../../../src/agent/code-act/tool-catalog.ts"],"names":[],"mappings":"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"}

package/dist/agent/codex-app-server-process.d.ts

@@ -16,6 +16,71 @@ export interface CodexAppServerProcessOptions {
     effort?: string;
     /** Stable identity/rules fingerprint; dynamic conversation context must be excluded. */
     policyFingerprint?: string;
+    /** Observability sink for Codex-native subagent threads spawned by a parent turn. */
+    onSubagentEvent?: (event: SubagentEvent) => void;
+    /**
+     * Host factory for a CHILD-SCOPED authority. A child outlives the parent turn, so it
+     * must never inherit the parent's snapshot bridge (whose envelope expires with the
+     * parent wall). Called once per announced child; the child's tool calls are queued
+     * until it resolves. `null` (or no factory at all) means the child has no authority
+     * and every call it makes is refused with `subagent authority unavailable`.
+     */
+    createSubagentBridge?: (info: SubagentBridgeRequest) => Promise<SubagentBridge | null>;
+    /**
+     * Grace after the PARENT announced a child completed before the child's missing own
+     * `turn/completed` is reported as `unknown`. Test seam; the default is 5s.
+     */
+    subagentGraceMs?: number;
+    /** Bounded life of a registered child; a child Codex killed must not leak. */
+    subagentTtlMs?: number;
+}
+/** What the host is asked for when Codex announces a child thread. */
+export interface SubagentBridgeRequest {
+    /** The PARENT's session key; a child never owns a session of its own. */
+    sessionKey: string;
+    parentThreadId: string;
+    agentThreadId: string;
+    agentPath: string;
+}
+/**
+ * One child's own authority: its tools and the release that closes its run.
+ *
+ * `release` is called exactly once per child, with the terminal status the process
+ * observed. `unknown` means the parent announced a completion the child's own
+ * `turn/completed` never confirmed - it is not success.
+ */
+export interface SubagentBridge {
+    bridge: HostToolBridge;
+    release: (outcome: {
+        status: 'completed' | 'failed' | 'interrupted' | 'unknown';
+        error?: string;
+    }) => Promise<void>;
+}
+/**
+ * One Codex-native subagent thread, observed from the parent thread.
+ *
+ * Codex announces children on the PARENT thread as `subAgentActivity` items and then
+ * drives the child on ITS OWN thread id - including after the parent turn completed.
+ * These events only report that; they never gate the child.
+ */
+export interface SubagentEvent {
+    kind: 'started' | 'completed';
+    /** The PARENT's session key; a child never owns a session of its own. */
+    sessionKey: string;
+    parentThreadId: string;
+    agentThreadId: string;
+    /** Codex agent path, e.g. "/root/board". */
+    agentPath: string;
+    /**
+     * Completion events only. `unknown` is the honest verdict when the parent announced a
+     * completion and the child's own `turn/completed` never arrived: no result, no failure
+     * either. It must never be rendered as success.
+     */
+    status?: 'completed' | 'failed' | 'interrupted' | 'unknown';
+    /** Last `final_answer` agentMessage text seen on the child thread, bounded. */
+    finalText?: string;
+    /** Redacted failure message; failed child turns only. */
+    error?: string;
 }
 export interface CodexAppServerPromptOptions {
     /**
@@ -44,6 +109,11 @@ export interface CodexAppServerPromptOptions {
      * only inside the resume branch. Omit it to keep the legacy bootstrap behaviour.
      */
     resumeInstructions?: () => Promise<string>;
+    /** Measurement only: host lane and brief state for the per-turn [prompt] log line. */
+    promptTelemetry?: {
+        kind: string;
+        brief: 'sent' | 'omitted';
+    };
 }
 export declare class CodexAppServerProcess {
     private readonly options;
@@ -56,6 +126,16 @@ export declare class CodexAppServerProcess {
     private lateTurnStarts;
     private turnStartReconciliations;
     private turns;
+    private readonly subagents;
+    /**
+     * Child threads that already reported a terminal status. The SAME `started`
+     * announcement arrives as both an item/started and an item/completed view, and the
+     * second view can land after the child's own turn/completed - `subagents.has` no longer
+     * dedupes it then, so it would mint a second authority and a second completion for a
+     * dead child. Bounded FIFO: identity of recent children, not a growing ledger.
+     */
+    private readonly finishedSubagents;
+    private readonly threadContexts;
     private sessions;
     private sessionQueues;
     private connectionQueue;
@@ -112,6 +192,38 @@ export declare class CodexAppServerProcess {
     private handleLine;
     private handleNotification;
     private resolveTurn;
+    /** Returns true when this notification belongs to the subagent surface and was consumed. */
+    private handleSubagentNotification;
+    private subagentFinalText;
+    /** A working child keeps the parent's idle timeout alive (the parent may be in wait_agent). */
+    private refreshParentTurnIdleTimeout;
+    /** Drop every thread context this session left behind on a previous thread id. */
+    private pruneThreadContexts;
+    private knownThreadIds;
+    private registerSubagent;
+    /**
+     * The parent says a child finished. That is an announcement, not a result: it can win
+     * the race against the child's own `turn/completed`, which is what carries status and
+     * final text. Wait a bounded grace for the real event, then report `unknown`.
+     */
+    private observeParentSideCompletion;
+    /**
+     * Emits exactly one completion per child thread and releases its authority with the
+     * same terminal status. Grandchildren keep their own entries.
+     */
+    private finishSubagent;
+    /** FIFO-bounded identity of finished children; the oldest id is forgotten first. */
+    private rememberFinishedSubagent;
+    private clearSubagentTimers;
+    private emitSubagentEvent;
+    /** Every live child is reported interrupted and its authority released. */
+    private terminateSubagents;
+    /** A reset/restart drops the thread's context and interrupts its children. */
+    private discardSessionThreadState;
+    private handleSubagentToolRequest;
+    private dispatchSubagentToolCall;
+    private reportSubagentToolComplete;
+    private isSubagentToolActive;
     private handleServerRequest;
     private handleDynamicToolRequest;
     private failToolProtocol;

package/dist/agent/codex-app-server-process.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-app-server-process.d.ts","sourceRoot":"","sources":["../../src/agent/codex-app-server-process.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-app-server-process.d.ts","sourceRoot":"","sources":["../../src/agent/codex-app-server-process.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAQlD,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,WAAW,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wFAAwF;IACxF,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qFAAqF;IACrF,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IACjD;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,qBAAqB,KAAK,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACvF;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,sEAAsE;AACtE,MAAM,WAAW,qBAAqB;IACpC,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,CAAC,OAAO,EAAE;QACjB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC;QAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,SAAS,GAAG,WAAW,CAAC;IAC9B,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC;IAC5D,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,2BAA2B;IAC1C;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,WAAW,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;IACjE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3C,sFAAsF;IACtF,eAAe,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CAC/D;AAkZD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAsBtB;IACF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,KAAK,CAA6C;IAC1D,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,MAAM,CAAgC;IAC9C,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,wBAAwB,CAA8C;IAC9E,OAAO,CAAC,KAAK,CAAkC;IAC/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoC;IACnE,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAM;IACxB,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,0BAA0B,CAAS;IAC3C,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,sBAAsB,CAAqB;IACnD,OAAO,CAAC,uBAAuB,CAAqB;IACpD,OAAO,CAAC,kCAAkC,CAAS;IACnD,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,EAAE,4BAA4B;IAe3C,MAAM,CACV,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,eAAe,EAC3B,SAAS,GAAE,2BAAgC,GAC1C,OAAO,CAAC,YAAY,CAAC;IA0FlB,KAAK,CAAC,UAAU,SAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhE,sBAAsB,CAAC,SAAS,GAAE,2BAAgC,GAAG,mBAAmB;IAUlF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrB,uBAAuB,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAuChE,WAAW,CAAC,UAAU,SAA0B,GAAG,MAAM,GAAG,SAAS;IAIrE,SAAS,IAAI;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,aAAa,EAAE,OAAO,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,mBAAmB,EAAE,OAAO,CAAC;KAC9B;IAYD,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,cAAc;YAgBR,iBAAiB;IA+B/B,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,mBAAmB;YAwDb,aAAa;YAiBb,KAAK;YA2CL,UAAU;IA2ExB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,2BAA2B;IAkCnC,OAAO,CAAC,sBAAsB;IA4C9B,OAAO,CAAC,SAAS;YAwFH,OAAO;IAyBrB,OAAO,CAAC,WAAW;IAoCnB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAoFlB,OAAO,CAAC,kBAAkB;IAmL1B,OAAO,CAAC,WAAW;IA0BnB,4FAA4F;IAC5F,OAAO,CAAC,0BAA0B;IA6DlC,OAAO,CAAC,iBAAiB;IAczB,+FAA+F;IAC/F,OAAO,CAAC,4BAA4B;IAOpC,kFAAkF;IAClF,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,gBAAgB;IA4FxB;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;IAyBnC;;;OAGG;IACH,OAAO,CAAC,cAAc;IA0CtB,oFAAoF;IACpF,OAAO,CAAC,wBAAwB;IAWhC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,iBAAiB;IAczB,2EAA2E;IAC3E,OAAO,CAAC,kBAAkB;IAY1B,8EAA8E;IAC9E,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,yBAAyB;IAkDjC,OAAO,CAAC,wBAAwB;IAsHhC,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,mBAAmB;IAkC3B,OAAO,CAAC,wBAAwB;IAiDhC,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,uBAAuB;IA+G/B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,MAAM;IAQd,OAAO,CAAC,OAAO;IASf,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,QAAQ;IAsBhB,+FAA+F;IAC/F,OAAO,CAAC,iBAAiB;IA6BzB,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,kCAAkC;IAiB1C,OAAO,CAAC,+BAA+B;YAezB,yBAAyB;IAkBvC,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,OAAO;IAgBf,OAAO,CAAC,WAAW;YASL,OAAO;YAKP,QAAQ;YAeR,eAAe;IAyC7B,OAAO,CAAC,MAAM;CAuBf"}