handsoff 0.1.2-beta.2 → 0.1.3

package/dist/gateway/process.js

@@ -167,7 +167,7 @@ function buildPermissionCard(input) {
       behaviors: [
         {
           type: "callback",
-          value: { action: btn.value }
+          value: { action: btn.value, requestId: input.requestId }
         }
       ]
     };
@@ -253,13 +253,14 @@ function buildQuestionCard(input) {
         {
           tag: "button",
           text: { tag: "plain_text", content: item.label },
+          hover_tips: { tag: "plain_text", content: item.label },
           type: "primary",
           width: "default",
           size: "small",
           behaviors: [
             {
               type: "callback",
-              value: { action: "select", optionId: item.id }
+              value: { action: "select", optionId: item.id, requestId: input.requestId }
             }
           ]
         }
@@ -289,7 +290,7 @@ function buildQuestionCard(input) {
       behaviors: [
         {
           type: "callback",
-          value: { action: "check", optionId: item.id }
+          value: { action: "check", optionId: item.id, requestId: input.requestId }
         }
       ]
     }));
@@ -325,7 +326,7 @@ function buildQuestionCard(input) {
               behaviors: [
                 {
                   type: "callback",
-                  value: { action: "submit" }
+                  value: { action: "submit", requestId: input.requestId }
                 }
               ]
             }
