@clawos-dev/clawd 0.2.28-beta.38.7eb315d → 0.2.28-beta.39.d6768c8

package/dist/cli.cjs

@@ -4408,10 +4408,17 @@ var init_methods = __esm({
 });
 
 // ../protocol/src/events.ts
-var HISTORY_USER_META_VALUES, ASK_USER_QUESTION_TOOL_NAME;
+var SESSION_STATUS_VALUES, HISTORY_USER_META_VALUES, ASK_USER_QUESTION_TOOL_NAME;
 var init_events = __esm({
   "../protocol/src/events.ts"() {
     "use strict";
+    SESSION_STATUS_VALUES = [
+      "idle",
+      "running",
+      "stopped",
+      "error",
+      "observing"
+    ];
     HISTORY_USER_META_VALUES = [
       "task-notification",
       "slash-command",
@@ -8698,13 +8705,14 @@ var init_persona_schemas = __esm({
 });
 
 // ../protocol/src/schemas.ts
-var UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
     init_zod();
     init_events();
     init_persona_schemas();
+    SessionStatusSchema = external_exports.enum(SESSION_STATUS_VALUES);
     UsageSchema = external_exports.object({
       input_tokens: external_exports.number().int().nonnegative().optional(),
       cache_read_input_tokens: external_exports.number().int().nonnegative().optional(),
@@ -9177,6 +9185,13 @@ var init_schemas = __esm({
       // UI 单卡承载多 question；空数组语义无效，schema 必拒
       questions: external_exports.array(AskQuestionItemSchema).min(1)
     });
+    SessionQuestionClearedFrameSchema = external_exports.object({
+      type: external_exports.literal("session:question:cleared"),
+      sessionId: external_exports.string().min(1),
+      toolUseId: external_exports.string().min(1),
+      // record<string,string>：与 AnswerQuestionArgs.answers 同形状（question text → label）
+      answers: external_exports.record(external_exports.string(), external_exports.string()).optional()
+    });
     AnswerQuestionArgs = external_exports.object({
       sessionId: external_exports.string().min(1),
       toolUseId: external_exports.string().min(1),
@@ -9199,6 +9214,22 @@ var init_schemas = __esm({
       subdomain: external_exports.string().nullable(),
       url: external_exports.string().nullable()
     });
+    InfoRunningSessionSchema = external_exports.object({
+      sessionId: external_exports.string().min(1),
+      status: SessionStatusSchema,
+      freshSpawn: external_exports.boolean(),
+      pendingPermissionsCount: external_exports.number().int().nonnegative(),
+      pendingQuestionsCount: external_exports.number().int().nonnegative()
+    });
+    InfoResponseSchema = external_exports.object({
+      type: external_exports.literal("info"),
+      version: external_exports.string(),
+      protocolVersion: external_exports.number(),
+      hostname: external_exports.string(),
+      os: external_exports.string(),
+      tools: external_exports.array(external_exports.object({ id: external_exports.string(), available: external_exports.boolean() })),
+      runningSessions: external_exports.array(InfoRunningSessionSchema)
+    });
   }
 });
 
@@ -15860,6 +15891,16 @@ function applyCommand(state, command, deps) {
       return { state: nextState, effects };
     }
     case "stop": {
+      for (const toolUseId of Object.keys(state.pendingQuestions ?? {})) {
+        effects.push({
+          kind: "emit-frame",
+          frame: {
+            type: "session:question:cleared",
+            sessionId,
+            toolUseId
+          }
+        });
+      }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
       if (next.procAlive) {
@@ -15887,6 +15928,16 @@ function applyCommand(state, command, deps) {
       return { state: next, effects };
     }
     case "delete": {
+      for (const toolUseId of Object.keys(state.pendingQuestions ?? {})) {
+        effects.push({
+          kind: "emit-frame",
+          frame: {
+            type: "session:question:cleared",
+            sessionId,
+            toolUseId
+          }
+        });
+      }
       next.pendingPermissions = {};
       next.pendingQuestions = {};
       if (next.procAlive) {
@@ -15998,6 +16049,17 @@ function reduceSession(state, input, deps) {
       const next = cloneState(state);
       next.procAlive = false;
       next.status = "stopped";
+      const sessionId = next.file.sessionId;
+      const clearedEffects = Object.keys(state.pendingQuestions ?? {}).map(
+        (toolUseId) => ({
+          kind: "emit-frame",
+          frame: {
+            type: "session:question:cleared",
+            sessionId,
+            toolUseId
+          }
+        })
+      );
       next.pendingQuestions = {};
       return {
         state: next,
@@ -16006,11 +16068,12 @@ function reduceSession(state, input, deps) {
             kind: "emit-frame",
             frame: {
               type: "session:status",
-              sessionId: next.file.sessionId,
+              sessionId,
               status: next.status,
               exitCode: input.code
             }
-          }
+          },
+          ...clearedEffects
         ]
       };
     }
@@ -16084,6 +16147,7 @@ function reduceSession(state, input, deps) {
         ...baseInput,
         answers: input.answers
       };
+      const sessionId = next.file.sessionId;
       return {
         state: next,
         effects: [
@@ -16091,6 +16155,17 @@ function reduceSession(state, input, deps) {
             kind: "send-control-response-allow-with-input",
             requestId: pending.requestId,
             updatedInput
+          },
+          // cleared(with answers) broadcast：UI dispatch session:question:submitted，
+          //   pendingQuestions[toolUseId] 转 submitted 只读态。target 缺省=broadcast。
+          {
+            kind: "emit-frame",
+            frame: {
+              type: "session:question:cleared",
+              sessionId,
+              toolUseId: input.toolUseId,
+              answers: input.answers
+            }
           }
         ]
       };
@@ -17138,7 +17213,10 @@ var SessionManager = class {
       running.push({
         sessionId: sid,
         status: compressStatus(st.status),
-        freshSpawn: st.freshSpawn
+        freshSpawn: st.freshSpawn,
+        // sidebar awaiting-user baseline：UI 端据此填 anonymous slot 直到 push 帧带真实 toolUseId
+        pendingPermissionsCount: Object.keys(st.pendingPermissions).length,
+        pendingQuestionsCount: Object.keys(st.pendingQuestions).length
       });
     }
     return { runningSessions: running };
@@ -18317,9 +18395,15 @@ var LocalWsServer = class {
       return;
     }
     if (frame.type === "session:subscribe" && typeof frame.sessionId === "string") {
-      addSubscription(client, frame.sessionId);
+      const sessionId = frame.sessionId;
+      addSubscription(client, sessionId);
       if (typeof frame.requestId === "string") {
-        this.safeSend(this.clients.get(client.id).ws, { type: "subscribed", requestId: frame.requestId, sessionId: frame.sessionId });
+        this.safeSend(this.clients.get(client.id).ws, { type: "subscribed", requestId: frame.requestId, sessionId });
+      }
+      try {
+        this.opts.onSubscribe?.(client, sessionId);
+      } catch (err) {
+        this.logger?.warn("onSubscribe hook threw", { err: err.message });
       }
       return;
     }
@@ -20076,7 +20160,28 @@ async function startDaemon(config) {
     readyFrameBuilder: () => buildReadyFrame({ manager, getAdapter, getTunnelUrl: () => currentTunnelUrl }),
     protocolVersion: PROTOCOL_VERSION,
     authGate: authGate ?? void 0,
-    personaBoundHandler
+    personaBoundHandler,
+    // 订阅成功后给该 client 重放 in-flight pendingQuestions（plan: clawd-question-server-truth）。
+    // daemon 是 pendingQuestions 的唯一 source of truth；新 client 接入 / 刷新页面时
+    // 把当前所有未决 question 以 session:question 帧定向回放，让 UI 不再误显示 Ended。
+    // 形状与 reducer permission_request 分支构造的 session:question 帧一致；UI 不区分
+    // 首播 vs 重放（last-write-wins，详见 protocol/events.ts JSDoc）。
+    onSubscribe: (client, sessionId) => {
+      const runner = manager.getActive(sessionId);
+      if (!runner) return;
+      const pendingQuestions = runner.getState().pendingQuestions ?? {};
+      for (const [toolUseId, entry] of Object.entries(pendingQuestions)) {
+        const rawInput = entry.input;
+        const questions = rawInput && typeof rawInput === "object" && "questions" in rawInput ? rawInput.questions : void 0;
+        client.send({
+          type: "session:question",
+          sessionId,
+          toolUseId,
+          requestId: entry.requestId,
+          questions: Array.isArray(questions) ? questions : []
+        });
+      }
+    }
   });
   transport = wsServer;
   const wss = wsServer;
@@ -20196,7 +20301,8 @@ ${bar}
     stop: shutdown,
     url,
     tunnelUrl: stateSnapshot.tunnelUrl ?? null,
-    authToken: resolvedAuthToken
+    authToken: resolvedAuthToken,
+    manager
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.28-beta.38.7eb315d",
+  "version": "0.2.28-beta.39.d6768c8",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",