@xyagent/cli 0.0.1

package/src-ext/runtime/codex/elicitationHandler.mjs

@@ -0,0 +1,91 @@
+// Codex（或任何 MCP server）→ client 的 `elicitation/create` 请求处理。
+//
+// 这是 MCP 2025-06-18 协议加入的请求。Codex 在较新版本会用它向我们请求用户
+// 确认（"这个命令能运行吗？"）。
+//
+// 协议细节：
+//   method: "elicitation/create"
+//   params: {
+//     message: string,
+//     requestedSchema?: { type: "object", ... }
+//   }
+//   response: { action: "accept"|"decline"|"cancel", content?: {...} }
+//
+// 我们的策略：
+//   - 通过 approvalGateway 把请求抛给 App（tool_approval_request 事件）
+//   - 阻塞直到 App 响应 tool_approval_response
+//   - 翻译 decision → MCP action：approve → accept, reject → decline
+//
+// 兼容性：老版本 Codex 不发 elicitation，handler 永远不会被触发 —— 死代码无副作用。
+// 老协议版本里也有 `exec_command_approval_request` 类似的自定义 codex/event 消息
+// —— 由 eventMapper 拦截（P5 未来补）。
+
+/**
+ * 注册 elicitation/create 处理器。
+ *
+ * @param {{ mcp: any, approvalGateway: any, onApprovalRequest: (info: any) => void, log: any }} opts
+ * @returns {() => void} 注销函数
+ */
+export function attachElicitationHandler({ mcp, approvalGateway, onApprovalRequest, log }) {
+  if (!mcp || !approvalGateway) {
+    throw new Error("attachElicitationHandler: mcp and approvalGateway required");
+  }
+  const eLog = log ? log.child({ comp: "approval", source: "elicit" }) : null;
+
+  const unregister = mcp.onRequest("elicitation/create", async (params) => {
+    const message = typeof params?.message === "string" ? params.message : "";
+    const schema = params?.requestedSchema || null;
+
+    eLog?.info("elicit.request", "codex elicitation received", {
+      message_len: message.length,
+      has_schema: !!schema,
+    });
+
+    const { requestId, promise } = approvalGateway.openRequest({
+      tool_name: "codex:elicitation",
+      tool_input: { message, requestedSchema: schema },
+      hook_event: "elicitation/create",
+    });
+
+    if (typeof onApprovalRequest === "function") {
+      try {
+        onApprovalRequest({
+          request_id: requestId,
+          tool_name: "codex:elicitation",
+          tool_input: { message, requestedSchema: schema },
+          hook_event: "elicitation/create",
+        });
+      } catch (err) {
+        eLog?.error("error.caught", "onApprovalRequest threw", {
+          where: "elicitation.onApprovalRequest",
+          err: err?.message || String(err),
+        });
+      }
+    }
+
+    let decision = "reject";
+    let reason = "cancelled";
+    try {
+      const out = await promise;
+      decision = out.decision === "approve" ? "approve" : "reject";
+      reason = out.reason || "";
+      eLog?.info("elicit.response", "elicitation resolved", {
+        request_id: requestId, decision, wait_ms: out.wait_ms,
+      });
+    } catch (err) {
+      eLog?.warn("elicit.cancelled", "elicitation cancelled", {
+        request_id: requestId,
+        err: err?.message || String(err),
+      });
+      // 返回 "cancel" 给 codex：表示用户放弃
+      return { action: "cancel", content: { reason: "cancelled by bridge shutdown" } };
+    }
+
+    return {
+      action: decision === "approve" ? "accept" : "decline",
+      content: reason ? { reason } : {},
+    };
+  });
+
+  return unregister;
+}

package/src-ext/runtime/codex/eventMapper.mjs

