@clawos-dev/clawd 0.2.42-beta.62.2e07b2e → 0.2.43-beta.63.2e72abd

package/dist/cli.cjs

@@ -4375,9 +4375,6 @@ var init_methods = __esm({
       // AskUserQuestion 表单回写：UI 答完所有 question 后调用，daemon 把答案合并进 updated_input
       // 写一条 control_response 到 CC stdin（详见 events.ts session:question JSDoc）
       "session:answerQuestion",
-      // AskUserQuestion 用户跳过：daemon 向 CC 回 allow + answers={} 让 tool 走空答案路径，
-      // 同时广播 cleared 帧（无 answers）让所有客户端 UI 卡片转 Ended
-      "session:cancelQuestion",
       "history:projects",
       "history:list",
       "history:read",
@@ -8595,7 +8592,7 @@ var init_zod = __esm({
 });
 
 // ../protocol/src/persona-schemas.ts
-var PersonaTokenEntrySchema, PersonaFileSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema;
+var PersonaTokenEntrySchema, PersonaFileSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, PersonaIssueTokenArgsSchema, PersonaRevokeTokenArgsSchema, PersonaAppendOwnerMessageArgsSchema;
 var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
@@ -8617,6 +8614,9 @@ var init_persona_schemas = __esm({
       createdAt: external_exports.number(),
       updatedAt: external_exports.number()
     }).strict();
+    PersonaInfoResponseSchema = PersonaFileSchema.extend({
+      personality: external_exports.string().optional()
+    });
     PersonaCreateArgsSchema = external_exports.object({
       label: external_exports.string().min(1),
       personality: external_exports.string(),
@@ -8655,7 +8655,7 @@ var init_persona_schemas = __esm({
 });
 
 // ../protocol/src/schemas.ts
-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, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
+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, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, 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";
@@ -9177,11 +9177,6 @@ var init_schemas = __esm({
       answers: external_exports.record(external_exports.string(), external_exports.string())
     });
     AnswerQuestionResponseSchema = external_exports.object({ ok: external_exports.literal(true) });
-    CancelQuestionArgs = external_exports.object({
-      sessionId: external_exports.string().min(1),
-      toolUseId: external_exports.string().min(1)
-    });
-    CancelQuestionResponseSchema = external_exports.object({ ok: external_exports.literal(true) });
     AuthRequestFrameSchema = external_exports.object({
       type: external_exports.literal("auth"),
       token: external_exports.string().min(1),
@@ -16193,31 +16188,6 @@ function reduceSession(state, input, deps) {
         ]
       };
     }
-    case "cancel-question": {
-      const pending = state.pendingQuestions?.[input.toolUseId];
-      if (!pending) {
-        return { state, effects: [] };
-      }
-      const next = cloneState(state);
-      const nextPending = { ...next.pendingQuestions };
-      delete nextPending[input.toolUseId];
-      next.pendingQuestions = nextPending;
-      const sessionId = next.file.sessionId;
-      return {
-        state: next,
-        effects: [
-          // cleared(no answers) broadcast：UI dispatch session:question:clear → 卡片转 Ended。
-          {
-            kind: "emit-frame",
-            frame: {
-              type: "session:question:cleared",
-              sessionId,
-              toolUseId: input.toolUseId
-            }
-          }
-        ]
-      };
-    }
     case "idle-kill-fired": {
       if (state.status !== "running-idle") {
         return { state, effects: [] };
@@ -16314,6 +16284,30 @@ function startRecorder(opts) {
   };
 }
 
+// src/persona/mention-injection.ts
+var MENTION_RE = /@persona\/([A-Za-z0-9_-]+)(?=\s|$|[^A-Za-z0-9_-])/g;
+function injectPersonaMentions(rawText, store) {
+  const resolved = [];
+  const body = rawText.replace(MENTION_RE, (match, id) => {
+    const meta = store.read(id);
+    const personality = store.readPersonality(id);
+    if (meta && personality !== null) {
+      resolved.push({ id, label: meta.label, personality });
+      return "";
+    }
+    return match;
+  });
+  if (resolved.length === 0) return rawText;
+  const blocks = resolved.map(
+    (r) => `[Acting as persona "${r.label}" for this message]
+${r.personality}`
+  );
+  return `${blocks.join("\n\n")}
+
+[User says]:
+${body.trim()}`;
+}
+
 // src/session/runner.ts
 var DEFAULT_CONTROL_REQUEST_TIMEOUT_MS = 1e4;
 function encodeAllowWithInputControlResponse(requestId, updatedInput) {
@@ -16354,9 +16348,14 @@ var SessionRunner = class {
   }
   // 外部推送 input 到 reducer，然后执行产出的 effects
   input(inputMsg) {
+    const personaStore = this.hooks.personaStore;
     const deps = {
       parseLine: (l) => this.hooks.adapter.parseLine(l),
-      encodeStdin: (t, ctx) => this.hooks.adapter.encodeStdin(t, ctx) ?? "",
+      // persona mention injection 在 deps 装配处包一层，对 reducer 完全透明
+      encodeStdin: (t, ctx) => {
+        const injected = personaStore ? injectPersonaMentions(t, personaStore) : t;
+        return this.hooks.adapter.encodeStdin(injected, ctx) ?? "";
+      },
       bufferCap: this.hooks.bufferCap ?? 500,
       now: this.hooks.now ?? Date.now,
       resolveContextWindow: this.hooks.resolveContextWindow,
@@ -16755,7 +16754,8 @@ var SessionManager = class {
       bufferCap: this.deps.bufferCap,
       // adapter 自己持有模型表 + 兜底逻辑（contains / opus-1M / [1m] 等），manager 不再 cache 转发
       resolveContextWindow: (tool, modelId) => this.deps.getAdapter(tool).resolveContextWindow(modelId),
-      dataDir: this.deps.dataDir
+      dataDir: this.deps.dataDir,
+      personaStore: this.deps.personaStore
     });
     return runner;
   }
@@ -17491,31 +17491,6 @@ var SessionManager = class {
     });
     return { response: { ok: true }, broadcast };
   }
-  // AskUserQuestion 用户跳过：与官方 CC CLI Esc 行为对齐——**不向 CC 发 tool 结果**，而是发
-  // control_request.subtype='interrupt'（与 session:interrupt 同一条路径）中断整个 turn，
-  // tool call 在 CC 端不返回任何 result。Reducer 同步清 pendingQuestions[toolUseId] + 发
-  // cleared 帧（answers 缺省）让 UI 转 Ended 只读态。
-  //
-  // - session 不存在 / 无 runner / procAlive=false → noop 幂等返回（与 answerQuestion 同语义）
-  // - sendControlRequest 失败（CC 退出 / 超时）→ 不抛：cleared 帧已发，UI 状态已收敛
-  async cancelQuestion(args) {
-    const runner = this.runners.get(args.sessionId);
-    if (!runner) {
-      return { response: { ok: true }, broadcast: [] };
-    }
-    const hit = Boolean(runner.getState().pendingQuestions?.[args.toolUseId]);
-    if (!hit) {
-      return { response: { ok: true }, broadcast: [] };
-    }
-    const { broadcast } = this.withCollector(() => {
-      runner.input({ kind: "cancel-question", toolUseId: args.toolUseId });
-    });
-    if (runner.getState().procAlive) {
-      void runner.sendControlRequest("interrupt").catch(() => {
-      });
-    }
-    return { response: { ok: true }, broadcast };
-  }
   // 权限决定：dispatcher 收到 permission:respond 时调用
   // 先查 state.pendingPermissions：不存在 → 抛 PERMISSION_REQUEST_STALE
   respondPermission(args) {
@@ -17713,13 +17688,16 @@ var PersonaManager = class {
       updated.iconKey = iconKeyPatch;
     }
     if (personality !== void 0) {
-      this.deps.store.write(updated, personality);
-    } else {
-      this.deps.store.writeMeta(updated);
+      this.deps.store.writePersonality(personaId, personality);
     }
+    this.deps.store.writeMeta(updated);
     this.deps.registry.set(updated);
     return updated;
   }
+  /** 读取 CLAUDE.md 内容；persona 目录或文件不存在时返回 null。透传给 handler 拼响应。 */
+  readPersonality(personaId) {
+    return this.deps.store.readPersonality(personaId);
+  }
   /**
    * 删除 persona。
    * PersonaStore.remove(personaId) 已级联删除整个 <personaRoot>/<personaId>/ 目录，
@@ -19912,11 +19890,6 @@ function buildSessionHandlers(deps) {
     const { response, broadcast } = manager.answerQuestion(args);
     return { response: { type: "session:answerQuestion", ...response }, broadcast };
   };
-  const cancelQuestion = async (frame) => {
-    const args = CancelQuestionArgs.parse(frame);
-    const { response, broadcast } = await manager.cancelQuestion(args);
-    return { response: { type: "session:cancelQuestion", ...response }, broadcast };
-  };
   return {
     "session:create": create,
     "session:list": list,
@@ -19938,8 +19911,7 @@ function buildSessionHandlers(deps) {
     "session:unsubscribe": unsubscribe,
     "session:pin": pin,
     "session:reorderPins": reorderPins,
-    "session:answerQuestion": answerQuestion,
-    "session:cancelQuestion": cancelQuestion
+    "session:answerQuestion": answerQuestion
   };
 }
 
@@ -20434,7 +20406,10 @@ function buildPersonaHandlers(deps) {
     if (!persona) {
       return { response: { type: "persona:info", persona: null } };
     }
-    return { response: { type: "persona:info", ...persona } };
+    const personality = personaManager.readPersonality(args.personaId) ?? "";
+    return {
+      response: { type: "persona:info", ...persona, personality }
+    };
   };
   const update = async (frame) => {
     const { type: _type, requestId: _requestId, ...rest } = frame;
@@ -20547,6 +20522,7 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
+  const personaStore = new PersonaStore(import_node_path19.default.join(config.dataDir, "personas"));
   const manager = new SessionManager({
     store,
     logger,
@@ -20554,6 +20530,7 @@ async function startDaemon(config) {
     historyReader: history,
     dataDir: config.dataDir,
     personaRoot: import_node_path19.default.join(config.dataDir, "personas"),
+    personaStore,
     broadcastFrame: (frame, target) => {
       if (target === "all") {
         transport?.broadcastAll(frame);
@@ -20593,7 +20570,6 @@ async function startDaemon(config) {
       manager.recordRealUserUuid({ sessionId, realUuid, text });
     }
   });
-  const personaStore = new PersonaStore(import_node_path19.default.join(config.dataDir, "personas"));
   const personaRegistry = new PersonaRegistry(personaStore);
   const personaManager = new PersonaManager({
     store: personaStore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.42-beta.62.2e07b2e",
+  "version": "0.2.43-beta.63.2e72abd",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",