@clawos-dev/clawd 0.2.133-beta.272.de77151 → 0.2.133-beta.274.531e8dc

package/dist/cli.cjs

@@ -35347,11 +35347,11 @@ function itemCompleted(item) {
 }
 function tokenUsage(usage) {
   if (!usage) return [];
-  const total = rec(usage.total);
-  if (!total) return [];
-  const i = num(total.inputTokens), o = num(total.outputTokens), c = num(total.cachedInputTokens);
+  const last = rec(usage.last);
+  if (!last) return [];
+  const i = num(last.inputTokens), o = num(last.outputTokens);
   const patch = {};
-  if (i !== void 0 && o !== void 0) patch.contextUsage = { inputTokens: i, outputTokens: o, ...c !== void 0 ? { cacheReadTokens: c } : {} };
+  if (i !== void 0 && o !== void 0) patch.contextUsage = { inputTokens: i, outputTokens: o };
   const w2 = num(usage.modelContextWindow);
   if (w2 !== void 0) patch.contextWindowSize = w2;
   return Object.keys(patch).length ? [{ kind: "meta_update", patch }] : [];
@@ -35373,17 +35373,20 @@ function num(v2) {
 // src/tools/codex-app-server-params.ts
 function resolveSandbox(ctx) {
   if (ctx.personaMode === "guest") throw new Error("codex \u6682\u4E0D\u652F\u6301 guest persona session\uFF1B\u8BF7\u7528 claude \u6216 owner");
-  if (ctx.personaMode === "owner") return "danger-full-access";
+  return "danger-full-access";
+}
+function resolveApprovalPolicy(ctx) {
   const m2 = ctx.permissionMode ?? "";
-  if (m2 === "") return "workspace-write";
-  if (m2 === "read-only" || m2 === "workspace-write" || m2 === "danger-full-access") return m2;
-  throw new Error(`unknown codex sandbox/permissionMode: ${m2}`);
+  if (m2 === "untrusted" || m2 === "on-failure" || m2 === "on-request" || m2 === "never") return m2;
+  return "on-request";
 }
 function threadStartParams(ctx) {
   return {
     cwd: ctx.cwd,
     sandbox: resolveSandbox(ctx),
-    approvalPolicy: ctx.personaMode === "owner" ? "never" : "on-request",
+    // persona 侧
+    approvalPolicy: resolveApprovalPolicy(ctx),
+    // 会话设置侧
     approvalsReviewer: "user",
     ...ctx.model ? { model: ctx.model } : {}
   };
@@ -35528,16 +35531,16 @@ ${text}` : text;
 var CODEX_MODELS = [
   { id: "", label: "Default", description: "codex \u9ED8\u8BA4 model(config.toml)", contextWindowSize: 258400, default: true }
 ];
-var CODEX_SANDBOX_MODES = [
-  { id: "read-only", label: "Read-only", description: "\u53EA\u8BFB" },
-  { id: "workspace-write", label: "Workspace", description: "\u53EF\u5199\u5DE5\u4F5C\u533A + \u672C\u5730\u547D\u4EE4(\u9ED8\u8BA4)" },
-  { id: "danger-full-access", label: "Full access", description: "\u65E0\u6C99\u7BB1(\u542B\u7F51\u7EDC)" }
+var CODEX_APPROVAL_PRESETS = [
+  { id: "untrusted", label: "Ask for approval", description: "\u51E0\u4E4E\u6BCF\u6761\u547D\u4EE4\u90FD\u95EE\u4F60\uFF08\u6700\u8C28\u614E\uFF09" },
+  { id: "on-request", label: "Approve for me", description: "\u6A21\u578B\u81EA\u5DF1\u5224\u65AD\uFF0C\u53EA\u5BF9\u9AD8\u98CE\u9669\u64CD\u4F5C\u95EE\u4F60\uFF08\u9ED8\u8BA4\uFF09" },
+  { id: "never", label: "Full Access", description: "\u4ECE\u4E0D\u8BE2\u95EE\uFF0C\u81EA\u4E3B\u6267\u884C" }
 ];
 var CODEX_CAPABILITIES = {
   tool: "codex",
   toolSessionIdLabel: "Codex Thread ID",
   models: CODEX_MODELS,
-  permissionModes: CODEX_SANDBOX_MODES,
+  permissionModes: CODEX_APPROVAL_PRESETS,
   // codex 不支持这些 clawd 功能(rewind 无 file-snapshot / 无子 agent / 无 TUI pty /
   // 无 observe 推送 / 无文件分享)；UI 据此 gate 入口。
   features: { rewind: false, subagents: false, tui: false, observe: false, fileSharing: false },
@@ -35553,10 +35556,10 @@ var CODEX_CAPABILITIES = {
     {
       name: "permissionMode",
       type: "select",
-      label: "Sandbox",
+      label: "Approval",
       scope: "core",
-      options: CODEX_SANDBOX_MODES.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })),
-      default: "workspace-write"
+      options: CODEX_APPROVAL_PRESETS.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })),
+      default: "on-request"
     }
   ]
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.133-beta.272.de77151",
+  "version": "0.2.133-beta.274.531e8dc",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",