@cnwenf/occ 2.1.326 → 2.1.328

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.326","BINARY_NAME":"occ","BUILD_TIME":"2026-09-09T18:21:27.996Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.328","BINARY_NAME":"occ","BUILD_TIME":"2026-09-10T19:48:17.557Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -60319,6 +60319,102 @@ var init_settings = __esm(() => {
   EMPTY_RESULT = Object.freeze({ settings: {}, errors: [] });
 });
 
+// src/utils/settings/sanitizeAllowlists.ts
+function issueDetail(error49) {
+  const issue2 = error49.issues[0];
+  if (issue2 === undefined)
+    return "failed validation";
+  return issue2.path.length > 0 ? `${issue2.path.join(".")}: ${issue2.message}` : issue2.message;
+}
+function validateAllowlistEntry(key, entry) {
+  if (key === "allowedChannelPlugins") {
+    if (typeof entry === "string") {
+      const at = entry.indexOf("@");
+      const plugin = entry.slice(0, at);
+      const marketplace = entry.slice(at + 1);
+      if (at > 0 && marketplace.length > 0) {
+        return {
+          ok: true,
+          value: { marketplace, plugin },
+          notice: `"allowedChannelPlugins" entry "${entry}" was accepted; prefer the documented object form {"plugin": "${plugin}", "marketplace": "${marketplace}"}.`
+        };
+      }
+    }
+    const parsed2 = CHANNEL_PLUGIN_ENTRY.safeParse(entry);
+    return parsed2.success ? { ok: true, value: parsed2.data } : { ok: false, detail: issueDetail(parsed2.error) };
+  }
+  const parsed = STRING_ENTRY.safeParse(entry);
+  return parsed.success ? { ok: true, value: parsed.data } : { ok: false, detail: issueDetail(parsed.error) };
+}
+function sanitizeSecurityAllowlists(data, filePath) {
+  if (!data || typeof data !== "object")
+    return [];
+  const obj = data;
+  const warnings = [];
+  for (const { key, emptyReason } of ALLOWLIST_SPECS) {
+    if (!(key in obj))
+      continue;
+    const raw = obj[key];
+    if (!Array.isArray(raw)) {
+      obj[key] = [];
+      warnings.push({
+        file: filePath,
+        path: key,
+        message: `"${key}" was present but invalid; enforcing an empty allowlist (${emptyReason}) until it is fixed.`,
+        invalidValue: raw
+      });
+      continue;
+    }
+    const valid = [];
+    for (const [index2, entry] of raw.entries()) {
+      const result = validateAllowlistEntry(key, entry);
+      if (result.ok) {
+        valid.push(result.value);
+        if (result.notice !== undefined) {
+          warnings.push({
+            file: filePath,
+            path: `${key}[${index2}]`,
+            message: result.notice
+          });
+        }
+      } else {
+        warnings.push({
+          file: filePath,
+          path: `${key}[${index2}]`,
+          message: `Invalid entry was ignored: ${result.detail}`,
+          invalidValue: entry
+        });
+      }
+    }
+    if (raw.length > 0 && valid.length === 0) {
+      warnings.push({
+        file: filePath,
+        path: key,
+        message: `Every entry of "${key}" was invalid; enforcing an empty allowlist (${emptyReason}) until it is fixed.`
+      });
+    }
+    obj[key] = valid;
+  }
+  return warnings;
+}
+var STRING_ENTRY, CHANNEL_PLUGIN_ENTRY, ALLOWLIST_SPECS;
+var init_sanitizeAllowlists = __esm(() => {
+  init_v4();
+  STRING_ENTRY = exports_external.string();
+  CHANNEL_PLUGIN_ENTRY = exports_external.object({
+    marketplace: exports_external.string(),
+    plugin: exports_external.string()
+  });
+  ALLOWLIST_SPECS = [
+    { key: "allowedHttpHookUrls", emptyReason: "no HTTP hooks may run" },
+    {
+      key: "httpHookAllowedEnvVars",
+      emptyReason: "no environment variables may be interpolated into HTTP hook headers"
+    },
+    { key: "allowedChannelPlugins", emptyReason: "no channel plugins admitted" }
+  ];
+});
+
 // src/utils/settings/settings.ts
 var exports_settings = {};
 __export(exports_settings, {
@@ -60455,12 +60551,19 @@ function parseSettingsFileUncached(path9) {
     }
     const data = safeParseJSON(content, false);
     const ruleWarnings = filterInvalidPermissionRules(data, path9);
+    const allowlistWarnings = sanitizeSecurityAllowlists(data, path9);
     const result = SettingsSchema().safeParse(data);
     if (!result.success) {
       const errors3 = formatZodError(result.error, path9);
-      return { settings: null, errors: [...ruleWarnings, ...errors3] };
+      return {
+        settings: null,
+        errors: [...ruleWarnings, ...allowlistWarnings, ...errors3]
+      };
     }
-    return { settings: result.data, errors: ruleWarnings };
+    return {
+      settings: result.data,
+      errors: [...ruleWarnings, ...allowlistWarnings]
+    };
   } catch (error49) {
     handleFileSystemError(error49, path9);
     return { settings: null, errors: [] };
@@ -61086,6 +61189,7 @@ var init_settings2 = __esm(() => {
   init_managedPath();
   init_settings();
   init_settingsCache();
+  init_sanitizeAllowlists();
   init_types2();
   init_validation2();
   MAX_SETTINGS_FILE_BYTES = 2 * 1024 * 1024;
@@ -101087,7 +101191,8 @@ var init_aliases = __esm(() => {
     "fable",
     "sonnet[1m]",
     "opus[1m]",
-    "opusplan"
+    "opusplan",
+    "opusplan[1m]"
   ];
   MODEL_FAMILY_ALIASES = ["sonnet", "opus", "haiku", "fable"];
 });
@@ -101501,6 +101606,9 @@ function renderModelSetting(setting) {
   if (setting === "opusplan") {
     return "Opus Plan";
   }
+  if (setting === "opusplan[1m]") {
+    return renderModelName(parseUserSpecifiedModel(setting));
+  }
   if (isModelAlias(setting)) {
     return capitalize(setting);
   }
@@ -266180,6 +266288,9 @@ async function* withRetry(getClient2, operation, options) {
   let persistentAttempt = 0;
   let apiKeyHelperAuthRetries = 0;
   const API_KEY_HELPER_AUTH_RETRY_CAP = 2;
+  let awsAuthRetries = 0;
+  let gcpAuthRetries = 0;
+  const CLOUD_AUTH_RETRY_CAP = 2;
   let mediaStrips = 0;
   const MAX_MEDIA_STRIPS = 20;
   for (let attempt = 1;attempt <= maxRetries + 1; attempt++) {
@@ -266308,6 +266419,25 @@ async function* withRetry(getClient2, operation, options) {
         }
         apiKeyHelperAuthRetries++;
       }
+      const cloudCredentialKind = classifyCloudCredentialError(error52);
+      if (cloudCredentialKind === "AWS" || getAPIProvider() !== "firstParty" && isBedrockAuthError(error52)) {
+        if (awsAuthRetries >= CLOUD_AUTH_RETRY_CAP) {
+          logEvent2("api_request", {
+            reason: "api_request_aws_auth_exhausted"
+          });
+          throw new CannotRetryError(error52, retryContext);
+        }
+        awsAuthRetries++;
+      }
+      if (cloudCredentialKind === "Google Cloud" || getAPIProvider() !== "firstParty" && isVertexAuthError(error52)) {
+        if (gcpAuthRetries >= CLOUD_AUTH_RETRY_CAP) {
+          logEvent2("api_request", {
+            reason: "api_request_gcp_auth_exhausted"
+          });
+          throw new CannotRetryError(error52, retryContext);
+        }
+        gcpAuthRetries++;
+      }
       const handledCloudAuthError = handleAwsCredentialError(error52) || handleGcpCredentialError(error52);
       if (!handledCloudAuthError && (!(error52 instanceof APIError) || !shouldRetry(error52))) {
         throw new CannotRetryError(error52, retryContext);
@@ -266470,6 +266600,34 @@ function getFallbackTriggerReason(error52) {
 function isOAuthTokenRevokedError(error52) {
   return error52 instanceof APIError && error52.status === 403 && (error52.message?.includes("OAuth token has been revoked") ?? false);
 }
+function findInErrorCauseChain(error52, predicate, maxDepth = 5) {
+  let current = error52;
+  for (let depth = 0;depth < maxDepth; depth++) {
+    if (!(current instanceof Error))
+      return;
+    if (predicate(current))
+      return current;
+    current = current.cause;
+  }
+  return;
+}
+function errorChainMessageIncludes(error52, needles) {
+  return findInErrorCauseChain(error52, (e4) => needles.some((needle) => e4.message.includes(needle))) !== undefined;
+}
+function isGoogleCloudEnv() {
+  return !!(process.env.CLAUDE_CODE_USE_VERTEX || process.env.CLAUDE_CODE_USE_ANTHROPIC_GOOGLE_CLOUD);
+}
+function classifyCloudCredentialError(error52) {
+  if (error52 instanceof APIError && error52.status !== undefined)
+    return null;
+  if (findInErrorCauseChain(error52, (e4) => e4.name === "CredentialsProviderError") !== undefined) {
+    return "AWS";
+  }
+  if (isGoogleCloudEnv() && errorChainMessageIncludes(error52, GOOGLE_CREDENTIAL_CLASSIFIER_MESSAGES)) {
+    return "Google Cloud";
+  }
+  return null;
+}
 function isBedrockAuthError(error52) {
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_BEDROCK)) {
     if (isAwsCredentialsProviderError(error52) || error52 instanceof APIError && error52.status === 403) {
@@ -266486,10 +266644,11 @@ function handleAwsCredentialError(error52) {
   return false;
 }
 function isGoogleAuthLibraryCredentialError(error52) {
-  if (!(error52 instanceof Error))
-    return false;
-  const msg = error52.message;
-  return msg.includes("Could not load the default credentials") || msg.includes("Could not refresh access token") || msg.includes("invalid_grant");
+  return errorChainMessageIncludes(error52, [
+    ...GOOGLE_CREDENTIAL_CLASSIFIER_MESSAGES,
+    GOOGLE_OAUTH_FAILURE_MESSAGE,
+    GOOGLE_TOKEN_REFRESH_FAILURE_MESSAGE
+  ]);
 }
 function isVertexAuthError(error52) {
   if (isEnvTruthy(process.env.CLAUDE_CODE_USE_VERTEX)) {
@@ -266589,7 +266748,7 @@ function getRateLimitResetDelayMs(error52) {
     return null;
   return Math.min(delayMs, PERSISTENT_RESET_CAP_MS);
 }
-var abortError = () => new APIUserAbortError, DEFAULT_MAX_RETRIES2 = 10, FLOOR_OUTPUT_TOKENS = 3000, MAX_529_RETRIES = 3, BASE_DELAY_MS = 500, MAX_RETRIES_CLAMP = 15, WATCHDOG_DEFAULT_MAX_RETRIES = 300, maxRetriesClampWarned = false, FOREGROUND_529_RETRY_SOURCES, PERSISTENT_MAX_BACKOFF_MS, PERSISTENT_RESET_CAP_MS, HEARTBEAT_INTERVAL_MS = 30000, CannotRetryError, FallbackTriggeredError, DEFAULT_FAST_MODE_FALLBACK_HOLD_MS, SHORT_RETRY_THRESHOLD_MS, MIN_COOLDOWN_MS;
+var abortError = () => new APIUserAbortError, DEFAULT_MAX_RETRIES2 = 10, FLOOR_OUTPUT_TOKENS = 3000, MAX_529_RETRIES = 3, BASE_DELAY_MS = 500, MAX_RETRIES_CLAMP = 15, WATCHDOG_DEFAULT_MAX_RETRIES = 300, maxRetriesClampWarned = false, FOREGROUND_529_RETRY_SOURCES, PERSISTENT_MAX_BACKOFF_MS, PERSISTENT_RESET_CAP_MS, HEARTBEAT_INTERVAL_MS = 30000, CannotRetryError, FallbackTriggeredError, GOOGLE_CREDENTIAL_CLASSIFIER_MESSAGES, GOOGLE_OAUTH_FAILURE_MESSAGE = "Failed to acquire Google OAuth credentials.", GOOGLE_TOKEN_REFRESH_FAILURE_MESSAGE = "Could not refresh access token", DEFAULT_FAST_MODE_FALLBACK_HOLD_MS, SHORT_RETRY_THRESHOLD_MS, MIN_COOLDOWN_MS;
 var init_withRetry = __esm(() => {
   init_featureFlags();
   init_sdk();
@@ -266655,6 +266814,12 @@ var init_withRetry = __esm(() => {
       this.name = "FallbackTriggeredError";
     }
   };
+  GOOGLE_CREDENTIAL_CLASSIFIER_MESSAGES = [
+    "Could not load the default credentials",
+    "invalid_grant",
+    "invalid_client",
+    "unauthorized_client"
+  ];
   DEFAULT_FAST_MODE_FALLBACK_HOLD_MS = 30 * 60 * 1000;
   SHORT_RETRY_THRESHOLD_MS = 20 * 1000;
   MIN_COOLDOWN_MS = 10 * 60 * 1000;
@@ -377711,7 +377876,8 @@ function getSimpleSandboxSection() {
   ];
   const items = [
     ...sandboxOverrideItems,
-    "For temporary files, always use the `$TMPDIR` environment variable. TMPDIR is automatically set to the correct sandbox-writable directory in sandbox mode. Do NOT use `/tmp` directly - use `$TMPDIR` instead."
+    "For temporary files, always use the `$TMPDIR` environment variable. TMPDIR is automatically set to the correct sandbox-writable directory in sandbox mode. Do NOT use `/tmp` directly - use `$TMPDIR` instead.",
+    "If a clipboard utility such as `pbcopy`, `xclip`, or `wl-copy` fails inside the sandbox and the user wants the text on their clipboard, put the text in a fenced code block in your response and tell them to run `/copy` (it copies from outside the sandbox; when the picker appears they can select just that block), rather than writing a file for them to copy manually."
   ];
   return [
     "",
@@ -383971,6 +384137,8 @@ var init_BashTool = __esm(() => {
     timeout: semanticNumber(exports_external.number().optional()).describe(`Optional timeout in milliseconds (max ${getMaxTimeoutMs()})`),
     description: exports_external.string().optional().describe(`Clear, concise description of what this command does in active voice. Never use words like "complex" or "risk" in the description - just describe what it does.
 
+Say what the command does in plain words: do not echo the command's text, its flags, or file paths - the user reads this description, often without seeing the command.
+
 For simple commands (git, npm, standard CLI tools), keep it brief (5-10 words):
 - ls \u2192 "List files in current directory"
 - git status \u2192 "Show working tree status"
@@ -474592,6 +474760,9 @@ function KeybindingSetup({
   });
   const [isReload, setIsReload] = import_react83.useState(false);
   useKeybindingWarnings(warnings, isReload);
+  const {
+    addNotification
+  } = useNotifications();
   const pendingChordRef = import_react83.useRef(null);
   const [pendingChord, setPendingChordState] = import_react83.useState(null);
   const chordTimeoutRef = import_react83.useRef(null);
@@ -474612,15 +474783,24 @@ function KeybindingSetup({
   const setPendingChord = import_react83.useCallback((pending) => {
     clearChordTimeout();
     if (pending !== null) {
-      chordTimeoutRef.current = setTimeout((pendingChordRef_0, setPendingChordState_0) => {
+      chordTimeoutRef.current = setTimeout((pendingChordRef_0, setPendingChordState_0, addNotification_0) => {
         logForDebugging("[keybindings] Chord timeout - cancelling");
+        const timedOutChord = pendingChordRef_0.current;
+        if (timedOutChord !== null) {
+          addNotification_0({
+            key: "chord-timeout",
+            text: `${chordToDisplayString(timedOutChord, getPlatform())} cancelled \u2014 no next key within ${CHORD_TIMEOUT_MS / 1000}s`,
+            priority: "immediate",
+            timeoutMs: 3000
+          });
+        }
         pendingChordRef_0.current = null;
         setPendingChordState_0(null);
-      }, CHORD_TIMEOUT_MS, pendingChordRef, setPendingChordState);
+      }, CHORD_TIMEOUT_MS, pendingChordRef, setPendingChordState, addNotification);
     }
     pendingChordRef.current = pending;
     setPendingChordState(pending);
-  }, [clearChordTimeout]);
+  }, [clearChordTimeout, addNotification]);
   import_react83.useEffect(() => {
     initializeKeybindingWatcher();
     const unsubscribe2 = subscribeToKeybindingChanges((result_0) => {
@@ -474681,44 +474861,43 @@ function ChordInterceptor(t0) {
       const contexts = [...handlerContexts, ...activeContexts, "Global"];
       const wasInChord = pendingChordRef.current !== null;
       const result = resolveKeyWithChordState(input, key3, contexts, bindings, pendingChordRef.current);
-      bb23:
-        switch (result.type) {
-          case "chord_started": {
-            setPendingChord(result.pending);
-            event.stopImmediatePropagation();
-            break bb23;
-          }
-          case "match": {
-            setPendingChord(null);
-            if (wasInChord) {
-              const contextsSet = new Set(contexts);
-              if (registry2) {
-                const handlers_0 = registry2.get(result.action);
-                if (handlers_0 && handlers_0.size > 0) {
-                  for (const registration_0 of handlers_0) {
-                    if (contextsSet.has(registration_0.context)) {
-                      registration_0.handler();
-                      event.stopImmediatePropagation();
-                      break;
-                    }
+      switch (result.type) {
+        case "chord_started": {
+          setPendingChord(result.pending);
+          event.stopImmediatePropagation();
+          break;
+        }
+        case "match": {
+          setPendingChord(null);
+          if (wasInChord) {
+            const contextsSet = new Set(contexts);
+            if (registry2) {
+              const handlers_0 = registry2.get(result.action);
+              if (handlers_0 && handlers_0.size > 0) {
+                for (const registration_0 of handlers_0) {
+                  if (contextsSet.has(registration_0.context)) {
+                    registration_0.handler();
+                    event.stopImmediatePropagation();
+                    break;
                   }
                 }
               }
             }
-            break bb23;
           }
-          case "chord_cancelled": {
-            setPendingChord(null);
-            event.stopImmediatePropagation();
-            break bb23;
-          }
-          case "unbound": {
-            setPendingChord(null);
-            event.stopImmediatePropagation();
-            break bb23;
-          }
-          case "none":
+          break;
+        }
+        case "chord_cancelled": {
+          setPendingChord(null);
+          event.stopImmediatePropagation();
+          break;
+        }
+        case "unbound": {
+          setPendingChord(null);
+          event.stopImmediatePropagation();
+          break;
         }
+        case "none":
+      }
     };
     $3[0] = activeContexts;
     $3[1] = bindings;
@@ -474733,11 +474912,12 @@ function ChordInterceptor(t0) {
   use_input_default(handleInput);
   return null;
 }
-var import_compiler_runtime112, import_react83, jsx_runtime132, CHORD_TIMEOUT_MS = 1000;
+var import_compiler_runtime112, import_react83, jsx_runtime132, CHORD_TIMEOUT_MS = 3000;
 var init_KeybindingProviderSetup = __esm(() => {
   init_notifications();
   init_ink2();
   init_debug();
+  init_platform2();
   init_stringUtils();
   init_KeybindingContext();
   init_loadUserBindings();
@@ -475475,7 +475655,7 @@ function deserializeMessagesWithInterruptDetection(serializedMessages) {
       turnInterruptionState = internalState;
     }
     const lastRelevantIdx = filteredMessages.findLastIndex((m5) => m5.type !== "system" && m5.type !== "progress");
-    if (lastRelevantIdx !== -1 && filteredMessages[lastRelevantIdx].type === "user") {
+    if (lastRelevantIdx !== -1 && filteredMessages[lastRelevantIdx].type === "user" && !isCompleteLocalCommandTail(filteredMessages, lastRelevantIdx)) {
       filteredMessages.splice(lastRelevantIdx + 1, 0, createAssistantMessage({
         content: NO_RESPONSE_REQUESTED
       }));
@@ -475499,6 +475679,9 @@ function detectTurnInterruption(messages) {
     return { kind: "none" };
   }
   if (lastMessage.type === "user") {
+    if (isCompleteLocalCommandTail(messages, lastMessageIdx)) {
+      return { kind: "none" };
+    }
     if (lastMessage.isMeta || lastMessage.isCompactSummary) {
       return { kind: "none" };
     }
@@ -475538,6 +475721,43 @@ function isTerminalToolResult(result, messages, resultIdx) {
   }
   return false;
 }
+function classifyLocalCommandKind(message) {
+  const content = message.message?.content;
+  const text2 = Array.isArray(content) ? content.findLast((block) => block?.type === "text")?.text : typeof content === "string" ? content : undefined;
+  if (typeof text2 !== "string")
+    return;
+  return LOCAL_COMMAND_TAG_KINDS.find(([prefix]) => text2.startsWith(prefix))?.[1];
+}
+function localCommandBreadcrumbKind(message) {
+  if (message.type !== "user")
+    return;
+  if (message.promptSource !== undefined)
+    return;
+  const kind = classifyLocalCommandKind(message);
+  if (kind === "caveat" && message.isMeta !== true)
+    return;
+  return kind;
+}
+function isCompleteLocalCommandTail(messages, idx) {
+  if (localCommandBreadcrumbKind(messages[idx]) === undefined)
+    return false;
+  let seenRecord = false;
+  let allMetaUsers = true;
+  for (let i6 = idx;i6 >= 0; i6--) {
+    const msg = messages[i6];
+    if (msg.type === "system" || msg.type === "progress" || msg.type === "attachment") {
+      continue;
+    }
+    const kind = localCommandBreadcrumbKind(msg);
+    if (kind === "caveat")
+      return true;
+    if (kind === undefined || seenRecord)
+      break;
+    seenRecord = kind === "record";
+    allMetaUsers = allMetaUsers && msg.type === "user" && msg.isMeta === true;
+  }
+  return allMetaUsers;
+}
 function restoreSkillStateFromMessages(messages) {
   for (const message of messages) {
     if (message.type !== "attachment") {
@@ -475655,11 +475875,12 @@ async function loadConversationForResume(source, sourceJsonlFile) {
     throw error52;
   }
 }
-var BRIEF_TOOL_NAME4, LEGACY_BRIEF_TOOL_NAME2, SEND_USER_FILE_TOOL_NAME3;
+var BRIEF_TOOL_NAME4, LEGACY_BRIEF_TOOL_NAME2, SEND_USER_FILE_TOOL_NAME3, LOCAL_COMMAND_TAG_KINDS;
 var init_conversationRecovery = __esm(() => {
   init_featureFlags();
   init_cwd2();
   init_state();
+  init_xml();
   init_ids();
   init_permissions();
   init_attachments2();
@@ -475672,6 +475893,12 @@ var init_conversationRecovery = __esm(() => {
   BRIEF_TOOL_NAME4 = feature("KAIROS") || feature("KAIROS_BRIEF") ? (init_prompt(), __toCommonJS(exports_prompt)).BRIEF_TOOL_NAME : null;
   LEGACY_BRIEF_TOOL_NAME2 = feature("KAIROS") || feature("KAIROS_BRIEF") ? (init_prompt(), __toCommonJS(exports_prompt)).LEGACY_BRIEF_TOOL_NAME : null;
   SEND_USER_FILE_TOOL_NAME3 = feature("KAIROS") ? (init_prompt8(), __toCommonJS(exports_prompt2)).SEND_USER_FILE_TOOL_NAME : null;
+  LOCAL_COMMAND_TAG_KINDS = [
+    [`<${COMMAND_NAME_TAG}>`, "record"],
+    [`<${LOCAL_COMMAND_STDOUT_TAG}>`, "output"],
+    [`<${LOCAL_COMMAND_STDERR_TAG}>`, "output"],
+    [`<${LOCAL_COMMAND_CAVEAT_TAG}>`, "caveat"]
+  ];
 });
 
 // src/services/api/filesApi.ts
@@ -612319,6 +612546,9 @@ function getCurrentTimestamp() {
   return new Date().toISOString();
 }
 function validatePathWithinBase(basePath, relativePath) {
+  if (process.platform !== "win32" && relativePath.includes("\\")) {
+    throw new Error(`Path traversal detected: "${relativePath}" would escape the base directory`);
+  }
   const resolvedPath = resolve51(basePath, relativePath);
   const normalizedBase = resolve51(basePath) + sep38;
   if (!resolvedPath.startsWith(normalizedBase) && resolvedPath !== resolve51(basePath)) {
@@ -714975,8 +715205,33 @@ var init_export2 = __esm(() => {
 // src/commands/model/model.tsx
 var exports_model2 = {};
 __export(exports_model2, {
+  saveModelAsDefault: () => saveModelAsDefault,
+  renderModelSaveFailureSuffix: () => renderModelSaveFailureSuffix,
   call: () => call78
 });
+import { homedir as homedir42 } from "os";
+function saveModelAsDefault(model) {
+  const {
+    error: error52
+  } = updateSettingsForSource("userSettings", {
+    model
+  });
+  return error52 ? {
+    kind: "failed",
+    error: error52
+  } : {
+    kind: "saved"
+  };
+}
+function renderModelSaveFailureSuffix(result) {
+  if (result.kind === "saved") {
+    return "";
+  }
+  const settingsPath = getSettingsFilePathForSource("userSettings") ?? "settings.json";
+  const displayPath = settingsPath.replace(homedir42(), "~");
+  const reason = result.error.message.startsWith("Invalid JSON syntax") ? "isn't valid JSON" : `can't be written (${result.error.message})`;
+  return ` \xB7 couldn't save it as your default: ${displayPath} ${reason}`;
+}
 function ModelPickerWrapper({ onDone }) {
   const mainLoopModel = useAppState((s4) => s4.mainLoopModel);
   const mainLoopModelForSession = useAppState((s4) => s4.mainLoopModelForSession);
@@ -715006,8 +715261,9 @@ function ModelPickerWrapper({ onDone }) {
       onDone("Model reset to default for this session");
       return;
     }
-    updateSettingsForSource("userSettings", { model });
-    let message = `Set model to ${source_default.bold(renderModelLabel(model))} and saved as your default for new sessions`;
+    const saveResult = saveModelAsDefault(model);
+    const isSaved = saveResult.kind === "saved";
+    let message = `Set model to ${source_default.bold(renderModelLabel(model))}${isSaved ? " and saved as your default for new sessions" : " for this session only"}`;
     if (effort !== undefined) {
       message = message + ` with ${source_default.bold(effort)} effort`;
     }
@@ -715027,6 +715283,7 @@ function ModelPickerWrapper({ onDone }) {
         }
       }
     }
+    message = message + renderModelSaveFailureSuffix(saveResult);
     if (isBilledAsExtraUsage(model, wasFastModeToggledOn === true, isOpus1mMergeEnabled())) {
       message = message + " \xB7 Billed as extra usage";
     }
@@ -715106,13 +715363,13 @@ function SetModelAndClose({
         return;
       }
       if (model && isOpus1mUnavailable(model)) {
-        onDone(`Opus 4.6 with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`, {
+        onDone(`Opus with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`, {
           display: "system"
         });
         return;
       }
       if (model && isSonnet1mUnavailable(model)) {
-        onDone(`Sonnet 4.6 with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`, {
+        onDone(`Sonnet with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`, {
           display: "system"
         });
         return;
@@ -715177,7 +715434,7 @@ function isOpus1mUnavailable(model) {
 }
 function isSonnet1mUnavailable(model) {
   const m5 = model.toLowerCase();
-  return !checkSonnet1mAccess() && (m5.includes("sonnet[1m]") || m5.includes("sonnet-4-6[1m]"));
+  return !checkSonnet1mAccess() && (m5.includes("sonnet[1m]") || m5.includes("sonnet-4-6[1m]") || m5.includes("sonnet-5[1m]") || m5.trim() === "opusplan[1m]");
 }
 function ShowModelAndClose(t0) {
   const {
@@ -718607,7 +718864,7 @@ var init_force_snip = __esm(() => {
 });
 
 // src/utils/effort/workflowSavePath.ts
-import { homedir as homedir42 } from "os";
+import { homedir as homedir43 } from "os";
 import { join as join159, sep as sep45 } from "path";
 function userWorkflowsDir2() {
   return join159(getClaudeConfigHomeDir(), "workflows");
@@ -718619,7 +718876,7 @@ function resolveWorkflowsDir(scope, cwd2) {
   return join159(cwd2, ".claude", "workflows");
 }
 function tildeShortenPath(absPath) {
-  const home = homedir42();
+  const home = homedir43();
   if (absPath === home)
     return "~";
   if (absPath.startsWith(home + sep45))
@@ -726138,7 +726395,7 @@ var init_agentMemory = __esm(() => {
 
 // src/utils/permissions/filesystem.ts
 import { randomBytes as randomBytes19 } from "crypto";
-import { homedir as homedir43, tmpdir as tmpdir15 } from "os";
+import { homedir as homedir44, tmpdir as tmpdir15 } from "os";
 import { join as join164, normalize as normalize18, posix as posix8, sep as sep47 } from "path";
 function normalizeCaseForComparison2(path39) {
   return path39.toLowerCase();
@@ -726152,7 +726409,7 @@ function getClaudeSkillScope(filePath) {
       prefix: "/.claude/skills/"
     },
     {
-      dir: expandPath(join164(homedir43(), ".claude", "skills")),
+      dir: expandPath(join164(homedir44(), ".claude", "skills")),
       prefix: "~/.claude/skills/"
     }
   ];
@@ -726466,7 +726723,7 @@ function patternWithRoot(pattern, source2) {
   } else if (pattern.startsWith(`~${DIR_SEP}`)) {
     return {
       relativePattern: pattern.slice(1),
-      root: homedir43().normalize("NFC")
+      root: homedir44().normalize("NFC")
     };
   } else if (pattern.startsWith(DIR_SEP)) {
     return {
@@ -726497,7 +726754,7 @@ function getCachedPatternMatchers(toolPermissionContext, toolType, behavior) {
     toolType,
     behavior,
     getPlatform(),
-    homedir43(),
+    homedir44(),
     getCwd(),
     getOriginalCwd(),
     additionalDirs
@@ -733712,7 +733969,7 @@ import {
   unlink as unlink28
 } from "fs/promises";
 import { createServer as createServer8 } from "net";
-import { homedir as homedir44, platform as platform6 } from "os";
+import { homedir as homedir45, platform as platform6 } from "os";
 import { join as join167 } from "path";
 function log3(message, ...args) {
   if (LOG_FILE) {
@@ -734051,7 +734308,7 @@ var init_chromeNativeHost = __esm(() => {
   init_slowOperations();
   init_common4();
   MAX_MESSAGE_SIZE = 1024 * 1024;
-  LOG_FILE = process.env.USER_TYPE === "ant" ? join167(homedir44(), ".claude", "debug", "chrome-native-host.txt") : undefined;
+  LOG_FILE = process.env.USER_TYPE === "ant" ? join167(homedir45(), ".claude", "debug", "chrome-native-host.txt") : undefined;
   messageSchema = lazySchema(() => exports_external.object({
     type: exports_external.string()
   }).passthrough());
@@ -740292,7 +740549,7 @@ __export(exports_upstreamproxy, {
   SESSION_TOKEN_PATH: () => SESSION_TOKEN_PATH
 });
 import { mkdir as mkdir57, readFile as readFile65, unlink as unlink30, writeFile as writeFile57 } from "fs/promises";
-import { homedir as homedir45 } from "os";
+import { homedir as homedir46 } from "os";
 import { join as join173 } from "path";
 async function initUpstreamProxy(opts) {
   if (!isEnvTruthy(process.env.CLAUDE_CODE_REMOTE)) {
@@ -740314,7 +740571,7 @@ async function initUpstreamProxy(opts) {
   }
   setNonDumpable();
   const baseUrl = opts?.ccrBaseUrl ?? process.env.ANTHROPIC_BASE_URL ?? "https://api.anthropic.com";
-  const caBundlePath = opts?.caBundlePath ?? join173(homedir45(), ".ccr", "ca-bundle.crt");
+  const caBundlePath = opts?.caBundlePath ?? join173(homedir46(), ".ccr", "ca-bundle.crt");
   const caOk = await downloadCaBundle(baseUrl, opts?.systemCaPath ?? SYSTEM_CA_BUNDLE, caBundlePath);
   if (!caOk)
     return state3;
@@ -752826,7 +753083,7 @@ var init_ShowInIDEPrompt = __esm(() => {
 });
 
 // src/components/permissions/FilePermissionDialog/permissionOptions.tsx
-import { homedir as homedir46 } from "os";
+import { homedir as homedir47 } from "os";
 import { basename as basename58, join as join175, sep as sep48 } from "path";
 function isInClaudeFolder(filePath) {
   const absolutePath = expandPath(filePath);
@@ -752837,7 +753094,7 @@ function isInClaudeFolder(filePath) {
 }
 function isInGlobalClaudeFolder(filePath) {
   const absolutePath = expandPath(filePath);
-  const globalClaudeFolderPath = join175(homedir46(), ".claude");
+  const globalClaudeFolderPath = join175(homedir47(), ".claude");
   const normalizedAbsolutePath = normalizeCaseForComparison2(absolutePath);
   const normalizedGlobalClaudeFolderPath = normalizeCaseForComparison2(globalClaudeFolderPath);
   return normalizedAbsolutePath.startsWith(normalizedGlobalClaudeFolderPath + sep48.toLowerCase()) || normalizedAbsolutePath.startsWith(normalizedGlobalClaudeFolderPath + "/");
@@ -787478,7 +787735,7 @@ var require_lib20 = __commonJS((exports, module) => {
 
 // src/utils/cleanup.ts
 import * as fs26 from "fs/promises";
-import { homedir as homedir47 } from "os";
+import { homedir as homedir48 } from "os";
 import { join as join176 } from "path";
 function getCutoffDate() {
   const settings = getSettings_DEPRECATED() || {};
@@ -787792,7 +788049,7 @@ async function cleanupNpmCacheForAnthropicPackages() {
     return;
   }
   logForDebugging("npm cache cleanup: starting");
-  const npmCachePath = join176(homedir47(), ".npm", "_cacache");
+  const npmCachePath = join176(homedir48(), ".npm", "_cacache");
   const NPM_CACHE_RETENTION_COUNT = 5;
   const startTime2 = Date.now();
   try {
@@ -809397,7 +809654,7 @@ var exports_TrustDialog = {};
 __export(exports_TrustDialog, {
   TrustDialog: () => TrustDialog
 });
-import { homedir as homedir49 } from "os";
+import { homedir as homedir50 } from "os";
 function TrustDialog(t0) {
   const $4 = import_compiler_runtime351.c(33);
   const {
@@ -809508,7 +809765,7 @@ function TrustDialog(t0) {
   let t13;
   if ($4[13] !== hasAnyBashExecution) {
     t12 = () => {
-      const isHomeDir = homedir49() === getCwd();
+      const isHomeDir = homedir50() === getCwd();
       logEvent2("tengu_trust_dialog_shown", {
         isHomeDir,
         hasMcpServers,
@@ -809537,7 +809794,7 @@ function TrustDialog(t0) {
         gracefulShutdownSync(1);
         return;
       }
-      const isHomeDir_0 = homedir49() === getCwd();
+      const isHomeDir_0 = homedir50() === getCwd();
       logEvent2("tengu_trust_dialog_accept", {
         isHomeDir: isHomeDir_0,
         hasMcpServers,
@@ -815384,7 +815641,7 @@ var init_bundled3 = __esm(() => {
 
 // src/utils/deepLink/banner.ts
 import { stat as stat53 } from "fs/promises";
-import { homedir as homedir50 } from "os";
+import { homedir as homedir51 } from "os";
 import { join as join184, sep as sep52 } from "path";
 function buildDeepLinkBanner(info) {
   const lines2 = [
@@ -815423,7 +815680,7 @@ async function mtimeOrUndefined(p4) {
   }
 }
 function tildify(p4) {
-  const home = homedir50();
+  const home = homedir51();
   if (p4 === home)
     return "~";
   if (p4.startsWith(home + sep52))
@@ -816736,7 +816993,7 @@ __export(exports_protocolHandler, {
   handleUrlSchemeLaunch: () => handleUrlSchemeLaunch,
   handleDeepLinkUri: () => handleDeepLinkUri
 });
-import { homedir as homedir51 } from "os";
+import { homedir as homedir52 } from "os";
 async function handleDeepLinkUri(uri3) {
   logForDebugging(`Handling deep link URI: ${uri3}`);
   let action2;
@@ -816790,7 +817047,7 @@ async function resolveCwd(action2) {
     }
     logForDebugging(`No local clone found for repo ${action2.repo}, falling back to home`);
   }
-  return { cwd: homedir51() };
+  return { cwd: homedir52() };
 }
 var init_protocolHandler = __esm(() => {
   init_debug();
@@ -817130,7 +817387,7 @@ var init_sessionMemory = __esm(() => {
 
 // src/utils/iTermBackup.ts
 import { copyFile as copyFile12, stat as stat54 } from "fs/promises";
-import { homedir as homedir52 } from "os";
+import { homedir as homedir53 } from "os";
 import { join as join188 } from "path";
 function markITerm2SetupComplete() {
   saveGlobalConfig((current) => ({
@@ -817146,7 +817403,7 @@ function getIterm2RecoveryInfo() {
   };
 }
 function getITerm2PlistPath() {
-  return join188(homedir52(), "Library", "Preferences", "com.googlecode.iterm2.plist");
+  return join188(homedir53(), "Library", "Preferences", "com.googlecode.iterm2.plist");
 }
 async function checkAndRestoreITerm2Backup() {
   const { inProgress, backupPath } = getIterm2RecoveryInfo();
@@ -823316,7 +823573,7 @@ __export(exports_claudeDesktop, {
   getClaudeDesktopConfigPath: () => getClaudeDesktopConfigPath
 });
 import { readdir as readdir38, readFile as readFile70, stat as stat56 } from "fs/promises";
-import { homedir as homedir53 } from "os";
+import { homedir as homedir54 } from "os";
 import { join as join191 } from "path";
 async function getClaudeDesktopConfigPath() {
   const platform7 = getPlatform();
@@ -823324,7 +823581,7 @@ async function getClaudeDesktopConfigPath() {
     throw new Error(`Unsupported platform: ${platform7} - Claude Desktop integration only works on macOS and WSL.`);
   }
   if (platform7 === "macos") {
-    return join191(homedir53(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
+    return join191(homedir54(), "Library", "Application Support", "Claude", "claude_desktop_config.json");
   }
   const windowsHome = process.env.USERPROFILE ? process.env.USERPROFILE.replace(/\\/g, "/") : null;
   if (windowsHome) {
@@ -824388,11 +824645,11 @@ var exports_install = {};
 __export(exports_install, {
   install: () => install2
 });
-import { homedir as homedir54 } from "os";
+import { homedir as homedir55 } from "os";
 import { join as join192 } from "path";
 function getInstallationPath2() {
   const isWindows3 = env4.platform === "win32";
-  const homeDir = homedir54();
+  const homeDir = homedir55();
   if (isWindows3) {
     const windowsPath = join192(homeDir, ".local", "bin", "claude.exe");
     return windowsPath.replace(/\//g, "\\");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.326",
+  "version": "2.1.328",
   "license": "MIT",
   "type": "module",
   "bin": {