@@ -698,7 +699,7 @@ var AgentAdapterRegistry = class _AgentAdapterRegistry {
 // src/core/session/Session.ts
 init_esm_shims();
 var Session = class {
-  id;
+  _id;
   agent;
   token;
   metadata;
@@ -711,7 +712,7 @@ var Session = class {
   permissionMode;
   slashCommands;
   constructor(options) {
-    this.id = options.id;
+    this._id = options.id;
     this.agent = options.adapter;
     this.token = options.token;
     this.metadata = options.metadata ?? {};
@@ -720,6 +721,12 @@ var Session = class {
     this._updatedAt = this.createdAt;
     this.cwd = options.cwd;
   }
+  get id() {
+    return this._id;
+  }
+  setId(newId) {
+    this._id = newId;
+  }
   get agentType() {
     return this.agent.agentType;
   }
@@ -841,6 +848,22 @@ var SessionManager = class {
     this.logger.debug({ sessionId, ...info }, "[SessionManager] Session info updated");
     return true;
   }
+  renameSessionId(oldId, newId) {
+    const session = this.sessions.get(oldId);
+    if (!session) {
+      this.logger.warn({ oldId, newId }, "[SessionManager] renameSessionId: session not found");
+      return false;
+    }
+    if (this.sessions.has(newId)) {
+      this.logger.warn({ oldId, newId }, "[SessionManager] renameSessionId: newId already exists");
+      return false;
+    }
+    session.setId(newId);
+    this.sessions.delete(oldId);
+    this.sessions.set(newId, session);
+    this.logger.info({ oldId, newId }, "[SessionManager] Session renamed");
+    return true;
+  }
 };
 
 // src/gateway/events.ts
@@ -3073,6 +3096,9 @@ var Gateway = class {
   updateSessionInfo(sessionId, info) {
     this.sessionManager.updateSessionInfo(sessionId, info);
   }
+  renameSessionId(oldId, newId) {
+    return this.sessionManager.renameSessionId(oldId, newId);
+  }
 };
 
 // src/gateway/publisher.ts
@@ -3336,13 +3362,21 @@ var BaseAgentAdapter = class {
       this.bus.onInbound((msg) => this.handleInboundMessage(msg))
     );
   }
+  /**
+   * Resolve session ID from inbound message. Subclasses may override to
+   * return a stable session ID based on transport-level identity (e.g.
+   * Claude SDK session_id).
+   */
+  resolveSessionId(_message) {
+    return void 0;
+  }
   async handleInboundMessage(message) {
     const text = message.text.trim();
     this.logger.debug({ channel: message.channel, chatId: message.chatId, targetAgent: message.targetAgent }, "Inbound message received");
     if (message.systemCommand) return;
     if (message.targetAgent !== this.agentType) return;
     const parsed = parseInboundCommand(text, this.prefix);
-    const sessionId = `${this.agentType}-${message.chatId}`;
+    const sessionId = this.resolveSessionId(message) ?? `${this.agentType}-${message.sender.id}`;
     if (!parsed) {
       if (!this.supportsInboundPrompt) {
         this.logger.debug({ sessionId, textPreview: text.slice(0, 60) }, "Inbound prompt ignored: adapter does not support user input");
@@ -3794,6 +3828,19 @@ var ClaudeHookAgentAdapter = class extends BaseAgentAdapter {
       payload: enrichedPayload
     };
   }
+  /**
+   * Handle permission/question requests from Claude hook events.
+   *
+   * Called for both PreToolUse (regular tools) and PermissionRequest events.
+   * When toolName === 'AskUserQuestion', the request type is 'question' instead
+   * of 'permission', which causes channels to render question cards (single/multi
+   * select) instead of permission cards (Allow/Deny).
+   *
+   * evaluateInteraction blocks until the user responds via a channel. The response
+   * is returned to Claude as part of the HTTP hook response body.
+   *
+   * See file header for full flow diagrams.
+   */
   async processPermissionRequest(eventType, payload, requestId) {
     const sessionId = typeof payload.session_id === "string" ? payload.session_id : void 0;
     const toolName = typeof payload.tool_name === "string" ? payload.tool_name : "unknown";
@@ -4580,6 +4627,8 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
   defaultModel;
   defaultPermissionMode;
   static VALID_PERMISSION_MODES = ["default", "acceptEdits", "bypassPermissions", "plan"];
+  /** Maps sender.id → real Claude session_id for stable multi-turn sessions */
+  senderSessionMap = /* @__PURE__ */ new Map();
   constructor(options) {
     super({ bus: options.bus, bridge: options.bridge, logger: options.logger });
     this.token = options.token;
@@ -4630,6 +4679,13 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
       this.logger.info("Claude session scanner registered");
     }
   }
+  /**
+   * Return the real Claude session_id if this sender already has an active session.
+   * This makes multi-turn conversations stable across turns.
+   */
+  resolveSessionId(message) {
+    return this.senderSessionMap.get(message.sender.id);
+  }
   async createTransportState(opts) {
     const sessionId = opts.sessionId ?? `claude-${randomUUID2().slice(0, 8)}`;
     const chatId = opts.chatId ?? sessionId;
@@ -4664,7 +4720,8 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
       chatId,
       channel,
       cwd,
-      permissionMode: this.defaultPermissionMode
+      permissionMode: this.defaultPermissionMode,
+      senderId: opts.metadata?.senderId
     };
     this.transports.set(sessionId, state);
     this.emitEvent(EventNormalizer.sessionStart(sessionId, this.agentType, this.transportType, {
@@ -4673,7 +4730,7 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
       cwd,
       ...opts.metadata
     }));
-    this.consumeQueryMessages(q, sessionId, state).catch((err) => {
+    this.consumeQueryMessages(q, state).catch((err) => {
       this.logger.error({ sessionId, error: err }, "Query consumer error");
     });
     this.logger.info({ sessionId }, "Claude remote transport state created");
@@ -4687,6 +4744,9 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
     remoteState.query.kill("SIGTERM");
     remoteState.aggregator.reset();
     this.transports.delete(sessionId);
+    if (remoteState.senderId) {
+      this.senderSessionMap.delete(remoteState.senderId);
+    }
     this.emitEvent(EventNormalizer.sessionEnd(sessionId, this.agentType, this.transportType, "close"));
   }
   async sendCommand(state, command) {
@@ -4728,13 +4788,13 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
     }
   }
   // === Internal ===
-  async consumeQueryMessages(q, sessionId, state) {
+  async consumeQueryMessages(q, state) {
     try {
       for await (const msg of q) {
-        await this.handleSdkMessage(msg, sessionId, state);
+        await this.handleSdkMessage(msg, state);
       }
     } catch (err) {
-      this.logger.error({ sessionId, error: err }, "Claude remote stream ended with error");
+      this.logger.error({ sessionId: state.sessionId, error: err }, "Claude remote stream ended with error");
       this.bus.publishOutbound({
         channel: state.channel,
         chatId: state.chatId,
@@ -4743,21 +4803,35 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
     } finally {
       state.aggregator.reset();
       state.turnInProgress = false;
-      this.transports.delete(sessionId);
-      this.emitEvent(EventNormalizer.sessionEnd(sessionId, this.agentType, this.transportType, "stream_ended"));
+      this.transports.delete(state.sessionId);
+      this.emitEvent(EventNormalizer.sessionEnd(state.sessionId, this.agentType, this.transportType, "stream_ended"));
     }
   }
-  async handleSdkMessage(msg, sessionId, state) {
+  async handleSdkMessage(msg, state) {
+    const sessionId = state.sessionId;
     switch (msg.type) {
       case "system": {
         const system = msg;
         if (system.subtype === "init" && system.session_id) {
-          this.logger.info({ sessionId, claudeSessionId: system.session_id }, "Claude session initialized");
-          this.bridge.updateSessionInfo(sessionId, {
+          const claudeSessionId = system.session_id;
+          this.logger.info({ sessionId, claudeSessionId }, "Claude session initialized");
+          if (claudeSessionId !== sessionId) {
+            const renamed = this.bridge.renameSessionId(sessionId, claudeSessionId);
+            if (renamed) {
+              this.transports.delete(sessionId);
+              state.sessionId = claudeSessionId;
+              this.transports.set(claudeSessionId, state);
+              this.logger.info({ oldId: sessionId, newId: claudeSessionId }, "Session renamed to Claude session_id");
+            }
+          }
+          this.bridge.updateSessionInfo(claudeSessionId, {
             model: system.model,
             slashCommands: system.slash_commands,
             permissionMode: state.permissionMode
           });
+          if (state.senderId) {
+            this.senderSessionMap.set(state.senderId, claudeSessionId);
+          }
         }
         break;
       }
@@ -4810,7 +4884,9 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
             durationMs: result.duration_ms,
             usage: result.usage ? {
               inputTokens: result.usage.input_tokens,
-              outputTokens: result.usage.output_tokens
+              outputTokens: result.usage.output_tokens,
+              cacheReadInputTokens: result.usage.cache_read_input_tokens,
+              cacheCreationInputTokens: result.usage.cache_creation_input_tokens
             } : void 0
           })
         );
@@ -4829,6 +4905,18 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
       }
     }
   }
+  /**
+   * Handle tool permission requests from the Claude SDK.
+   *
+   * The SDK calls this callback when Claude wants to run a tool. We block
+   * the Promise until the user responds via a channel (Feishu/Telegram).
+   *
+   * Resolution values:
+   * - allow → { behavior: 'allow', updatedInput? }
+   * - deny  → { behavior: 'deny', message }
+   *
+   * See file header for full flow diagram.
+   */
   async handleCanCallTool(sessionId, toolName, toolInput, signal) {
     const state = this.transports.get(sessionId);
     if (!state) {
@@ -4873,6 +4961,21 @@ var ClaudeRemoteAgentAdapter = class _ClaudeRemoteAgentAdapter extends BaseAgent
       });
     });
   }
+  /**
+   * Handle question requests from the Claude SDK (AskUserQuestion tool).
+   *
+   * The SDK calls this callback when Claude runs AskUserQuestion. We block
+   * the Promise until the user selects an answer via a channel.
+   *
+   * For multi-select questions, the interaction-utils wraps the response
+   * with updatedInput containing { answers: { [questionText]: answerValue } }.
+   *
+   * Resolution values:
+   * - answer → { action: 'answer', answer: string }
+   * - deny   → { action: 'deny', message }
+   *
+   * See file header for full flow diagram.
+   */
   async handleCanAnswerQuestion(sessionId, question, signal) {
     const state = this.transports.get(sessionId);
     if (!state) {
@@ -6259,25 +6362,16 @@ function sendJson(res, statusCode, data) {
 }
 function formatHookResponse(eventType, toolName, result) {
   const isAskUserQuestion = toolName === "AskUserQuestion";
-  if (isAskUserQuestion) {
+  const buildAskUserQuestionUpdatedInput = () => {
     const questions = result._toolInput?.questions;
     const question = questions?.[0];
     const selectedValueStr = result.selectedValues && result.selectedValues.length > 0 ? result.selectedValues.map(String).join(", ") : void 0;
     const answerValue = result.customInput ?? selectedValueStr ?? "";
-    const updatedInput = {
+    return {
       ...result._toolInput,
       answers: question?.question ? { [question.question]: answerValue } : {}
     };
-    return JSON.stringify({
-      hookSpecificOutput: {
-        hookEventName: "PermissionRequest",
-        decision: {
-          behavior: "allow",
-          updatedInput
-        }
-      }
-    });
-  }
+  };
   if (eventType === "PermissionRequest") {
     let updatedPermissions;
     if (result.permissionUpdates && result.permissionUpdates.length > 0) {
@@ -6290,27 +6384,36 @@ function formatHookResponse(eventType, toolName, result) {
         ...rule.directories && { directories: rule.directories }
       }));
     }
+    const decision = {
+      behavior: result.action === "select" ? "allow" : result.action,
+      ...result.message !== void 0 && { message: result.message },
+      ...result.selectedValues !== void 0 && {
+        data: result.selectedValues.map(String).join(", ")
+      },
+      ...updatedPermissions !== void 0 && { updatedPermissions }
+    };
+    if (isAskUserQuestion) {
+      decision.updatedInput = buildAskUserQuestionUpdatedInput();
+    }
     return JSON.stringify({
       hookSpecificOutput: {
         hookEventName: "PermissionRequest",
-        decision: {
-          behavior: result.action === "select" ? "allow" : result.action,
-          ...result.message !== void 0 && { message: result.message },
-          ...result.selectedValues !== void 0 && {
-            data: result.selectedValues.map(String).join(", ")
-          },
-          ...updatedPermissions !== void 0 && { updatedPermissions }
-        }
+        decision
       }
     });
   }
-  return JSON.stringify({
-    accepted: ["allow", "select", "confirm"].includes(result.action),
-    message: result.message,
-    ...result.selectedValues !== void 0 && {
-      data: result.selectedValues.map(String).join(", ")
-    }
-  });
+  const permissionDecision = result.action === "allow" ? "allow" : "deny";
+  const hookSpecificOutput = {
+    hookEventName: "PreToolUse",
+    permissionDecision
+  };
+  if (result.message !== void 0) {
+    hookSpecificOutput.permissionDecisionReason = result.message;
+  }
+  if (isAskUserQuestion) {
+    hookSpecificOutput.updatedInput = buildAskUserQuestionUpdatedInput();
+  }
+  return JSON.stringify({ hookSpecificOutput });
 }
 function setupRoutes(httpServer, gateway, getClientCount) {
   httpServer.registerRoute("GET", "/health", (_req, res) => {
@@ -9799,6 +9902,33 @@ function getEventTitle(eventType) {
   }
 }
 
+// src/shared/format.ts
+init_esm_shims();
+function formatDuration3(ms) {
+  if (ms === void 0 || ms < 0) return "-";
+  if (ms < 1e3) return `${ms}ms`;
+  if (ms < 6e4) return `${Math.round(ms / 1e3)}s`;
+  if (ms < 36e5) return `${Math.round(ms / 6e4)}m`;
+  const hours = Math.floor(ms / 36e5);
+  const minutes = Math.round(ms % 36e5 / 6e4);
+  if (minutes === 0) return `${hours}h`;
+  return `${hours}h${minutes}m`;
+}
+function formatTokenCount(n) {
+  if (n === void 0 || n < 0) return "-";
+  if (n < 1e3) return `${n}`;
+  if (n < 1e6) {
+    const val2 = n / 1e3;
+    return `${stripZeroDecimal(val2)}k`;
+  }
+  const val = n / 1e6;
+  return `${stripZeroDecimal(val)}M`;
+}
+function stripZeroDecimal(val) {
+  const fixed = val.toFixed(1);
+  return fixed.endsWith(".0") ? fixed.slice(0, -2) : fixed;
+}
+
 // src/adapters/channels/telegram/formatter.ts
 var TelegramFormatter = class {
   /**
@@ -9914,6 +10044,7 @@ var TelegramFormatter = class {
       case "turn:finished":
         return this.formatFinished(
           title,
+          context.model || context.agentType,
           context.durationMs,
           context.usage?.inputTokens,
           context.usage?.outputTokens,
@@ -9949,17 +10080,19 @@ var TelegramFormatter = class {
   /**
    * 格式化结果通知消息
    */
-  formatFinished(title, durationMs, inputTokens, outputTokens, result) {
+  formatFinished(title, model, durationMs, inputTokens, outputTokens, result) {
     const lines = [
       `${this.escape(title)}`,
       ""
     ];
+    if (model) {
+      lines.push(`<b>Model:</b> ${this.escape(model)}`);
+    }
     if (durationMs !== void 0) {
-      const seconds = (durationMs / 1e3).toFixed(1);
-      lines.push(`<b>Duration:</b> ${this.escape(seconds)}s`);
+      lines.push(`<b>Duration:</b> ${this.escape(formatDuration3(durationMs))}`);
     }
     if (inputTokens !== void 0 && outputTokens !== void 0) {
-      lines.push(`<b>Tokens:</b> in ${inputTokens} / out ${outputTokens}`);
+      lines.push(`<b>Tokens:</b> ${formatTokenCount(inputTokens)}\u2191 / ${formatTokenCount(outputTokens)}\u2193`);
     }
     if (result) {
       lines.push("", "<b>Result:</b>");
@@ -10889,7 +11022,8 @@ var FeishuClient = class {
         userId: operator?.open_id,
         messageId: context?.open_message_id,
         chatId: context?.open_chat_id,
-        optionId: value?.optionId
+        optionId: value?.optionId,
+        checked: actionObj?.checked
       };
       await this.cardActionHandler(cardAction);
     } catch (error2) {
@@ -11335,7 +11469,7 @@ var FeishuChannel = class extends (_a4 = BaseChannel) {
         { text: "\u274C Deny", type: "danger_filled", value: "reject", confirm: { title: "\u786E\u8BA4\u62D2\u7EDD", text: "\u786E\u8BA4\u62D2\u7EDD\u8BE5\u5DE5\u5177\u8C03\u7528\uFF1F" } },
         { text: "\u{1F513} Always Allow", type: "default", value: "always_allow", confirm: { title: "\u786E\u8BA4\u603B\u662F\u5141\u8BB8", text: "\u603B\u662F\u5141\u8BB8\u5C06\u653E\u884C\u8BE5\u5DE5\u5177\u7684\u6240\u6709\u8C03\u7528\uFF0C\u8BF7\u786E\u8BA4\u3002" } }
       ];
-      const cardContent = this.formatter.formatPermissionCard({ title: this.getTitleForContext(message.context), content, buttons });
+      const cardContent = this.formatter.formatPermissionCard({ title: this.getTitleForContext(message.context), content, buttons, requestId });
       await this.sendCardRaw(cardContent, message);
     } else if (eventType === "question:request") {
       const question = interaction?.question;
@@ -11348,7 +11482,7 @@ var FeishuChannel = class extends (_a4 = BaseChannel) {
           question.options.map((opt) => ({ id: opt.id, value: opt.value }))
         );
       }
-      const cardContent = this.formatter.formatQuestionCard({ title: this.getTitleForContext(message.context), content, mode, items });
+      const cardContent = this.formatter.formatQuestionCard({ title: this.getTitleForContext(message.context), content, mode, items, requestId });
       await this.sendCardRaw(cardContent, message);
     } else {
       const content = message.context ? this.formatContextToMarkdown(message.context) : message.text || "";
@@ -11356,10 +11490,10 @@ var FeishuChannel = class extends (_a4 = BaseChannel) {
       if (message.context?.eventType === "turn:finished") {
         const finishedCtx = message.context;
         const model = finishedCtx.model || finishedCtx.agentType || "-";
-        const duration = finishedCtx.durationMs ? `${(finishedCtx.durationMs / 1e3).toFixed(1)}s` : "-";
+        const duration = formatDuration3(finishedCtx.durationMs);
         const outTokens = finishedCtx.usage?.outputTokens;
         const inTokens = finishedCtx.usage?.inputTokens;
-        const tokens = outTokens !== void 0 && inTokens !== void 0 ? `${outTokens}\u2191 ${inTokens}\u2193` : "-";
+        const tokens = outTokens !== void 0 && inTokens !== void 0 ? `${formatTokenCount(inTokens)}\u2191 ${formatTokenCount(outTokens)}\u2193` : "-";
         meta = `${model} \xB7 ${duration} \xB7 ${tokens}`;
       }
       const cardContent = this.formatter.formatMessageCard({ title: this.getTitleForContext(message.context), content, meta });
@@ -11517,12 +11651,12 @@ var FeishuChannel = class extends (_a4 = BaseChannel) {
         this.pendingSelections.set(requestId, /* @__PURE__ */ new Set());
       }
       const selected = this.pendingSelections.get(requestId);
-      if (selected.has(optionId)) {
-        selected.delete(optionId);
-      } else {
+      if (data.checked) {
         selected.add(optionId);
+      } else {
+        selected.delete(optionId);
       }
-      this.logger.info({ requestId, userId, optionId, selectedCount: selected.size }, "[Channel] Checker toggled");
+      this.logger.info({ requestId, userId, optionId, checked: data.checked, selectedCount: selected.size }, "[Channel] Checker changed");
       return;
     }
     if (action === "submit") {
@@ -11669,20 +11803,10 @@ ${context.thinking}`;
 `;
         if (context.cwd) {
           md += `**WorkDir:** ${context.cwd}
-`;
-        }
-        md += `**Status:** Turn finished
-`;
-        if (context.durationMs) {
-          md += `**Duration:** ${(context.durationMs / 1e3).toFixed(1)}s
-`;
-        }
-        if (context.usage?.inputTokens !== void 0 && context.usage?.outputTokens !== void 0) {
-          md += `**Tokens:** in ${context.usage.inputTokens} / out ${context.usage.outputTokens}
 `;
         }
         if (context.lastAssistantMessage) {
-          md += `**Message:** ${context.lastAssistantMessage}`;
+          md += `${context.lastAssistantMessage}`;
         }
         break;
       case "tool:post":