@clawos-dev/clawd 0.2.133-beta.261.f56c209 → 0.2.133-beta.263.cdd5ca9

package/dist/cli.cjs

@@ -10233,6 +10233,23 @@ var require_pino = __commonJS({
   }
 });
 
+// src/session/stdout-splitter.ts
+function splitStdoutChunk(buf, chunk) {
+  let next = buf + (typeof chunk === "string" ? chunk : chunk.toString("utf8"));
+  const lines = [];
+  let idx;
+  while ((idx = next.indexOf("\n")) >= 0) {
+    lines.push(next.slice(0, idx));
+    next = next.slice(idx + 1);
+  }
+  return { newBuf: next, lines };
+}
+var init_stdout_splitter = __esm({
+  "src/session/stdout-splitter.ts"() {
+    "use strict";
+  }
+});
+
 // src/session/permission-stdio.ts
 function encodePermissionResponse(requestId, approved, input, message) {
   const innerResponse = approved ? {
@@ -10255,23 +10272,6 @@ var init_permission_stdio = __esm({
   }
 });
 
-// src/session/stdout-splitter.ts
-function splitStdoutChunk(buf, chunk) {
-  let next = buf + (typeof chunk === "string" ? chunk : chunk.toString("utf8"));
-  const lines = [];
-  let idx;
-  while ((idx = next.indexOf("\n")) >= 0) {
-    lines.push(next.slice(0, idx));
-    next = next.slice(idx + 1);
-  }
-  return { newBuf: next, lines };
-}
-var init_stdout_splitter = __esm({
-  "src/session/stdout-splitter.ts"() {
-    "use strict";
-  }
-});
-
 // ../node_modules/.pnpm/diff@7.0.0/node_modules/diff/lib/index.mjs
 function Diff() {
 }
@@ -31625,9 +31625,6 @@ function buildRule(tool, input) {
   return { tool, pattern, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-// src/session/reducer.ts
-init_permission_stdio();
-
 // src/persona/connection-prompt.ts
 var OWNER_TEMPLATE = `# \u8FDE\u63A5\u4E0A\u4E0B\u6587
 \u4F60\u73B0\u5728\u4EE5 Owner \u8EAB\u4EFD\u88AB\u8FDE\u63A5\uFF0C\u5BF9\u65B9\u5C31\u662F owner \u672C\u4EBA\uFF08{ownerLabel}\uFF09\u3002
@@ -31814,10 +31811,7 @@ function applyParsedEvent(state, event, deps) {
     effects.push(...pushed2.effects);
     const hit = matchesAnyRule(next.file.permissionRules, tool, input);
     if (hit) {
-      effects.push({
-        kind: "write-stdin",
-        payload: encodePermissionResponse(requestId, true, input)
-      });
+      effects.push({ kind: "respond-permission", requestId, allow: true, input });
     } else {
       const pending = {
         tool,
@@ -32210,13 +32204,11 @@ function reduceSession(state, input, deps) {
       next.pendingPermissions = nextPending;
       const effects = [
         {
-          kind: "write-stdin",
-          payload: encodePermissionResponse(
-            input.requestId,
-            input.allow,
-            pending.input,
-            input.message
-          )
+          kind: "respond-permission",
+          requestId: input.requestId,
+          allow: input.allow,
+          input: pending.input,
+          message: input.message
         }
       ];
       if (input.allow && input.permanent) {
@@ -32356,6 +32348,7 @@ function reduceSession(state, input, deps) {
 
 // src/session/runner.ts
 init_stdout_splitter();
+init_permission_stdio();
 
 // src/ipc-recorder.ts
 var import_node_fs4 = __toESM(require("fs"), 1);
@@ -32463,6 +32456,9 @@ var SessionRunner = class {
   hooks;
   state;
   proc = null;
+  // JSON-RPC 类 agent(codex app-server) 的 per-session 驱动器；非 null 时 runner 不用 spawn()/ChildProcess，
+  // effect 路由到 session 一等方法（startTurn/respondPermission/answerQuestion/interrupt/stop）。claude 恒 null。
+  session = null;
   stdoutBuf = "";
   // 未决 control_request 表；key = request_id
   pendingControlRequests = /* @__PURE__ */ new Map();
@@ -32571,6 +32567,15 @@ var SessionRunner = class {
     if (this.hooks.onFileEdit) this.observeForFileEdit(events);
     this.input({ kind: "inject-events", events });
   }
+  // session:interrupt 的 SDK 通道分流：codex → AgentSession.interrupt()；claude → control_request('interrupt')。
+  // TUI(pty) 路径在 manager.dispatchInterrupt 里先于此处理，不进这里。
+  async interrupt() {
+    if (this.session) {
+      this.session.interrupt();
+      return;
+    }
+    await this.sendControlRequest("interrupt");
+  }
   /**
    * file-sharing tool_use ↔ tool_result 配对（spec §6 PR 3）。
    *
@@ -32695,9 +32700,17 @@ var SessionRunner = class {
         this.doSpawn(effect.ctx);
         break;
       case "kill":
+        if (this.session) {
+          void this.session.stop();
+          break;
+        }
         this.doKill(effect.signal);
         break;
       case "write-stdin":
+        if (this.session) {
+          this.session.startTurn(effect.payload);
+          break;
+        }
         this.hooks.logger?.debug("[RG] write-stdin", {
           procAlive: !!this.proc,
           stdinWritable: !!this.proc?.stdin,
@@ -32707,7 +32720,21 @@ var SessionRunner = class {
         this.proc?.stdin?.write(effect.payload);
         this.recorder?.tapStdinWrite(effect.payload);
         break;
+      case "respond-permission": {
+        if (this.session) {
+          this.session.respondPermission(effect.requestId, effect.allow);
+          break;
+        }
+        const payload = encodePermissionResponse(effect.requestId, effect.allow, effect.input, effect.message);
+        this.proc?.stdin?.write(payload);
+        this.recorder?.tapStdinWrite(payload);
+        break;
+      }
       case "send-control-response-allow-with-input": {
+        if (this.session) {
+          this.session.answerQuestion(effect.requestId, effect.updatedInput);
+          break;
+        }
         const payload = encodeAllowWithInputControlResponse(effect.requestId, effect.updatedInput);
         this.proc?.stdin?.write(payload);
         this.recorder?.tapStdinWrite(payload);
@@ -32764,6 +32791,22 @@ var SessionRunner = class {
   }
   // 启动子进程，绑定 stdout line buffer → 回灌 reducer
   doSpawn(ctx) {
+    if (this.hooks.adapter.createSession) {
+      this.session = this.hooks.adapter.createSession(ctx, {
+        pushEvents: (events) => {
+          if (events.length === 0) return;
+          const uuid = (this.hooks.genUuid ?? v4_default)();
+          this.input({ kind: "inject-events", events: events.map((e) => e.uuid ? e : { ...e, uuid }) });
+        },
+        onExit: (code) => {
+          this.session = null;
+          this.clearIdleKillTimers();
+          this.input({ kind: "proc-exit", code });
+        },
+        onError: (message) => this.input({ kind: "proc-error", message })
+      });
+      return;
+    }
     const proc = this.hooks.spawnOverride ? this.hooks.spawnOverride(ctx) : this.hooks.adapter.spawn(ctx);
     this.proc = proc;
     this.stdoutBuf = "";
@@ -33634,7 +33677,7 @@ var SessionManager = class {
       tsid,
       mode: this.deps.mode
     });
-    await runner.sendControlRequest("interrupt");
+    await runner.interrupt();
   }
   // 批量版本：UI 打开 session 时一次性拿到"磁盘和快照有差异"的 user message id 集合，
   // 用来在消息流里精准控制 rewind 按钮的显示。session 没 toolSessionId 时返回空

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.133-beta.261.f56c209",
+  "version": "0.2.133-beta.263.cdd5ca9",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",