@clawos-dev/clawd 0.2.220 → 0.2.221-beta.433.d7a6891

package/dist/cli.cjs

@@ -41651,47 +41651,6 @@ function escapeAttr(v2) {
   return v2.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
-// src/shift/end-frame-handler.ts
-function makeEndFrameHandler(sessionId, onEnd) {
-  return (frame) => {
-    if (!frame || typeof frame !== "object") return;
-    const f = frame;
-    if (f.type !== "session:status") return;
-    if (f.sessionId !== sessionId) return;
-    if (f.status === "running-idle") {
-      onEnd({ kind: "idle" });
-      return;
-    }
-    if (f.status === "stopped") {
-      onEnd({ kind: "stopped" });
-      return;
-    }
-    if (f.status === "error") {
-      onEnd({ kind: "error", message: f.message ?? "cc proc error" });
-      return;
-    }
-  };
-}
-
-// src/shift/end-dispatcher.ts
-function dispatchShiftEnd(info, settle, killImpl) {
-  if (info.kind === "idle") {
-    settle({ ok: true });
-    killImpl();
-    return;
-  }
-  if (info.kind === "stopped") {
-    settle({ error: "cc exited before turn completed" });
-    return;
-  }
-  if (info.kind === "error") {
-    settle({ error: info.message });
-    return;
-  }
-  const _exhaustive = info;
-  throw new Error(`dispatchShiftEnd: unhandled kind ${JSON.stringify(_exhaustive)}`);
-}
-
 // src/session/runner.ts
 var import_node_os4 = __toESM(require("os"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
@@ -41923,7 +41882,8 @@ function buildSpawnContext(state, deps) {
   const personaId = file.ownerPersonaId;
   if (personaId) env.CLAWD_PERSONA_ID = personaId;
   const dispatchMcpConfigPath2 = deps.getDispatchMcpConfigPath?.() ?? null;
-  const ticketMcpConfigPath2 = deps.getTicketMcpConfigPath?.() ?? null;
+  const ticketMcpConfigPathRaw = deps.getTicketMcpConfigPath?.() ?? null;
+  const ticketMcpConfigPath2 = ticketMcpConfigPathRaw && file.ownerPersonaId === "persona-ticket-manager" ? ticketMcpConfigPathRaw : null;
   const shiftMcpConfigPath2 = deps.getShiftMcpConfigPath?.() ?? null;
   const inboxMcpConfigPath2 = deps.getInboxMcpConfigPath?.() ?? null;
   const ctx = {
@@ -42748,7 +42708,7 @@ var SessionRunner = class {
       getDispatchMcpConfigPath: this.hooks.getDispatchMcpConfigPath,
       getShiftMcpConfigPath: this.hooks.getShiftMcpConfigPath,
       getInboxMcpConfigPath: this.hooks.getInboxMcpConfigPath,
-      // Ticket MCP：透传 ticket.mcp.json 路径闭包（所有 persona session 都挂，无 gating）
+      // Ticket MCP：透传 ticket.mcp.json 路径闭包（reducer 内做 persona-ticket-manager gating）
       getTicketMcpConfigPath: this.hooks.getTicketMcpConfigPath,
       lookupDispatchByBSessionId: this.hooks.lookupDispatchByBSessionId,
       // ReadyGate v2：透传 mode 让 reducer send / ready-detected 分支决定走暂存队列还是直写
@@ -44510,9 +44470,8 @@ var SessionManager = class {
    * 跟 createDispatchedSession 的差异：
    *   - 不带 dispatchId / source / task pack；prompt 直接当第一条 user message
    *   - 不调 personaDispatchManager.registerBSession
-   *   - 多返一个 ended Promise，监听 session:status 帧翻译成 shift 业务终态 union
-   *     （ShiftSessionEnded：{ok:true} | {error:string}），不经 exit code 中转
-   *   - turn-idle 到达即视为业务完成 → settle {ok:true} + fire-and-forget kill cc
+   *   - 多返一个 ended Promise，监听 session:status (stopped/error) 帧通过现有
+   *     subscribe() 入口（白名单已含 session:status）
    *   - kill 通过 runner.input({command:{kind:'stop'}}) 触发 SIGKILL → proc-exit
    */
   createShiftSession(args) {
@@ -44556,18 +44515,16 @@ var SessionManager = class {
       unsubscribe();
       resolveEnded(info);
     };
-    const killImpl = () => {
-      const r = this.runners.get(sessionId);
-      if (!r) return;
-      r.input({ kind: "command", command: { kind: "stop" } });
-    };
-    unsubscribe = this.subscribe(
-      sessionId,
-      scope,
-      makeEndFrameHandler(sessionId, (info) => {
-        dispatchShiftEnd(info, settle, killImpl);
-      })
-    );
+    unsubscribe = this.subscribe(sessionId, scope, (frame) => {
+      if (frame.type !== "session:status") return;
+      const f = frame;
+      if (f.sessionId !== sessionId) return;
+      if (f.status === "stopped") {
+        settle({ exitCode: f.exitCode ?? null });
+      } else if (f.status === "error") {
+        settle({ exitCode: null, error: f.message ?? "cc proc error" });
+      }
+    });
     const runner = this.ensureRunnerForScope(file, scope);
     this.deps.logger?.info("shift.createShiftSession.runner-ready", { sessionId });
     runner.input({
@@ -44580,7 +44537,12 @@ var SessionManager = class {
         })
       }
     });
-    return { sessionId, ended, kill: killImpl };
+    const kill = () => {
+      const r = this.runners.get(sessionId);
+      if (!r) return;
+      r.input({ kind: "command", command: { kind: "stop" } });
+    };
+    return { sessionId, ended, kill };
   }
   /**
    * 老板插话：把 'inject-owner-text' input 喂给对应 runner，
@@ -48485,11 +48447,15 @@ function createShiftSpawnFn(deps) {
     void created.ended.then((info) => {
       clearTimeout(timer);
       if (settled) return;
-      if ("ok" in info) {
+      if (info.error) {
+        settle({ kind: "error", error: info.error });
+        return;
+      }
+      if (info.exitCode === 0) {
         settle({ kind: "ok" });
         return;
       }
-      settle({ kind: "error", error: info.error });
+      settle({ kind: "error", error: `cc exited with code ${info.exitCode}` });
     });
     return { sessionId: created.sessionId, ended };
   };
@@ -54226,22 +54192,6 @@ var LoginFlow = class {
     } catch (err) {
       return { ok: false, reason: `user_info failed: ${err.message}` };
     }
-    if (!identity.unionId) {
-      return { ok: false, reason: "union_id missing from TTC user_info" };
-    }
-    try {
-      await this.deps.upsertBinding({
-        deviceId: this.deps.getDeviceId(),
-        unionId: identity.unionId,
-        displayName: identity.displayName,
-        avatarUrl: identity.avatarUrl ?? null
-      });
-    } catch (err) {
-      return {
-        ok: false,
-        reason: `device_binding upsert failed: ${err.message}`
-      };
-    }
     const expiresAtNum = params.expiresAt ? Number.parseInt(params.expiresAt, 10) : NaN;
     this.deps.store.write({
       identity,
@@ -54410,58 +54360,6 @@ async function centralListDevices(opts) {
   return out;
 }
 
-// src/feishu-auth/device-binding-client.ts
-var DeviceBindingClientError = class extends Error {
-  constructor(code, message, cause) {
-    super(message);
-    this.code = code;
-    this.cause = cause;
-    this.name = "DeviceBindingClientError";
-  }
-  code;
-  cause;
-};
-var DEFAULT_TIMEOUT_MS4 = 8e3;
-async function upsertDeviceBinding(opts) {
-  const doFetch = opts.fetchImpl ?? fetch;
-  const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS4);
-  const body = { unionId: opts.unionId };
-  if (opts.avatarUrl != null) body.avatarUrl = opts.avatarUrl;
-  let res;
-  try {
-    res = await doFetch(`${opts.apiUrl}/api/device-bindings/self`, {
-      method: "PUT",
-      signal: ac.signal,
-      headers: {
-        authorization: `Bearer ${opts.apiKey}`,
-        "x-did": encodeURIComponent(opts.deviceId),
-        "x-name": encodeURIComponent(opts.displayName),
-        "x-scene": "daemon",
-        "content-type": "application/json"
-      },
-      body: JSON.stringify(body)
-    });
-  } catch (err) {
-    clearTimeout(timer);
-    throw new DeviceBindingClientError(
-      "NETWORK",
-      `network error: ${err.message}`,
-      err
-    );
-  } finally {
-    clearTimeout(timer);
-  }
-  if (!res.ok) {
-    let detail = "";
-    try {
-      detail = JSON.stringify(await res.json());
-    } catch {
-    }
-    throw new DeviceBindingClientError("API_ERROR", `HTTP ${res.status}: ${detail}`);
-  }
-}
-
 // src/feishu-auth/verify-token.ts
 var crypto14 = __toESM(require("crypto"), 1);
 var CONNECT_TOKEN_PREFIX = "clawdtk1";
@@ -59359,10 +59257,10 @@ async function startDaemon(config) {
     import_node_path64.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
-  const ticketCallerDid = authFile.deviceId;
-  const ticketCallerName = ownerDisplayName;
+  const ticketCallerDid = feishuIdentity?.identity.unionId ?? "";
+  const ticketCallerName = feishuIdentity?.identity.displayName ?? "";
   let ticketMcpConfigPath2;
-  if (ticketServerScriptPath) {
+  if (ticketServerScriptPath && ticketCallerDid) {
     const ticketLogPath = import_node_path64.default.join(config.dataDir, "ticket-mcp-server.log");
     ticketMcpConfigPath2 = writeTicketMcpConfig({
       dataDir: config.dataDir,
@@ -59380,7 +59278,7 @@ async function startDaemon(config) {
     });
   } else {
     logger.warn("ticket-mcp skipped", {
-      reason: "ticket-mcp-server.cjs not found (need build)"
+      reason: !ticketCallerDid ? "caller did missing (login required)" : "ticket-mcp-server.cjs not found (need build)"
     });
   }
   const shiftServerCandidates = [
@@ -59631,16 +59529,7 @@ async function startDaemon(config) {
     store: ownerIdentityStore,
     fetchUserInfo: (ttcToken) => fetchTtcUserInfo({ apiBase: TTC_HOSTS.api, token: ttcToken }),
     ttcAuthBase: TTC_HOSTS.auth,
-    getCallbackUrl: () => `http://127.0.0.1:${config.port}/auth/callback`,
-    // device_bindings upsert（did ↔ 飞书 unionId 映射）：
-    // deviceId 从 auth.json 稳定读；apiUrl 走同一份 clawosApi；apiKey 复用 CLAWD_TICKETS_API_KEY。
-    // 失败即登录失败（fail-hard，login-flow.spec §upsert 失败）。
-    getDeviceId: () => authFile.deviceId,
-    upsertBinding: (opts) => upsertDeviceBinding({
-      apiUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
-      apiKey: resolveClawdTicketsApiKey(),
-      ...opts
-    })
+    getCallbackUrl: () => `http://127.0.0.1:${config.port}/auth/callback`
   });
   const visitorStore = createVisitorStore({ dir: config.dataDir });
   const exchangeVisitorToken = buildVisitorLogin({