@@ -0,0 +1,154 @@
+// Codex `notifications/codex/event` 的 params.msg → agentlink relay event。
+//
+// 典型 msg.type（随 codex 版本可能改；未知类型返回 unknown，不 throw）：
+//   session_configured       → session_ready
+//   agent_message            → assistant_text
+//   agent_reasoning*         → thinking
+//   exec_command_begin       → tool_use (带 name="bash")
+//   exec_command_end         → tool_use_end
+//   task_started             → bridge_status {status:"thinking"}
+//   task_complete            → bridge_status {status:"idle"}
+//   token_count              → usage_snapshot (含 rate_limits + token 累加)
+//   turn_aborted / shutdown  → session_end
+//   error                    → error
+
+/**
+ * @param {any} msg
+ * @returns {{kind: string, payload: any} | null}
+ */
+export function mapCodexMsg(msg) {
+  if (!msg || typeof msg !== "object") return null;
+  const type = typeof msg.type === "string" ? msg.type : "";
+  switch (type) {
+    case "session_configured":
+      return {
+        kind: "session_ready",
+        payload: {
+          session_id: msg.session_id || msg.conversation_id || null,
+          model: msg.model || null,
+          codex_runtime: true,
+        },
+      };
+    case "agent_message":
+    case "agent_message_delta": {
+      const text = typeof msg.message === "string"
+        ? msg.message
+        : (typeof msg.text === "string" ? msg.text : "");
+      if (!text) return null;
+      return { kind: "assistant_text", payload: { text, delta: type.endsWith("_delta") } };
+    }
+    case "agent_message_content_delta": {
+      // codex 0.130.0+: streaming text fragment under msg.delta.
+      const text = typeof msg.delta === "string" ? msg.delta : "";
+      if (!text) return null;
+      return { kind: "assistant_text", payload: { text, delta: true } };
+    }
+    case "agent_reasoning":
+    case "agent_reasoning_delta":
+    case "agent_reasoning_section_break":
+    case "agent_reasoning_raw_content": {
+      const text = typeof msg.text === "string"
+        ? msg.text
+        : (typeof msg.content === "string" ? msg.content : "");
+      if (!text) return null;
+      return { kind: "thinking", payload: { text } };
+    }
+    case "exec_command_begin":
+      return {
+        kind: "tool_use",
+        payload: {
+          tool_id: msg.call_id || null,
+          name: "bash",
+          input: {
+            command: msg.command || "",
+            cwd: msg.cwd || null,
+          },
+          codex: true,
+        },
+      };
+    case "exec_command_end":
+      return {
+        kind: "tool_use_end",
+        payload: {
+          tool_id: msg.call_id || null,
+          exit_code: typeof msg.exit_code === "number" ? msg.exit_code : null,
+          duration_ms: typeof msg.duration_ms === "number" ? msg.duration_ms : null,
+          stdout_tail: typeof msg.stdout === "string" ? msg.stdout.slice(-1000) : null,
+          stderr_tail: typeof msg.stderr === "string" ? msg.stderr.slice(-1000) : null,
+        },
+      };
+    case "task_started":
+      // 注意：不占用 bridge_status —— 避免覆盖上线/下线指示。
+      // 用独立 kind "thinking_state"，app 可专门渲染打字动画。
+      return { kind: "thinking_state", payload: { thinking: true } };
+    case "task_complete":
+      return { kind: "thinking_state", payload: { thinking: false } };
+    case "token_count": {
+      // Codex 协议 TokenCountEvent（codex-rs/protocol/src/protocol.rs）
+      //   info.total_token_usage: TokenUsage  —— 累计值
+      //   info.last_token_usage:  TokenUsage  —— 本轮增量
+      //   info.model_context_window: i64
+      //   rate_limits: { primary/secondary/plan_type/rate_limit_reached_type, ... }
+      // 翻译成中性 usage_snapshot 事件；bridge 入口会把它喂给 usageReporter。
+      const info = (msg.info && typeof msg.info === "object") ? msg.info : null;
+      const totalUsage = info?.total_token_usage || null;
+      const rl = (msg.rate_limits && typeof msg.rate_limits === "object") ? msg.rate_limits : null;
+      return {
+        kind: "usage_snapshot",
+        payload: {
+          tokens: totalUsage ? {
+            input: intOrZero(totalUsage.input_tokens),
+            cached_input: intOrZero(totalUsage.cached_input_tokens),
+            output: intOrZero(totalUsage.output_tokens),
+            reasoning_output: intOrZero(totalUsage.reasoning_output_tokens),
+            total: intOrZero(totalUsage.total_tokens),
+          } : null,
+          context_window: intOrNull(info?.model_context_window),
+          rate_limits: rl ? {
+            primary: mapRateWindow(rl.primary),
+            secondary: mapRateWindow(rl.secondary),
+            plan_type: typeof rl.plan_type === "string" ? rl.plan_type : null,
+            reached_type: typeof rl.rate_limit_reached_type === "string" ? rl.rate_limit_reached_type : null,
+          } : null,
+        },
+      };
+    }
+    case "turn_aborted":
+      return { kind: "session_end", payload: { reason: "turn_aborted" } };
+    case "shutdown":
+      return { kind: "session_end", payload: { reason: "shutdown" } };
+    case "error":
+      return {
+        kind: "error",
+        payload: {
+          stage: "codex",
+          err: typeof msg.message === "string" ? msg.message : "(codex error)",
+          code: msg.code || null,
+        },
+      };
+    case "turn/plan/updated":
+      return {
+        kind: "plan_updated",
+        payload: {
+          turnId: msg.turnId || null,
+          explanation: typeof msg.explanation === "string" ? msg.explanation : null,
+          plan: Array.isArray(msg.plan) ? msg.plan : [],
+        },
+      };
+    default:
+      return { kind: "unknown", payload: { raw_type: type } };
+  }
+}
+
+function intOrZero(v) { return Number.isFinite(v) ? Math.trunc(v) : 0; }
+function intOrNull(v) { return Number.isFinite(v) ? Math.trunc(v) : null; }
+
+function mapRateWindow(w) {
+  if (!w || typeof w !== "object") return null;
+  if (!Number.isFinite(w.used_percent)) return null;
+  return {
+    used_percent: Number(w.used_percent),
+    window_minutes: Number.isFinite(w.window_minutes) ? Math.trunc(w.window_minutes) : 0,
+    resets_at: Number.isFinite(w.resets_at) ? Math.trunc(w.resets_at) : 0,
+  };
+}