@0xmaxma/claude-gateway 1.6.9 → 1.7.1

package/dist/agent/runner.d.ts

@@ -3,6 +3,7 @@ import { AgentConfig, GatewayConfig, Logger, ModelConfig, StreamEvent, ApiAttach
 import { type SkillRegistry } from '../skills';
 import { type CliChannel } from '../cli-viewer/pairing-store';
 import { HistoryDB } from '../history/db';
+import type { SkillLearningManager } from './skill-learning';
 export declare const MAX_IMAGE_SIZE_BYTES: number;
 export declare const DEFAULT_MODELS: ModelConfig[];
 export declare const CHANNEL_COALESCE_WINDOW_MS = 1200;
@@ -57,6 +58,7 @@ export declare class AgentRunner extends EventEmitter {
     private readonly sessionHistory;
     private readonly apiChatIds;
     private skillRegistry;
+    private skillLearning?;
     private readonly configPath;
     private readonly historyDb;
     private readonly agentsBaseDir;
@@ -68,6 +70,9 @@ export declare class AgentRunner extends EventEmitter {
      */
     setSkillRegistry(registry: SkillRegistry): void;
     getSkillRegistry(): SkillRegistry;
+    /** Wire the skill-learning manager (planning-62). Optional; unset = feature off. */
+    setSkillLearning(manager: SkillLearningManager | undefined): void;
+    getSkillLearning(): SkillLearningManager | undefined;
     get workspacePath(): string;
     /**
      * Bind a local HTTP server that receives POST /channel from TelegramReceiver.
@@ -183,6 +188,16 @@ export declare class AgentRunner extends EventEmitter {
      */
     static remapImageParamsRefs(p: ImageParams | undefined, stagedPaths: readonly string[] | undefined, promotedPaths: readonly string[] | undefined): ImageParams | undefined;
     private static buildChannelXml;
+    /**
+     * Await a SessionProcess's in-flight crash-triggered auto-restart
+     * (scheduleRestart's setTimeout → spawnProcess) instead of handing back a
+     * process whose sendMessage() will silently no-op. Resolves once the new
+     * child is attached ('restarted'); rejects on a definitive restart failure
+     * ('restartFailed', or 'failed' once MAX_RESTARTS is exhausted) or, as a
+     * last resort, on SESSION_RESTART_WAIT_TIMEOUT_MS so a caller is never left
+     * hanging past that bound.
+     */
+    private waitForSessionRestart;
     private getOrSpawnSession;
     private spawnSession;
     static isApiBuiltinCommand(content: string): boolean;
@@ -289,10 +304,28 @@ export declare class AgentRunner extends EventEmitter {
      *   restarted so the change reaches them on their next spawn. The recomposed
      *   CLAUDE.md is already on disk, so a skipped busy session picks up the
      *   change on its own next natural spawn.
+     * @param opts.deferIdle When true, idle sessions are NOT `stop()`ed now.
+     *   Instead they are added to the runner-level `pendingRestarts` set, so each
+     *   respawns cleanly on its next message (the same lossless mechanism used for
+     *   the image-size-threshold restart) rather than being SIGKILLed mid-idle and
+     *   losing its in-context state. Since CLAUDE.md is frozen-at-spawn, an idle
+     *   bystander gains nothing from an immediate stop — the recomposed file
+     *   applies on its next spawn either way. Use for agent-writable/identity and
+     *   skills changes, where dropping an unrelated idle session is pure downside.
+     *   NB: idle sessions are deferred via `pendingRestarts`, NOT
+     *   `proc.markPendingRestart()` — the latter emits `deferredRestartReady`
+     *   synchronously on an idle process, which stops it immediately (no deferral).
+     * @returns Counts of sessions handled: `immediate` (stopped now), `deferred`
+     *   (armed to restart on next turn/message), `skipped` (left untouched).
      */
     restartOrDefer(opts?: {
         skipBusy?: boolean;
-    }): Promise<void>;
+        deferIdle?: boolean;
+    }): Promise<{
+        immediate: number;
+        deferred: number;
+        skipped: number;
+    }>;
     /**
      * Format a timestamp as a human-readable age string (e.g. "5m ago", "2h ago").
      */

package/dist/agent/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAW,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAS7H,OAAO,EAA0C,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAOvF,OAAO,EAAiC,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAG7F,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAqB1C,eAAO,MAAM,oBAAoB,QAAmB,CAAC;AAErD,eAAO,MAAM,cAAc,EAAE,WAAW,EAYvC,CAAC;AA0BF,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAkD/C;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAuB,GAC7C,MAAM,EAAE,CAIV;AAED,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;IAC9D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,SAAS,CAAoC;IAErD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IACjC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAEvC,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsD;IACvF,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,eAAe,CAAgC;IAEvD,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,gBAAgB,CAA+C;IAGvE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8C;IAMhF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAKhE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAOvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAQtB;IAIH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkC;IAKlE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4E;IAGrG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IAOjE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAO5B;IAIJ,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAU1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAMtB;IAMJ,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;IAGvD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA+B;IAGrE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoH;IAKnJ,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IAGxD,OAAO,CAAC,aAAa,CAAwC;IAG7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAGpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAGtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAGlC,OAAO,CAAC,aAAa,CAA6B;gBAEtC,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM;IAwBnF;;OAEG;IACH,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI/C,gBAAgB,IAAI,aAAa;IAIjC,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED;;;OAGG;YACW,mBAAmB;IAsHjC;;;;;;OAMG;YACW,oBAAoB;IA2ElC;;;;;;;OAOG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAU5D;;;;;;;;OAQG;IACH,OAAO,CAAC,oBAAoB;IAgC5B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAO5B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB,CA8BzB;IAEF;;;;;OAKG;IACH,gBAAgB,CACd,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,GACb;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAO1D,mFAAmF;IACnF,iBAAiB,CACf,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,IAAI,UAAQ,GACX,IAAI,GAAG,UAAU,GAAG,MAAM;IAM7B;;;OAGG;YACW,oBAAoB;IA4NlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B,OAAO,CAAC,iBAAiB;IAYzB;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAsBxB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAYrB;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAkIlB;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA2CnC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAKjC;;;;;;;;;OASG;IACH,MAAM,CAAC,oBAAoB,CACzB,CAAC,EAAE,WAAW,GAAG,SAAS,EAC1B,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAC1C,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAC3C,WAAW,GAAG,SAAS;IAiB1B,OAAO,CAAC,MAAM,CAAC,eAAe;YA0ChB,iBAAiB;YAgDjB,YAAY;IAugB1B,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIpD;;OAEG;YACW,oBAAoB;IAsBlC;;OAEG;YACW,qBAAqB;IAiBnC;;OAEG;YACW,wBAAwB;IA+CtC;;OAEG;YACW,gBAAgB;IAM9B;;OAEG;YACW,mBAAmB;IAUjC;;;;;;;;;OASG;YACW,iBAAiB;IAqB/B;;;OAGG;YACW,kBAAkB;IA8BhC;;OAEG;YACW,oBAAoB;IA4ClC;;;OAGG;YACW,aAAa;IAS3B;;;OAGG;YACW,cAAc;IAS5B;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAIrB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,qBAAqB;IAgD7B;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,cAAc,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BlE;;OAEG;IACH,OAAO,CAAC,SAAS;IAWjB;;;;OAIG;IACD,OAAO,CAAC,YAAY;IAMtB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,eAAe;YAST,wBAAwB;IA2BtC,OAAO,CAAC,gBAAgB;IAexB;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,gBAAgB;IAalB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA4B5B,iBAAiB,CAAC,SAAS,EAAE,WAAW,GAAG,IAAI;IAQ/C,cAAc,IAAI,IAAI;IAetB,aAAa,IAAI,IAAI;IAOrB,cAAc,IAAI,WAAW;IAI7B;;mDAE+C;IAC/C,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAIzC,qBAAqB,IAAI,IAAI;IAY7B,oBAAoB,IAAI,IAAI;IAO5B,oBAAoB,IAAI,IAAI;IAY5B,mBAAmB,IAAI,IAAI;IAOrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5F,OAAO,CAAC,sBAAsB;IAqBxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,SAAS,IAAI,OAAO;IAIpB,kBAAkB,IAAI,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA4BzL;;;;;;;OAOG;IACG,cAAc,CAClB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,WAAW,CAAA;KAAE,GAC7I,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;IAiO1D;;;;;OAKG;IACG,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE;QACT,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;QACtC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,IAAI,CAAC;QACjE,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;KAC/B,EACD,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,WAAW,CAAA;KAAE,GAC7I,OAAO,CAAC,MAAM,IAAI,CAAC;IAiRtB;;OAEG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI/C;;;;OAIG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAK/D;;;OAGG;IACH;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IAmB5B,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,EAAE;IAcrD,OAAO,CAAC,sBAAsB;IAc9B,gBAAgB,IAAI,MAAM;IAI1B,WAAW,IAAI,MAAM;IAIrB,YAAY,IAAI,SAAS;IAIzB,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,WAAW,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAIhG,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,UAAU,EAAE,YAAY,CAAC;IAIvH,iBAAiB,CACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAC/B,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAsK/D,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,UAAU,EAAE,YAAY,CAAC;IAIzE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC;IAc/G,OAAO,CAAC,+BAA+B;IAsBjC,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAmB7F,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAW5I,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;OAIG;IACG,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,EACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,SAAS,EAAE;QACT,OAAO,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;QACtC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QACnC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;KAC/B,EACD,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GAC1B,OAAO,CAAC,MAAM,IAAI,CAAC;IAiItB,OAAO,CAAC,iBAAiB;IA2CzB;;;OAGG;IACH,eAAe,IAAI,MAAM;IAIzB;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAoBnC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}

package/dist/agent/runner.js

@@ -61,6 +61,7 @@ const screen_1 = require("../shell/screen");
 const db_1 = require("../history/db");
 const media_store_1 = require("../history/media-store");
 const cleanup_1 = require("../history/cleanup");
+const knowledge_1 = require("./knowledge");
 const DEFAULT_IDLE_TIMEOUT_MINUTES = 30;
 const DEFAULT_MAX_CONCURRENT = 20;
 const ANTHROPIC_SOCKET_ERROR = 'socket connection was closed unexpectedly';
@@ -99,6 +100,11 @@ const MAX_API_IMAGES = 5;
  *  CLI turn is still producing a result that must reach history, exactly like
  *  the client-disconnect path. This cap bounds a genuinely hung turn. */
 const API_TIMEOUT_HARD_CAP_EXTRA_MS = 600000;
+// Bound on getOrSpawnSession's wait for a crash-triggered auto-restart to land
+// (session/process.ts's AUTO_RESTART_DELAY_MS is 5s, plus real CLI spawn time
+// observed up to a few seconds more) — generous, but must not be the long
+// API_TIMEOUT_HARD_CAP_EXTRA_MS chain: this is a pre-turn gap, not a turn.
+const SESSION_RESTART_WAIT_TIMEOUT_MS = 20000;
 // Hard timeout for the one-shot local `claude -p` triage during recovery
 // (Epic #195, Phase 3b). A slow/hung triage collapses to a safe notify-only.
 const RECOVERY_TRIAGE_TIMEOUT_MS = 15000;
@@ -327,6 +333,13 @@ class AgentRunner extends events_1.EventEmitter {
     getSkillRegistry() {
         return this.skillRegistry;
     }
+    /** Wire the skill-learning manager (planning-62). Optional; unset = feature off. */
+    setSkillLearning(manager) {
+        this.skillLearning = manager;
+    }
+    getSkillLearning() {
+        return this.skillLearning;
+    }
     get workspacePath() {
         return this.agentConfig.workspace;
     }
@@ -481,6 +494,8 @@ class AgentRunner extends events_1.EventEmitter {
             failureClass: body.failureClass ?? null,
             turnKey: body.turnKey ?? chatId,
         };
+        // Skill-learning: an incident-driven recovery attempt on this chat's turn.
+        this.skillLearning?.onRecoveryFired(chatId);
         try {
             const result = await (0, recovery_executor_1.runRecovery)(req, {
                 autoRecover,
@@ -952,15 +967,25 @@ class AgentRunner extends events_1.EventEmitter {
                     ts: userTs,
                 });
             }
-            // Restart session before this turn if accumulated image size exceeded threshold
+            // Consume a deferred restart before this turn (armed by the image-size
+            // threshold, or by a workspace/skills change that deferred this idle
+            // session). Guard on isProcessing: this same chatId key can be driven by
+            // a web-UI live-view turn (sendMessageToSession) that does NOT hold
+            // turnActive, so the session may be mid-stream here. Stopping it would
+            // truncate that live turn — instead leave the flag armed and consume it
+            // on the next idle turn. In the normal channel flow the session is idle
+            // at this point (turnActive serialises channel turns), so the guard is a
+            // no-op and the restart proceeds as before.
             if (this.pendingRestarts.has(chatId)) {
                 const existingSession = this.sessions.get(chatId);
-                if (existingSession) {
-                    await existingSession.stop();
-                    this.sessions.delete(chatId);
+                if (!existingSession?.isProcessing) {
+                    if (existingSession) {
+                        await existingSession.stop();
+                        this.sessions.delete(chatId);
+                    }
+                    this.pendingRestarts.delete(chatId);
+                    this.imageSizePerChat.delete(chatId);
                 }
-                this.pendingRestarts.delete(chatId);
-                this.imageSizePerChat.delete(chatId);
             }
             // Route to session process (map key = chatId, actual sessionId passed separately)
             // Channel sessions use agent-level model (not per-session)
@@ -968,11 +993,13 @@ class AgentRunner extends events_1.EventEmitter {
             // Merge buffered messages into one turn: concat channel XML blocks, append
             // any skill context, and accumulate image paths for size tracking.
             const blocks = [];
+            const invokedSkills = [];
             for (const entry of entries) {
                 let channelXml = AgentRunner.buildChannelXml(entry);
                 const skillInvocation = (0, skills_1.detectSkillCommand)(entry.content ?? '', this.skillRegistry);
                 if (skillInvocation) {
                     channelXml += (0, skills_1.formatSkillContext)(skillInvocation);
+                    invokedSkills.push(skillInvocation.skillKey);
                     this.logger.info('Skill invoked', {
                         skill: skillInvocation.skillKey,
                         args: skillInvocation.args,
@@ -998,6 +1025,8 @@ class AgentRunner extends events_1.EventEmitter {
             }
             session.setProcessing(true);
             const turnText = blocks.join('\n');
+            // Skill-learning: mark the start of a user turn (cheap, best-effort).
+            this.skillLearning?.onTurnStart(chatId, sessionId, entries[0]?.content ?? '', invokedSkills);
             session.sendMessage(turnText);
             // Remember this turn for the C1 guarded resend (Phase 3b): reset the
             // delivered/resent flags so a resend can only fire if this turn stalls
@@ -1138,6 +1167,37 @@ class AgentRunner extends events_1.EventEmitter {
             `message_id="${meta['message_id'] ?? ''}" user="${AgentRunner.escapeXmlAttr(meta['user'] ?? '')}" ` +
             `ts="${meta['ts'] ?? new Date().toISOString()}"${optionalAttrs}>${repliedBlock}${params.content ?? ''}</channel>`);
     }
+    /**
+     * Await a SessionProcess's in-flight crash-triggered auto-restart
+     * (scheduleRestart's setTimeout → spawnProcess) instead of handing back a
+     * process whose sendMessage() will silently no-op. Resolves once the new
+     * child is attached ('restarted'); rejects on a definitive restart failure
+     * ('restartFailed', or 'failed' once MAX_RESTARTS is exhausted) or, as a
+     * last resort, on SESSION_RESTART_WAIT_TIMEOUT_MS so a caller is never left
+     * hanging past that bound.
+     */
+    waitForSessionRestart(proc) {
+        if (proc.isRunning())
+            return Promise.resolve();
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(() => {
+                cleanup();
+                reject(new Error('Session restart did not complete in time'));
+            }, SESSION_RESTART_WAIT_TIMEOUT_MS);
+            const onRestarted = () => { cleanup(); resolve(); };
+            const onRestartFailed = (err) => { cleanup(); reject(err); };
+            const onFailed = () => { cleanup(); reject(new Error('Session failed permanently (max restarts exceeded)')); };
+            const cleanup = () => {
+                clearTimeout(timer);
+                proc.off('restarted', onRestarted);
+                proc.off('restartFailed', onRestartFailed);
+                proc.off('failed', onFailed);
+            };
+            proc.once('restarted', onRestarted);
+            proc.once('restartFailed', onRestartFailed);
+            proc.once('failed', onFailed);
+        });
+    }
     async getOrSpawnSession(mapKey, // Map lookup key (chatId for telegram/discord, sessionId for API)
     source, sessionId, // actual session UUID (only for channel sessions; equals mapKey for API)
     modelOverride) {
@@ -1153,6 +1213,19 @@ class AgentRunner extends events_1.EventEmitter {
             return pending;
         const existing = this.sessions.get(mapKey);
         if (existing) {
+            // The mapped SessionProcess can be mid auto-restart (its child crashed —
+            // see the 'exit'/scheduleRestart cycle in session/process.ts — and the
+            // AUTO_RESTART_DELAY_MS timer hasn't fired the replacement child yet).
+            // existing.sendMessage() silently no-ops while .process is null (only a
+            // warning log, no error, no event), which previously left the caller's
+            // pendingApiSessions entry stuck until the long timeout chain (the same
+            // failure mode this whole area was already patched for — see the
+            // session.on('exit', onExit) fix in sendApiMessage/sendApiMessageStream —
+            // but THIS gap is hit before a turn even starts, so that fix can't see
+            // it). Wait for the pending respawn to actually land before handing the
+            // session back.
+            if (!existing.isRunning())
+                await this.waitForSessionRestart(existing);
             // Restart if model changed (including switching back to the agent default)
             if (existing.modelOverride !== effectiveOverride) {
                 this.logger.info('Model changed, restarting session', { mapKey, oldModel: existing.modelOverride, newModel: effectiveOverride ?? agentDefaultModel });
@@ -1204,6 +1277,9 @@ class AgentRunner extends events_1.EventEmitter {
         // Apply per-session model override (caller already normalized to undefined when == agent default)
         if (modelOverride)
             proc.modelOverride = modelOverride;
+        // Keep the searchable memory archive (planning-64) fresh for the memory_search
+        // tool. Fire-and-forget, detached, OFF the event loop — never blocks the spawn.
+        (0, knowledge_1.spawnArchiveReindex)(this.agentConfig.workspace, this.agentConfig.knowledge, this.gatewayConfig.gateway.knowledge);
         // Per-agent → global → MAX_HISTORY_MESSAGES: the configured cap on how many
         // history messages a healthy spawn re-injects. Lets an operator lower the
         // context loaded at session start (e.g. 50 → 30) without touching code.
@@ -1293,6 +1369,12 @@ class AgentRunner extends events_1.EventEmitter {
                         const msg = obj['message'];
                         if (Array.isArray(msg?.content)) {
                             for (const block of msg.content) {
+                                // Skill-learning: count every tool_use this turn (deduped by block
+                                // id inside the manager, since cumulative assistant snapshots re-emit
+                                // completed blocks). Cheap, best-effort.
+                                if (block.type === 'tool_use') {
+                                    this.skillLearning?.onToolUse(mapKey, block['id']);
+                                }
                                 // LINE sends images through its own line_image tool (not the reply
                                 // tool's `files`), so capture those sends into history too — the
                                 // web transcript and the session image catalog key off mediaFiles.
@@ -1426,6 +1508,13 @@ class AgentRunner extends events_1.EventEmitter {
                     }
                     if (obj['type'] === 'result') {
                         proc.setProcessing(false);
+                        // Skill-learning: on the headless backend `result` is the true
+                        // end-of-user-turn (exactly one per message) — persist the turn metric
+                        // here. pty-shell fires `result` per sub-turn, so its capture is driven
+                        // by `session_idle` (below) to avoid over-counting.
+                        if (proc.backend !== 'pty-shell') {
+                            this.skillLearning?.onTurnEnd(mapKey, actualSessionId);
+                        }
                         // Gateway turn queue: on the headless backend `result` is the true end
                         // of the user's turn (exactly one per message), so flush the next
                         // queued turn here. On pty-shell `result` fires per sub-turn (across
@@ -1579,6 +1668,8 @@ class AgentRunner extends events_1.EventEmitter {
                         if (!proc.hasPendingRestart()) {
                             this.flushNextTurn(mapKey);
                         }
+                        // Skill-learning: pty-shell session_idle is the true end-of-user-turn.
+                        this.skillLearning?.onTurnEnd(mapKey, actualSessionId);
                         typingDoneTimer = setTimeout(() => {
                             this.writeTypingDone(mapKey);
                             typingDoneTimer = null;
@@ -1591,6 +1682,7 @@ class AgentRunner extends events_1.EventEmitter {
             // Use actualSessionId (captured at spawn time) — NOT getActiveSessionId() —
             // so tokens are attributed to the session that owns this process.
             proc.on('tokenUsage', async ({ inputTokens, totalTokens }) => {
+                this.skillLearning?.onTokenUsage(mapKey, inputTokens, totalTokens);
                 try {
                     const ch = this.channelFor(mapKey);
                     const index = await this.sessionStore.listSessions(this.agentConfig.id, mapKey, ch);
@@ -1958,6 +2050,8 @@ class AgentRunner extends events_1.EventEmitter {
      */
     handleRequestTooLarge(mapKey, proc) {
         proc.setProcessing(false);
+        // Skill-learning: a recovery event this turn (feeds the trigger + recovery-rate measure).
+        this.skillLearning?.onRecoveryFired(mapKey);
         // Recovery steps through the ladder rungs strictly below the configured cap;
         // the number of those rungs is how many shrink attempts exist before even the
         // smallest (0-history) spawn has been tried and still trips 32MB.
@@ -2012,9 +2106,23 @@ class AgentRunner extends events_1.EventEmitter {
      *   restarted so the change reaches them on their next spawn. The recomposed
      *   CLAUDE.md is already on disk, so a skipped busy session picks up the
      *   change on its own next natural spawn.
+     * @param opts.deferIdle When true, idle sessions are NOT `stop()`ed now.
+     *   Instead they are added to the runner-level `pendingRestarts` set, so each
+     *   respawns cleanly on its next message (the same lossless mechanism used for
+     *   the image-size-threshold restart) rather than being SIGKILLed mid-idle and
+     *   losing its in-context state. Since CLAUDE.md is frozen-at-spawn, an idle
+     *   bystander gains nothing from an immediate stop — the recomposed file
+     *   applies on its next spawn either way. Use for agent-writable/identity and
+     *   skills changes, where dropping an unrelated idle session is pure downside.
+     *   NB: idle sessions are deferred via `pendingRestarts`, NOT
+     *   `proc.markPendingRestart()` — the latter emits `deferredRestartReady`
+     *   synchronously on an idle process, which stops it immediately (no deferral).
+     * @returns Counts of sessions handled: `immediate` (stopped now), `deferred`
+     *   (armed to restart on next turn/message), `skipped` (left untouched).
      */
     async restartOrDefer(opts) {
         const skipBusy = opts?.skipBusy ?? false;
+        const deferIdle = opts?.deferIdle ?? false;
         let immediate = 0;
         let deferred = 0;
         let skipped = 0;
@@ -2028,6 +2136,22 @@ class AgentRunner extends events_1.EventEmitter {
                 proc.markPendingRestart();
                 deferred++;
             }
+            else if (deferIdle && proc.source !== 'api') {
+                // Lossless deferral for CHANNEL sessions only: leave the idle process
+                // running and arm a restart on its next message (mirrors the
+                // image-size-threshold path). Do NOT call proc.markPendingRestart() here
+                // — on an idle process it fires deferredRestartReady immediately and
+                // stops the session.
+                //
+                // Guard on source: `pendingRestarts` is consumed ONLY in injectTurn (the
+                // channel turn path, keyed by chatId). api / __heartbeat__ sessions are
+                // keyed by sessionId and never flow through injectTurn, so an entry armed
+                // for them would never be consumed — it would leak in the Set and the
+                // change would never reach the session. Fall through to an immediate stop
+                // so those respawn fresh on their next use, exactly as before deferIdle.
+                this.pendingRestarts.add(id);
+                deferred++;
+            }
             else {
                 toStopNow.push(id);
             }
@@ -2041,6 +2165,7 @@ class AgentRunner extends events_1.EventEmitter {
             immediate++;
         }
         this.logger.info('restartOrDefer: sessions restarted', { immediate, deferred, skipped });
+        return { immediate, deferred, skipped };
     }
     /**
      * Format a timestamp as a human-readable age string (e.g. "5m ago", "2h ago").
@@ -2439,17 +2564,31 @@ class AgentRunner extends events_1.EventEmitter {
             let quietTimer;
             // Track partial message text for delta computation (--include-partial-messages)
             let lastPartialText = '';
-            const done = (result) => {
+            // Guards done/fail against a double-fire — e.g. onExit racing a 'result'
+            // line that already settled this turn (see onExit below).
+            let settled = false;
+            const done = (result, interrupted = false) => {
+                if (settled)
+                    return;
+                settled = true;
                 cleanup();
                 const attachments = this.popApiAttachments(sessionId);
+                const trimmed = result.trim();
+                // A /stop that lands before any text or attachment came out of this turn
+                // would otherwise persist nothing at all — the last committed message
+                // stays the user's forever, and the web sidebar's "typing…" indicator
+                // never clears (it only clears once the last message is from the
+                // assistant). Same wording buildInitialPrompt uses to patch this same
+                // dangling-turn shape for the next spawn's in-memory context.
+                const finalText = !trimmed && !attachments.length && interrupted ? process_1.INTERRUPTED_NO_REPLY_TEXT : trimmed;
                 // Persist assistant reply. Image-only replies (empty text but attachments
                 // present) must also persist — otherwise the screenshot vanishes from history.
-                if (result.trim() || attachments.length) {
+                if (finalText || attachments.length) {
                     const apiAssistantTs = Date.now();
                     this.sessionStore
                         .appendMessage(this.agentConfig.id, sessionId, {
                         role: 'assistant',
-                        content: result.trim(),
+                        content: finalText,
                         ts: apiAssistantTs,
                     })
                         .catch(() => { });
@@ -2458,14 +2597,17 @@ class AgentRunner extends events_1.EventEmitter {
                         sessionId,
                         source: 'api',
                         role: 'assistant',
-                        content: result.trim(),
+                        content: finalText,
                         mediaFiles: attachments.length ? attachments.map((a) => `media/${a.relPath}`) : undefined,
                         ts: apiAssistantTs,
                     });
                 }
-                resolve({ text: result.trim(), attachments });
+                resolve({ text: finalText, attachments });
             };
             const fail = (err) => {
+                if (settled)
+                    return;
+                settled = true;
                 // Terminal close for a turn that produced no result (#75): record it so
                 // history does not end on a dangling user message, and drain the
                 // attachment buffer so nothing leaks into the next turn.
@@ -2473,6 +2615,26 @@ class AgentRunner extends events_1.EventEmitter {
                 cleanup();
                 reject(err); // no-op when the soft timeout already rejected
             };
+            // The subprocess died without ever emitting a final `result` line (crash,
+            // an unexpected signal — distinct from a graceful /stop, whose SIGINT
+            // handler still emits a terminal result before exiting, so `done()` wins
+            // that race and this is a no-op). Without this, a mid-turn crash left
+            // pendingApiSessions — and the caller's pending-response spinner — stuck
+            // until the up-to-15-minute opts.timeoutMs + API_TIMEOUT_HARD_CAP_EXTRA_MS
+            // safety net finally fired.
+            //
+            // If the exit followed a /stop (the CLI's SIGINT handler fell through to
+            // default termination instead of flushing a result line), that's a
+            // successful stop, not a crash — resolve like the graceful path instead
+            // of surfacing "process exited unexpectedly" for a stop the user asked for.
+            const onExit = () => {
+                const interrupted = session.consumeInterruptFlag();
+                if (interrupted) {
+                    done(buffer.join(''), true);
+                    return;
+                }
+                fail(Object.assign(new Error('Session process exited unexpectedly before responding.'), { code: 'PROCESS_EXITED' }));
+            };
             const cleanup = () => {
                 clearTimeout(globalTimer);
                 if (hardCapTimer)
@@ -2480,12 +2642,13 @@ class AgentRunner extends events_1.EventEmitter {
                 if (quietTimer)
                     clearTimeout(quietTimer);
                 session.off('output', onOutput);
+                session.off('exit', onExit);
                 this.pendingApiSessions.delete(sessionId);
             };
             const resetQuiet = () => {
                 if (quietTimer)
                     clearTimeout(quietTimer);
-                quietTimer = setTimeout(() => done(buffer.join('')), 2000);
+                quietTimer = setTimeout(() => done(buffer.join(''), session.consumeInterruptFlag()), 2000);
             };
             const onOutput = (line) => {
                 try {
@@ -2521,7 +2684,12 @@ class AgentRunner extends events_1.EventEmitter {
                         // accumulated buffer (needed for non-Anthropic models e.g. OpenRouter,
                         // which emit result:"" even though the text arrived via stream_event chunks).
                         const resultText = obj['result'] || buffer.join('');
-                        done(resultText);
+                        // Consumed here (rather than left for onExit) so the graceful path — a
+                        // result line flushed before the subprocess exits — still gets credit
+                        // for the interrupt; onExit's own consumeInterruptFlag() call would
+                        // otherwise see it already cleared and take the (harmless, settled-
+                        // guarded) fail() branch instead.
+                        done(resultText, session.consumeInterruptFlag());
                     }
                 }
                 catch {
@@ -2541,6 +2709,7 @@ class AgentRunner extends events_1.EventEmitter {
                 }, API_TIMEOUT_HARD_CAP_EXTRA_MS);
             }, opts.timeoutMs);
             session.on('output', onOutput);
+            session.on('exit', onExit);
             session.setProcessing(true);
             session.sendMessage(channelXml);
             // Do NOT call resetQuiet() here — the quiet timer should only start
@@ -2621,21 +2790,29 @@ class AgentRunner extends events_1.EventEmitter {
         let lastPartialText = '';
         // Accumulate tool_use blocks from stream_event (content_block_start → delta → stop)
         const toolBlocks = new Map();
-        const done = (result) => {
+        const done = (result, interrupted = false) => {
             if (settled)
                 return;
             settled = true;
             cleanup();
             const attachments = this.popApiAttachments(sessionId);
+            const trimmed = result.trim();
+            // A /stop that lands before any text or attachment came out of this turn
+            // would otherwise persist nothing at all — the last committed message
+            // stays the user's forever, and the web sidebar's "typing…" indicator
+            // never clears (it only clears once the last message is from the
+            // assistant). Same wording buildInitialPrompt uses to patch this same
+            // dangling-turn shape for the next spawn's in-memory context.
+            const finalText = !trimmed && !attachments.length && interrupted ? process_1.INTERRUPTED_NO_REPLY_TEXT : trimmed;
             // Persist assistant reply regardless of whether the SSE client is still connected.
             // Image-only replies (empty text but attachments present) must also persist —
             // otherwise the screenshot vanishes from history once the stream ends.
-            if (result.trim() || attachments.length) {
+            if (finalText || attachments.length) {
                 const streamAssistantTs = Date.now();
                 this.sessionStore
                     .appendMessage(this.agentConfig.id, sessionId, {
                     role: 'assistant',
-                    content: result.trim(),
+                    content: finalText,
                     ts: streamAssistantTs,
                 })
                     .catch(() => { });
@@ -2644,12 +2821,12 @@ class AgentRunner extends events_1.EventEmitter {
                     sessionId,
                     source: 'api',
                     role: 'assistant',
-                    content: result.trim(),
+                    content: finalText,
                     mediaFiles: attachments.length ? attachments.map((a) => `media/${a.relPath}`) : undefined,
                     ts: streamAssistantTs,
                 });
             }
-            callbacks.onDone(result.trim(), attachments);
+            callbacks.onDone(finalText, attachments);
         };
         const fail = (err) => {
             if (settled)
@@ -2663,11 +2840,32 @@ class AgentRunner extends events_1.EventEmitter {
             this.persistFailedApiTurn(chatId, sessionId, err, opts.skipUserMessage);
             notifyError(err);
         };
+        // The subprocess died without ever emitting a final `result` line (crash,
+        // an unexpected signal — distinct from a graceful /stop, whose SIGINT
+        // handler still emits a terminal result before exiting, so `done()` wins
+        // that race and this is a no-op via the `settled` guard in fail()).
+        // Without this, a mid-turn crash left pendingApiSessions — and the web's
+        // pending-response spinner — stuck until the up-to-15-minute
+        // opts.timeoutMs + API_TIMEOUT_HARD_CAP_EXTRA_MS safety net finally fired.
+        //
+        // If the exit followed a /stop (the CLI's SIGINT handler fell through to
+        // default termination instead of flushing a result line), that's a
+        // successful stop, not a crash — resolve like the graceful path instead
+        // of surfacing "process exited unexpectedly" for a stop the user asked for.
+        const onExit = () => {
+            const interrupted = session.consumeInterruptFlag();
+            if (interrupted) {
+                done(buffer.join(''), true);
+                return;
+            }
+            fail(Object.assign(new Error('Session process exited unexpectedly before responding.'), { code: 'PROCESS_EXITED' }));
+        };
         const cleanup = () => {
             clearTimeout(globalTimer);
             if (hardCapTimer)
                 clearTimeout(hardCapTimer);
             session.off('output', onOutput);
+            session.off('exit', onExit);
             this.pendingApiSessions.delete(sessionId);
         };
         // Called when the SSE client disconnects. Marks clientGone so SSE writes
@@ -2740,7 +2938,12 @@ class AgentRunner extends events_1.EventEmitter {
                     lastPartialText = ''; // reset for next turn
                     // Use || so empty-string result falls back to buffer (OpenRouter emits result:"").
                     const resultText = obj['result'] || buffer.join('');
-                    done(resultText);
+                    // Consumed here (rather than left for onExit) so the graceful path — a
+                    // result line flushed before the subprocess exits — still gets credit
+                    // for the interrupt; onExit's own consumeInterruptFlag() call would
+                    // otherwise see it already cleared and take the (harmless, settled-
+                    // guarded) fail() branch instead.
+                    done(resultText, session.consumeInterruptFlag());
                 }
             }
             catch {
@@ -2769,6 +2972,7 @@ class AgentRunner extends events_1.EventEmitter {
             }, API_TIMEOUT_HARD_CAP_EXTRA_MS);
         }, opts.timeoutMs);
         session.on('output', onOutput);
+        session.on('exit', onExit);
         // Image paths only work when allowTools:true — Claude needs the Read tool to access them
         const allowToolsStream = opts.allowTools ?? false;
         if (!allowToolsStream && imagePathsStream.length) {