@cnwenf/occ 2.1.325 → 2.1.327

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.325","BINARY_NAME":"occ","BUILD_TIME":"2026-09-08T21:11:53.537Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.327","BINARY_NAME":"occ","BUILD_TIME":"2026-09-09T22:35:02.507Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -101087,7 +101087,8 @@ var init_aliases = __esm(() => {
     "fable",
     "sonnet[1m]",
     "opus[1m]",
-    "opusplan"
+    "opusplan",
+    "opusplan[1m]"
   ];
   MODEL_FAMILY_ALIASES = ["sonnet", "opus", "haiku", "fable"];
 });
@@ -101501,6 +101502,9 @@ function renderModelSetting(setting) {
   if (setting === "opusplan") {
     return "Opus Plan";
   }
+  if (setting === "opusplan[1m]") {
+    return renderModelName(parseUserSpecifiedModel(setting));
+  }
   if (isModelAlias(setting)) {
     return capitalize(setting);
   }
@@ -474592,6 +474596,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 +474619,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 +474697,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 +474748,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();
@@ -714975,8 +714991,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 +715047,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 +715069,7 @@ function ModelPickerWrapper({ onDone }) {
         }
       }
     }
+    message = message + renderModelSaveFailureSuffix(saveResult);
     if (isBilledAsExtraUsage(model, wasFastModeToggledOn === true, isOpus1mMergeEnabled())) {
       message = message + " \xB7 Billed as extra usage";
     }
@@ -715106,13 +715149,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 +715220,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 +718650,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 +718662,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 +726181,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 +726195,7 @@ function getClaudeSkillScope(filePath) {
       prefix: "/.claude/skills/"
     },
     {
-      dir: expandPath(join164(homedir43(), ".claude", "skills")),
+      dir: expandPath(join164(homedir44(), ".claude", "skills")),
       prefix: "~/.claude/skills/"
     }
   ];
@@ -726466,7 +726509,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 +726540,7 @@ function getCachedPatternMatchers(toolPermissionContext, toolType, behavior) {
     toolType,
     behavior,
     getPlatform(),
-    homedir43(),
+    homedir44(),
     getCwd(),
     getOriginalCwd(),
     additionalDirs
@@ -733712,7 +733755,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 +734094,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 +740335,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 +740357,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 +752869,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 +752880,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 + "/");
@@ -752879,7 +752922,7 @@ function getFilePermissionOptions({
   const inGlobalClaudeFolder = isInGlobalClaudeFolder(filePath);
   if ((inClaudeFolder || inGlobalClaudeFolder) && operationType !== "read") {
     options.push({
-      label: "Yes, and allow Claude to edit its own settings for this session",
+      label: inGlobalClaudeFolder ? "Yes, and allow Claude to edit files in its ~/.claude folder for this session" : "Yes, and allow Claude to edit files in this project's .claude folder for this session",
       value: "yes-claude-folder",
       option: {
         type: "accept-session",
@@ -787478,7 +787521,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 +787835,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 +809440,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 +809551,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 +809580,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 +815427,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 +815466,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 +816779,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 +816833,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 +817173,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 +817189,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 +823359,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 +823367,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 +824431,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.325",
+  "version": "2.1.327",
   "license": "MIT",
   "type": "module",
   "bin": {