@cnwenf/occ 2.1.292 → 2.1.294

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.292","BINARY_NAME":"occ","BUILD_TIME":"2026-08-03T20:56:55.105Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.294","BINARY_NAME":"occ","BUILD_TIME":"2026-08-06T04:37:11.915Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -359985,9 +359985,7 @@ function collectCommands(node, commands7, varScope) {
         loopVar = child.text;
       } else if (child.type === "do_group") {
         doGroup = child;
-      } else if (child.type === "for" || child.type === "in" || child.type === "select" || child.type === ";") {
-        continue;
-      } else if (child.type === "command_substitution") {
+      } else if (child.type === "for" || child.type === "in" || child.type === "select" || child.type === ";") {} else if (child.type === "command_substitution") {
         const err2 = collectCommandSubstitution(child, commands7, varScope);
         if (err2)
           return err2;
@@ -360100,15 +360098,24 @@ function collectCommands(node, commands7, varScope) {
     return null;
   }
   if (node.type === "test_command") {
+    const inBracketBracket = node.children.some((c9) => c9?.type === "[[");
+    const gapErr = checkTestCommandUnparsedBytes(node, inBracketBracket);
+    if (gapErr)
+      return gapErr;
     const argv = ["[["];
     for (const child of node.children) {
       if (!child)
         continue;
-      if (child.type === "[[" || child.type === "]]")
-        continue;
-      if (child.type === "[" || child.type === "]")
+      if (child.type === "[[" || child.type === "]]" || child.type === "[" || child.type === "]") {
+        if (child.text === "") {
+          return {
+            kind: "too-complex",
+            reason: "test_command early-close (quote in operator position)"
+          };
+        }
         continue;
-      const err2 = walkTestExpr(child, argv, commands7, varScope);
+      }
+      const err2 = walkTestExpr(child, argv, commands7, varScope, inBracketBracket);
       if (err2)
         return err2;
     }
@@ -360144,16 +360151,104 @@ function collectCommands(node, commands7, varScope) {
   }
   return tooComplex(node);
 }
-function walkTestExpr(node, argv, innerCommands, varScope) {
+function isWhitespaceOrCommentGap(text2, inBracketBracket) {
+  let i6 = 0;
+  while (i6 < text2.length) {
+    const ch2 = text2[i6];
+    if (ch2 === " " || ch2 === "\t") {
+      i6++;
+      continue;
+    }
+    if (ch2 === "\\" && text2[i6 + 1] === `
+`) {
+      i6 += 2;
+      continue;
+    }
+    if (inBracketBracket && ch2 === `
+`) {
+      i6++;
+      continue;
+    }
+    if (inBracketBracket && ch2 === "#") {
+      i6++;
+      while (i6 < text2.length && text2[i6] !== `
+`)
+        i6++;
+      continue;
+    }
+    return false;
+  }
+  return true;
+}
+function checkTestCommandUnparsedBytes(node, inBracketBracket) {
+  const bytes = Buffer.from(node.text, "utf8");
+  let cursor = node.startIndex;
+  for (const child of node.children) {
+    if (!child)
+      continue;
+    if (child.endIndex > node.endIndex || child.startIndex < node.startIndex) {
+      return {
+        kind: "too-complex",
+        reason: "Test command child extends past the node span \u2014 gap byte accounting is untrustworthy"
+      };
+    }
+    if (child.startIndex > cursor) {
+      const gap = bytes.subarray(cursor - node.startIndex, child.startIndex - node.startIndex).toString("utf8");
+      if (!isWhitespaceOrCommentGap(gap, inBracketBracket)) {
+        return {
+          kind: "too-complex",
+          reason: "Test command has unparsed bytes between children \u2014 parser dropped content that shell will see"
+        };
+      }
+    }
+    cursor = Math.max(cursor, child.endIndex);
+    if (TEST_EXPR_TYPES.has(child.type)) {
+      const err2 = checkTestCommandUnparsedBytes(child, inBracketBracket);
+      if (err2)
+        return err2;
+    }
+  }
+  if (cursor < node.endIndex) {
+    const tail = bytes.subarray(cursor - node.startIndex).toString("utf8");
+    if (!isWhitespaceOrCommentGap(tail, inBracketBracket)) {
+      return {
+        kind: "too-complex",
+        reason: "Test command has unparsed bytes after its last child \u2014 parser dropped content that shell will see"
+      };
+    }
+  }
+  return null;
+}
+function containsStandaloneBracketCloser(text2) {
+  const masked = text2.replace(/\[(?::[a-zA-Z]+:|=[A-Za-z0-9-]*=|\.[A-Za-z0-9-]*\.|[!^]?)\]\](?!\])/g, "\x00");
+  const wordChar = /[A-Za-z0-9_]/;
+  let idx = masked.indexOf("]]");
+  while (idx !== -1) {
+    const before = idx > 0 ? masked[idx - 1] : "";
+    const after = idx + 2 < masked.length ? masked[idx + 2] : "";
+    if (!(wordChar.test(before) && wordChar.test(after)))
+      return true;
+    idx = masked.indexOf("]]", idx + 1);
+  }
+  return false;
+}
+function walkTestExpr(node, argv, innerCommands, varScope, inBracketBracket) {
   switch (node.type) {
     case "unary_expression":
     case "binary_expression":
     case "negated_expression":
     case "parenthesized_expression": {
-      for (const c9 of node.children) {
+      for (let i6 = 0;i6 < node.children.length; i6++) {
+        const c9 = node.children[i6];
         if (!c9)
           continue;
-        const err2 = walkTestExpr(c9, argv, innerCommands, varScope);
+        if ((c9.type === "simple_expansion" || c9.type === "expansion") && (node.children[i6 + 1]?.text.startsWith("[") || /^:[a-zA-Z&]/.test(node.children[i6 + 1]?.text ?? "") || c9.children.some((cc) => cc?.type === "special_variable_name") && /^\w*(\[|:[a-zA-Z&])/.test(node.children[i6 + 1]?.text ?? ""))) {
+          return {
+            kind: "too-complex",
+            reason: "zsh $name[expr] / $name:mod in [[ ]] operand \u2014 recursive eval"
+          };
+        }
+        const err2 = walkTestExpr(c9, argv, innerCommands, varScope, inBracketBracket);
         if (err2)
           return err2;
       }
@@ -360171,16 +360266,132 @@ function walkTestExpr(node, argv, innerCommands, varScope) {
     case "<":
     case ">":
     case "=~":
+      if (node.text === "") {
+        return {
+          kind: "too-complex",
+          reason: "Test command has a synthesized zero-width token \u2014 parser diverged from shell"
+        };
+      }
       argv.push(node.text);
       return null;
     case "regex":
-    case "extglob_pattern":
+    case "extglob_pattern": {
+      if (/\$[({[\w#?!*@$'"+~^=-]|`|[<>]\(/.test(node.text)) {
+        return {
+          kind: "too-complex",
+          reason: `[[ ]] ${node.type} contains expansion / command / process substitution`,
+          nodeType: node.type
+        };
+      }
+      if (node.type === "extglob_pattern") {
+        const text2 = node.text;
+        let i6 = 0;
+        while (i6 < text2.length) {
+          if (text2[i6] === "\\" && i6 + 1 < text2.length) {
+            i6 += 2;
+            continue;
+          }
+          if (text2[i6] === "&") {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] pattern contains unquoted & (zsh splits the word at & at any depth)"
+            };
+          }
+          i6++;
+        }
+      }
+      if (node.type === "regex") {
+        const text2 = node.text;
+        let parenDepth = 0;
+        let i6 = 0;
+        while (i6 < text2.length) {
+          const ch2 = text2[i6];
+          if (ch2 === "\\" && i6 + 1 < text2.length) {
+            i6 += 2;
+            continue;
+          }
+          if (parenDepth === 0 && ch2 === "|" && text2[i6 + 1] === ch2) {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] regex contains glued || (zsh splits it as a cond operator)",
+              nodeType: node.type
+            };
+          }
+          if (ch2 === "&") {
+            return {
+              kind: "too-complex",
+              reason: "[[ ]] regex contains unquoted & (zsh splits the word at & at any depth)",
+              nodeType: node.type
+            };
+          }
+          if (ch2 === '"' || ch2 === "'") {
+            const quote2 = ch2;
+            i6++;
+            while (i6 < text2.length && text2[i6] !== quote2) {
+              if (quote2 === '"' && text2[i6] === "\\" && i6 + 1 < text2.length) {
+                i6++;
+              }
+              i6++;
+            }
+            if (i6 < text2.length)
+              i6++;
+            continue;
+          }
+          if (ch2 === "(") {
+            parenDepth++;
+          } else if (ch2 === ")") {
+            parenDepth--;
+            if (parenDepth < 0) {
+              return {
+                kind: "too-complex",
+                reason: "[[ ]] regex has unbalanced parentheses (parser desync)",
+                nodeType: node.type
+              };
+            }
+          }
+          i6++;
+        }
+        if (parenDepth !== 0) {
+          return {
+            kind: "too-complex",
+            reason: "[[ ]] regex has unbalanced parentheses (parser desync)",
+            nodeType: node.type
+          };
+        }
+      }
+      if (node.text.includes("&&")) {
+        return {
+          kind: "too-complex",
+          reason: "[[ ]] pattern leaf contains `&&` \u2014 shell cond-lexer divergence (zsh splits the word there)",
+          nodeType: node.type
+        };
+      }
+      if (containsStandaloneBracketCloser(node.text)) {
+        return {
+          kind: "too-complex",
+          reason: "[[ ]] pattern leaf contains a potential standalone `]]` closer \u2014 shell cond-lexer divergence (zsh may close the conditional early)",
+          nodeType: node.type
+        };
+      }
       argv.push(node.text);
       return null;
+    }
+    case "test_rhs_missing":
+      return {
+        kind: "too-complex",
+        reason: "Test command comparison is missing its right-hand side \u2014 parser dropped consumed bytes"
+      };
     default: {
       const arg = walkArgument(node, innerCommands, varScope);
       if (typeof arg !== "string")
         return arg;
+      if (inBracketBracket && (containsStandaloneBracketCloser(arg) || containsStandaloneBracketCloser(node.text)) || /]].*[;\n&|<>]/s.test(arg)) {
+        return {
+          kind: "too-complex",
+          reason: inBracketBracket ? "[[ ]] quoted operand contains `]]` closer or `]]`+separator bytes \u2014 possible parser quote-state desync" : "test command quoted operand contains `]]`+separator bytes \u2014 possible parser quote-state desync",
+          nodeType: node.type
+        };
+      }
       argv.push(arg);
       return null;
     }
@@ -360618,7 +360829,6 @@ function walkVariableAssignment(node, innerCommands, varScope) {
       name3 = child.text;
     } else if (child.type === "=" || child.type === "+=") {
       isAppend = child.type === "+=";
-      continue;
     } else if (child.type === "command_substitution") {
       const err2 = collectCommandSubstitution(child, innerCommands, varScope);
       if (err2)
@@ -360675,7 +360885,7 @@ function walkVariableAssignment(node, innerCommands, varScope) {
     if (!/^[A-Za-z0-9 _+:./=[\]-]*$/.test(value.replace(/\$\{[A-Za-z_][A-Za-z0-9_]*\}/g, ""))) {
       return {
         kind: "too-complex",
-        reason: "PS4 value outside safe charset \u2014 only ${VAR} refs and [A-Za-z0-9 _+:.=/[]-] allowed",
+        reason: `PS4 value outside safe charset \u2014 only \${VAR} refs and [A-Za-z0-9 _+:.=/[]-] allowed`,
         nodeType: "variable_assignment"
       };
     }
@@ -361031,7 +361241,7 @@ function checkSemantics(commands7) {
   }
   return { ok: true };
 }
-var STRUCTURAL_TYPES, SEPARATOR_TYPES, CMDSUB_PLACEHOLDER = "__CMDSUB_OUTPUT__", VAR_PLACEHOLDER = "__TRACKED_VAR__", BARE_VAR_UNSAFE_RE, STDBUF_SHORT_SEP_RE, STDBUF_SHORT_FUSED_RE, STDBUF_LONG_RE, SAFE_ENV_VARS, SPECIAL_VAR_NAMES, DANGEROUS_TYPES, DANGEROUS_TYPE_IDS, REDIRECT_OPS, BRACE_EXPANSION_RE, CONTROL_CHAR_RE, UNICODE_WHITESPACE_RE, BACKSLASH_WHITESPACE_RE, ZSH_TILDE_BRACKET_RE, ZSH_EQUALS_EXPANSION_RE, BRACE_WITH_QUOTE_RE, DOLLAR, ARITH_LEAF_RE, ZSH_DANGEROUS_BUILTINS, EVAL_LIKE_BUILTINS, SUBSCRIPT_EVAL_FLAGS, TEST_ARITH_CMP_OPS, BARE_SUBSCRIPT_NAME_BUILTINS, READ_DATA_FLAGS, PROC_ENVIRON_RE, NEWLINE_HASH_RE;
+var STRUCTURAL_TYPES, SEPARATOR_TYPES, CMDSUB_PLACEHOLDER = "__CMDSUB_OUTPUT__", VAR_PLACEHOLDER = "__TRACKED_VAR__", BARE_VAR_UNSAFE_RE, STDBUF_SHORT_SEP_RE, STDBUF_SHORT_FUSED_RE, STDBUF_LONG_RE, SAFE_ENV_VARS, SPECIAL_VAR_NAMES, DANGEROUS_TYPES, DANGEROUS_TYPE_IDS, REDIRECT_OPS, BRACE_EXPANSION_RE, CONTROL_CHAR_RE, UNICODE_WHITESPACE_RE, BACKSLASH_WHITESPACE_RE, ZSH_TILDE_BRACKET_RE, ZSH_EQUALS_EXPANSION_RE, BRACE_WITH_QUOTE_RE, DOLLAR, TEST_EXPR_TYPES, ARITH_LEAF_RE, ZSH_DANGEROUS_BUILTINS, EVAL_LIKE_BUILTINS, SUBSCRIPT_EVAL_FLAGS, TEST_ARITH_CMP_OPS, BARE_SUBSCRIPT_NAME_BUILTINS, READ_DATA_FLAGS, PROC_ENVIRON_RE, NEWLINE_HASH_RE;
 var init_ast = __esm(() => {
   init_bashParser();
   init_parser5();
@@ -361117,6 +361327,12 @@ var init_ast = __esm(() => {
   ZSH_EQUALS_EXPANSION_RE = /(?:^|[\s;&|])=[a-zA-Z_]/;
   BRACE_WITH_QUOTE_RE = /\{[^}]*['"]/;
   DOLLAR = String.fromCharCode(36);
+  TEST_EXPR_TYPES = new Set([
+    "unary_expression",
+    "binary_expression",
+    "negated_expression",
+    "parenthesized_expression"
+  ]);
   ARITH_LEAF_RE = /^(?:[0-9]+|0[xX][0-9a-fA-F]+|[0-9]+#[0-9a-zA-Z]+|[-+*/%^&|~!<>=?:(),]+|<<|>>|\*\*|&&|\|\||[<>=!]=|\$\(\(|\)\))$/;
   ZSH_DANGEROUS_BUILTINS = new Set([
     "zmodload",
@@ -362031,6 +362247,7 @@ var init_killShellTasks = __esm(() => {
 });
 
 // src/tasks/LocalShellTask/LocalShellTask.tsx
+import { statSync as statSync12 } from "fs";
 import { stat as stat21 } from "fs/promises";
 function looksLikePrompt(tail) {
   const lastLine2 = tail.trimEnd().split(`
@@ -362091,6 +362308,16 @@ The command is likely blocked on an interactive prompt. Kill this task and re-ru
     clearInterval(timer);
   };
 }
+function monitorCompletedSummary(description, exitCode, outputBytes) {
+  return outputBytes === 0 ? `Monitor "${description}" ended without producing output${exitCode !== undefined ? ` (exit ${exitCode})` : ""}` : `Monitor "${description}" stream ended`;
+}
+function readMonitorOutputBytes(outputPath) {
+  try {
+    return statSync12(outputPath).size;
+  } catch (e4) {
+    return e4.code === "ENOENT" ? 0 : undefined;
+  }
+}
 function enqueueShellNotification(taskId, description, status, exitCode, setAppState, toolUseId, kind = "bash", agentId) {
   let shouldEnqueue = false;
   updateTaskState(taskId, setAppState, (task) => {
@@ -362107,12 +362334,15 @@ function enqueueShellNotification(taskId, description, status, exitCode, setAppS
     return;
   }
   abortSpeculation(setAppState);
+  const outputPath = getTaskOutputPath(taskId);
   let summary;
   if (feature("MONITOR_TOOL") && kind === "monitor") {
     switch (status) {
-      case "completed":
-        summary = `Monitor "${description}" stream ended`;
+      case "completed": {
+        const outputBytes = readMonitorOutputBytes(outputPath);
+        summary = monitorCompletedSummary(description, exitCode, outputBytes);
         break;
+      }
       case "failed":
         summary = `Monitor "${description}" script failed${exitCode !== undefined ? ` (exit ${exitCode})` : ""}`;
         break;
@@ -362133,7 +362363,6 @@ function enqueueShellNotification(taskId, description, status, exitCode, setAppS
         break;
     }
   }
-  const outputPath = getTaskOutputPath(taskId);
   const toolUseIdLine = toolUseId ? `
 <${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : "";
   const message = `<${TASK_NOTIFICATION_TAG}>
@@ -384281,6 +384510,42 @@ function hasUnsafeHelpManForm(command4) {
   }
   return false;
 }
+function hasQuotedBracketCloserInConditional(command4) {
+  if (!command4.includes("[["))
+    return false;
+  if (!command4.includes("]]"))
+    return false;
+  const isWordChar2 = (c9) => c9 !== undefined && /[A-Za-z0-9_]/.test(c9);
+  let inSingle = false;
+  let inDouble = false;
+  for (let i6 = 0;i6 < command4.length; i6++) {
+    const ch2 = command4[i6];
+    if (ch2 === "\\" && !inSingle) {
+      const next = command4[i6 + 1];
+      const isEscape = !inDouble || next === "$" || next === "`" || next === '"' || next === "\\" || next === `
+`;
+      if (isEscape && next !== undefined)
+        i6++;
+      continue;
+    }
+    if (ch2 === "'" && !inDouble) {
+      inSingle = !inSingle;
+      continue;
+    }
+    if (ch2 === '"' && !inSingle) {
+      inDouble = !inDouble;
+      continue;
+    }
+    if ((inSingle || inDouble) && ch2 === "]" && command4[i6 + 1] === "]") {
+      const before = command4[i6 - 1];
+      const after = command4[i6 + 2];
+      if (!(isWordChar2(before) && isWordChar2(after)))
+        return true;
+      i6++;
+    }
+  }
+  return false;
+}
 async function bashToolHasPermission(input, context4, getCommandSubcommandPrefixFn = getCommandSubcommandPrefix) {
   let appState = context4.getAppState();
   {
@@ -384371,6 +384636,15 @@ async function bashToolHasPermission(input, context4, getCommandSubcommandPrefix
       };
     }
   }
+  {
+    const mode = appState.toolPermissionContext.mode;
+    if (mode !== "bypassPermissions" && hasQuotedBracketCloserInConditional(input.command)) {
+      return {
+        behavior: "ask",
+        message: "Potential `]]` closer hidden in a quoted [[ ]] operand requires confirmation."
+      };
+    }
+  }
   const injectionCheckDisabled = isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_COMMAND_INJECTION_CHECK);
   const shadowEnabled = feature("TREE_SITTER_BASH_SHADOW") ? getFeatureValue_CACHED_MAY_BE_STALE("tengu_birch_trellis", true) : false;
   let astRoot = injectionCheckDisabled ? null : feature("TREE_SITTER_BASH_SHADOW") && !shadowEnabled ? null : await parseCommandRaw(input.command);
@@ -471082,9 +471356,14 @@ async function* runAgent({
     const state3 = toolUseContext.getAppState();
     let toolPermissionContext = state3.toolPermissionContext;
     if (agentPermissionMode && state3.toolPermissionContext.mode !== "bypassPermissions" && state3.toolPermissionContext.mode !== "acceptEdits" && !(feature("TRANSCRIPT_CLASSIFIER") && state3.toolPermissionContext.mode === "auto")) {
+      let effectiveMode = agentPermissionMode;
+      if (agentPermissionMode === "bypassPermissions" && isBypassPermissionsModeDisabled()) {
+        logForDebugging(`Subagent declared permissionMode: bypassPermissions but this session is not running in a contained no-internet environment (or bypass is policy-disabled); keeping parent mode '${state3.toolPermissionContext.mode}'.`, { level: "warn" });
+        effectiveMode = state3.toolPermissionContext.mode;
+      }
       toolPermissionContext = {
         ...toolPermissionContext,
-        mode: agentPermissionMode
+        mode: effectiveMode
       };
     }
     const shouldAvoidPrompts = canShowPermissionPrompts !== undefined ? !canShowPermissionPrompts : agentPermissionMode === "bubble" ? false : isAsync2;
@@ -471409,6 +471688,7 @@ var init_runAgent = __esm(() => {
   init_sessionHooks();
   init_hooks5();
   init_messages3();
+  init_permissionSetup();
   init_cost_tracker();
   init_agent();
   init_sessionStorage();
@@ -564823,10 +565103,10 @@ var init_cliui = __esm(() => {
 
 // node_modules/.bun/escalade@3.2.0/node_modules/escalade/sync/index.mjs
 import { dirname as dirname43, resolve as resolve38 } from "path";
-import { readdirSync as readdirSync7, statSync as statSync12 } from "fs";
+import { readdirSync as readdirSync7, statSync as statSync13 } from "fs";
 function sync_default(start, callback) {
   let dir = resolve38(".", start);
-  let tmp, stats = statSync12(dir);
+  let tmp, stats = statSync13(dir);
   if (!stats.isDirectory()) {
     dir = dirname43(dir);
   }
@@ -565853,7 +566133,7 @@ var init_yerror = __esm(() => {
 });
 
 // node_modules/.bun/y18n@5.0.8/node_modules/y18n/build/lib/platform-shims/node.js
-import { readFileSync as readFileSync23, statSync as statSync13, writeFile as writeFile28 } from "fs";
+import { readFileSync as readFileSync23, statSync as statSync14, writeFile as writeFile28 } from "fs";
 import { format as format5 } from "util";
 import { resolve as resolve40 } from "path";
 var node_default2;
@@ -565867,7 +566147,7 @@ var init_node12 = __esm(() => {
     resolve: resolve40,
     exists: (file2) => {
       try {
-        return statSync13(file2).isFile();
+        return statSync14(file2).isFile();
       } catch (err2) {
         return false;
       }
@@ -583931,7 +584211,7 @@ __export(exports_workflowDiscovery, {
   USER_WORKFLOWS_DIR: () => USER_WORKFLOWS_DIR,
   PROJECT_WORKFLOWS_DIR: () => PROJECT_WORKFLOWS_DIR
 });
-import { existsSync as existsSync16, readdirSync as readdirSync8, statSync as statSync14 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync8, statSync as statSync15 } from "fs";
 import { homedir as homedir31 } from "os";
 import { join as join109 } from "path";
 function isWorkflowsEnabled() {
@@ -583958,7 +584238,7 @@ function listScripts(dir, source2) {
       continue;
     const full = join109(dir, entry);
     try {
-      if (!statSync14(full).isFile())
+      if (!statSync15(full).isFile())
         continue;
     } catch {
       continue;
@@ -583987,7 +584267,7 @@ function resolveWorkflowScript(name3, source2, cwd2 = process.cwd()) {
     const full = join109(dir, `${name3}.js`);
     if (existsSync16(full)) {
       try {
-        if (statSync14(full).isFile())
+        if (statSync15(full).isFile())
           return full;
       } catch {}
     }
@@ -639383,7 +639663,7 @@ var init_process2 = () => {};
 
 // src/daemon/lockfile.ts
 import { open as open13, readFile as readFile50, unlink as unlink22, writeFile as writeFile43 } from "fs/promises";
-import { existsSync as existsSync18, statSync as statSync15 } from "fs";
+import { existsSync as existsSync18, statSync as statSync16 } from "fs";
 import { join as join135 } from "path";
 function getDaemonLockfilePath() {
   return join135(getClaudeConfigHomeDir(), "daemon.lock");
@@ -639528,7 +639808,7 @@ async function displaceHolder() {
 }
 function lockfileMtime() {
   try {
-    return statSync15(getDaemonLockfilePath()).mtimeMs;
+    return statSync16(getDaemonLockfilePath()).mtimeMs;
   } catch {
     return null;
   }
@@ -640711,7 +640991,7 @@ __export(exports_supervisor, {
   daemonInstall: () => daemonInstall,
   checkBinaryIdentity: () => checkBinaryIdentity
 });
-import { existsSync as existsSync22, statSync as statSync16 } from "fs";
+import { existsSync as existsSync22, statSync as statSync17 } from "fs";
 function buildIdentity() {
   return {
     supervisorPid: process.pid,
@@ -640734,7 +641014,7 @@ function checkBinaryIdentity() {
     if (!execPath2 || !existsSync22(execPath2)) {
       return "binary identity unresolvable";
     }
-    statSync16(execPath2);
+    statSync17(execPath2);
   } catch {
     return "binary identity unresolvable";
   }
@@ -642700,7 +642980,7 @@ var init_file_index = __esm(() => {
 });
 
 // src/hooks/fileSuggestions.ts
-import { statSync as statSync17 } from "fs";
+import { statSync as statSync18 } from "fs";
 import * as path35 from "path";
 function getFileIndex() {
   if (!fileIndex) {
@@ -642748,7 +643028,7 @@ function getGitIndexMtime() {
   if (!repoRoot)
     return null;
   try {
-    return statSync17(path35.join(repoRoot, ".git", "index")).mtimeMs;
+    return statSync18(path35.join(repoRoot, ".git", "index")).mtimeMs;
   } catch {
     return null;
   }
@@ -684266,70 +684546,172 @@ var init_logoV2Utils = __esm(() => {
   cachedActivity = [];
 });
 
-// src/components/LogoV2/Clawd.tsx
-function normalizeLines(lines2) {
-  const max2 = lines2.reduce((m5, l4) => Math.max(m5, l4.length), 0);
-  return lines2.map((l4) => l4.padEnd(max2));
+// src/components/LogoV2/OccMark.tsx
+function normalizeMark(lines2) {
+  const width = Math.max(...lines2.map(stringWidth));
+  return lines2.map((line) => line + " ".repeat(width - stringWidth(line)));
 }
-function renderLine(line, lineKey) {
-  const segments = [];
-  let buffer = "";
-  let accent = false;
-  const flush = (until) => {
-    if (buffer.length === 0)
-      return;
-    segments.push(accent ? /* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
-      color: "claudeShimmer",
-      children: buffer
-    }, `${lineKey}-${until}-a`) : /* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
-      color: "clawd_body",
-      children: buffer
-    }, `${lineKey}-${until}-b`));
-    buffer = "";
-  };
-  for (let i6 = 0;i6 < line.length; i6++) {
-    const ch2 = line[i6];
-    if (ch2 === " " || ch2 === "\t") {
-      flush(i6);
-      segments.push(/* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
-        children: " "
-      }, `${lineKey}-sp-${i6}`));
+function getOccMark(mode) {
+  return OCC_MARKS[mode];
+}
+function getOccMarkWidth(art) {
+  return Math.max(...art.map(stringWidth));
+}
+function gradientThemeFamily(themeName) {
+  return themeName.startsWith("light") ? "light" : "dark";
+}
+function sampleGradient(stops, t4) {
+  if (stops.length === 0)
+    return [0, 0, 0];
+  if (stops.length === 1)
+    return stops[0];
+  const clamped = Math.min(Math.max(t4, 0), 1);
+  const scaled = clamped * (stops.length - 1);
+  const index2 = Math.min(Math.floor(scaled), stops.length - 2);
+  const local = scaled - index2;
+  const from2 = stops[index2];
+  const to = stops[index2 + 1];
+  return [
+    Math.round(from2[0] + (to[0] - from2[0]) * local),
+    Math.round(from2[1] + (to[1] - from2[1]) * local),
+    Math.round(from2[2] + (to[2] - from2[2]) * local)
+  ];
+}
+function markCellT(art, row, column) {
+  const width = getOccMarkWidth(art);
+  const horizontal = width > 1 ? column / (width - 1) : 0;
+  const vertical = art.length > 1 ? row / (art.length - 1) : 0;
+  return horizontal * 0.72 + vertical * 0.28;
+}
+function rgbColor(rgb3) {
+  return `rgb(${rgb3[0]},${rgb3[1]},${rgb3[2]})`;
+}
+function highlightColor(rgb3, amount = 0.62) {
+  return [
+    Math.round(rgb3[0] + (255 - rgb3[0]) * amount),
+    Math.round(rgb3[1] + (255 - rgb3[1]) * amount),
+    Math.round(rgb3[2] + (255 - rgb3[2]) * amount)
+  ];
+}
+function isShimmerCell(art, row, column, progress) {
+  if (progress === null)
+    return false;
+  const width = getOccMarkWidth(art);
+  const diagonal = (column + (art.length - 1 - row) * 1.6) / (width + (art.length - 1) * 1.6);
+  const bandPosition = -SHIMMER_BAND_WIDTH + progress * 1.45;
+  return Math.abs(diagonal - bandPosition) < SHIMMER_BAND_WIDTH;
+}
+function MarkRow({
+  art,
+  row,
+  stops,
+  progress
+}) {
+  const line = art[row];
+  const cells = [...line];
+  const nodes = [];
+  let spaceRun = "";
+  const flushSpaces = (key4) => {
+    if (spaceRun.length > 0) {
+      nodes.push(/* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
+        children: spaceRun
+      }, key4));
+      spaceRun = "";
+    }
+  };
+  for (let column = 0;column < cells.length; column++) {
+    const char = cells[column];
+    if (char === " " || char === "\t") {
+      spaceRun += " ";
       continue;
     }
-    const isAccent = ACCENT_CHARS.has(ch2);
-    if (buffer.length === 0 || isAccent === accent) {
-      buffer += ch2;
-      accent = isAccent;
-    } else {
-      flush(i6);
-      buffer = ch2;
-      accent = isAccent;
-    }
+    flushSpaces(`${row}-sp-${column}`);
+    const base2 = sampleGradient(stops, markCellT(art, row, column));
+    const shimmering = isShimmerCell(art, row, column, progress);
+    nodes.push(/* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
+      color: rgbColor(shimmering ? highlightColor(base2) : base2),
+      bold: true,
+      children: char
+    }, `${row}-${column}`));
   }
-  flush(line.length);
+  flushSpaces(`${row}-end`);
   return /* @__PURE__ */ jsx_runtime258.jsx(ThemedText, {
-    children: segments
-  }, lineKey);
+    children: nodes
+  });
 }
-function Clawd(_props) {
+function OccMark(props) {
+  const mode = props.mode ?? "compact";
+  const art = getOccMark(mode);
+  const [themeName] = useTheme();
+  const stops = GRADIENT_STOPS[gradientThemeFamily(themeName)];
+  const animate = props.animate ?? !(getInitialSettings().prefersReducedMotion ?? false);
+  const [done, setDone] = import_react146.useState(!animate);
+  const startTimeRef = import_react146.useRef(null);
+  const [ref, time3] = useAnimationFrame(done ? null : SHIMMER_FRAME_MS);
+  import_react146.useEffect(() => {
+    if (done)
+      return;
+    const timer2 = setTimeout(setDone, SHIMMER_DURATION_MS, true);
+    return () => clearTimeout(timer2);
+  }, [done]);
+  if (startTimeRef.current === null) {
+    startTimeRef.current = time3;
+  }
+  const elapsed = Math.max(0, time3 - startTimeRef.current);
+  const progress = done ? null : Math.min(elapsed / SHIMMER_DURATION_MS, 1);
   return /* @__PURE__ */ jsx_runtime258.jsx(ThemedBox_default, {
+    ref,
     flexDirection: "column",
-    children: DOGE_LINES.map((line, i6) => renderLine(line, i6))
+    flexShrink: 0,
+    children: art.map((_4, row) => /* @__PURE__ */ jsx_runtime258.jsx(MarkRow, {
+      art,
+      row,
+      stops,
+      progress
+    }, row))
   });
 }
-var jsx_runtime258, BODY_LINES, ACCENT_CHARS, DOGE_LINES;
-var init_Clawd = __esm(() => {
+var import_react146, jsx_runtime258, OCC_MARKS, GRADIENT_STOPS, SHIMMER_FRAME_MS = 84, SHIMMER_DURATION_MS = 1850, SHIMMER_BAND_WIDTH = 0.24;
+var init_OccMark = __esm(() => {
   init_ink2();
+  init_stringWidth();
+  init_settings2();
+  init_ThemeProvider();
+  import_react146 = __toESM(require_react(), 1);
   jsx_runtime258 = __toESM(require_jsx_runtime(), 1);
-  BODY_LINES = [
-    "   /\\___/\\   ",
-    "  ( o w o )~~",
-    "  (  =w=  )  ",
-    "   \\_____/   ",
-    "    | | |    "
-  ];
-  ACCENT_CHARS = new Set(["o", "w", "=", "~"]);
-  DOGE_LINES = normalizeLines(BODY_LINES);
+  OCC_MARKS = {
+    wide: normalizeMark([
+      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B",
+      "\u2588\u2588",
+      "\u2588\u2588",
+      "\u2588\u2588",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259C",
+      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
+    ]),
+    compact: normalizeMark([
+      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B",
+      "\u2588\u2588",
+      "\u2588\u2588",
+      "\u2588\u2588",
+      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259C",
+      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
+    ]),
+    plain: normalizeMark(["\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2599", "\u2588\u2588", "\u2588\u2588", "\u2588\u2588", "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u259B"])
+  };
+  GRADIENT_STOPS = {
+    dark: [
+      [255, 199, 110],
+      [255, 116, 64],
+      [233, 60, 136]
+    ],
+    light: [
+      [181, 110, 0],
+      [194, 62, 24],
+      [162, 22, 82]
+    ]
+  };
 });
 
 // src/components/LogoV2/Feed.tsx
@@ -684853,7 +685235,7 @@ function shouldShowGuestPassesUpsell() {
   return true;
 }
 function useShowGuestPassesUpsell() {
-  const [show] = import_react146.useState(_temp120);
+  const [show] = import_react147.useState(_temp120);
   return show;
 }
 function _temp120() {
@@ -684905,28 +685287,18 @@ function GuestPassesUpsell() {
   }
   return t0;
 }
-var import_compiler_runtime196, import_react146, jsx_runtime262;
+var import_compiler_runtime196, import_react147, jsx_runtime262;
 var init_GuestPassesUpsell = __esm(() => {
   init_ink2();
   init_analytics();
   init_referral();
   init_config4();
   import_compiler_runtime196 = __toESM(require_compiler_runtime(), 1);
-  import_react146 = __toESM(require_react(), 1);
+  import_react147 = __toESM(require_react(), 1);
   jsx_runtime262 = __toESM(require_jsx_runtime(), 1);
 });
 
 // src/components/LogoV2/OccWelcome.tsx
-function normalizeLogo(lines2) {
-  const width = Math.max(...lines2.map(stringWidth));
-  return lines2.map((line) => line + " ".repeat(width - stringWidth(line)));
-}
-function getOccLogo(mode) {
-  return OCC_LOGOS[mode];
-}
-function getOccLogoWidth(art) {
-  return Math.max(...art.map(stringWidth));
-}
 function getOccWelcomeMode(columns, plain = false) {
   if (plain || columns < COMPACT_MIN_COLUMNS)
     return "plain";
@@ -684953,92 +685325,33 @@ function welcomeTip(mode, sessionTip) {
   }
   return "Type /help for commands";
 }
-function getShimmerRuns(line, row, progress, art = OCC_LOGOS.wide) {
-  const chars = [...line];
-  if (chars.length === 0)
-    return [];
-  const runs = [];
-  const artWidth = getOccLogoWidth(art);
-  let displayColumn = 0;
-  for (let column = 0;column < chars.length; column++) {
-    const char = chars[column];
-    const diagonal = (displayColumn + (art.length - 1 - row) * 1.6) / (artWidth + art.length * 1.6);
-    const bandPosition = progress === null ? -1 : -SHIMMER_BAND_WIDTH + progress * 1.45;
-    const highlighted = progress !== null && char !== " " && Math.abs(diagonal - bandPosition) < SHIMMER_BAND_WIDTH;
-    const previous = runs[runs.length - 1];
-    if (previous?.highlighted === highlighted) {
-      previous.text += char;
-    } else {
-      runs.push({ text: char, highlighted });
-    }
-    displayColumn += stringWidth(char);
-  }
-  return runs;
-}
-function OccLogo({
-  art,
-  animate
-}) {
-  const [done, setDone] = import_react147.useState(!animate);
-  const startTimeRef = import_react147.useRef(null);
-  const [ref, time3] = useAnimationFrame(done ? null : SHIMMER_FRAME_MS);
-  import_react147.useEffect(() => {
-    if (done)
-      return;
-    const timer2 = setTimeout(setDone, SHIMMER_DURATION_MS, true);
-    return () => clearTimeout(timer2);
-  }, [done]);
-  if (startTimeRef.current === null) {
-    startTimeRef.current = time3;
-  }
-  const elapsed = Math.max(0, time3 - startTimeRef.current);
-  const progress = done ? null : Math.min(elapsed / SHIMMER_DURATION_MS, 1);
-  return /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
-    ref,
-    flexDirection: "column",
-    flexShrink: 0,
-    children: art.map((line, row) => /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-      children: getShimmerRuns(line, row, progress, art).map((run, index2) => /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-        color: run.highlighted ? "claudeShimmer" : "claude",
-        bold: run.highlighted,
-        children: run.text
-      }, `${row}-${index2}`))
-    }, row))
-  });
-}
-function Header({
-  version: version5,
-  showTagline,
+function DataRow({
+  label,
+  value,
   width
 }) {
-  return /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
-    width,
-    justifyContent: "space-between",
+  const labelCell = `${label}  `.slice(0, LABEL_COLUMN_WIDTH).padEnd(LABEL_COLUMN_WIDTH);
+  return /* @__PURE__ */ jsx_runtime263.jsxs(ThemedText, {
+    wrap: "truncate",
     children: [
-      /* @__PURE__ */ jsx_runtime263.jsxs(ThemedText, {
-        children: [
-          /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-            color: "claude",
-            bold: true,
-            children: "OCC"
-          }),
-          /* @__PURE__ */ jsx_runtime263.jsxs(ThemedText, {
-            dimColor: true,
-            children: [
-              " v",
-              version5
-            ]
-          })
-        ]
+      /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
+        color: "inactive",
+        children: labelCell
       }),
-      showTagline && /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-        dimColor: true,
-        wrap: "truncate",
-        children: "Open C Code"
+      /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
+        children: truncate(value, Math.max(width - LABEL_COLUMN_WIDTH, 1))
       })
     ]
   });
 }
+function DashedRule({ width }) {
+  return /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
+    color: "inactive",
+    dimColor: true,
+    wrap: "truncate",
+    children: "\u254C".repeat(Math.max(width, 1))
+  });
+}
 function Metadata({
   width,
   model,
@@ -685048,37 +685361,25 @@ function Metadata({
 }) {
   const modelLine = truncate(`${model} \xB7 ${billing}`, Math.max(width, 1));
   const agentPrefix = agentName ? `@${agentName} \xB7 ` : "";
-  const locationWidth = Math.max(width - stringWidth(agentPrefix), 1);
+  const locationValue = `${agentPrefix}${location}`;
   return /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
     flexDirection: "column",
     minWidth: 0,
     children: [
       /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
         bold: true,
-        children: "Ready when you are."
-      }),
-      /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-        dimColor: true,
         wrap: "truncate",
-        children: modelLine
+        children: "Ready when you are."
       }),
-      /* @__PURE__ */ jsx_runtime263.jsxs(ThemedText, {
-        wrap: "truncate",
-        children: [
-          agentPrefix && /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-            color: "claude",
-            children: agentPrefix
-          }),
-          /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-            dimColor: true,
-            children: truncate(location, locationWidth)
-          })
-        ]
+      /* @__PURE__ */ jsx_runtime263.jsx(DataRow, {
+        label: "MODEL",
+        value: modelLine,
+        width
       }),
-      /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-        dimColor: true,
-        wrap: "truncate",
-        children: "Safe, open, and auditable."
+      /* @__PURE__ */ jsx_runtime263.jsx(DataRow, {
+        label: "PROJ",
+        value: locationValue,
+        width
       })
     ]
   });
@@ -685087,16 +685388,17 @@ function PlainWelcome(props) {
   const width = Math.max(props.columns, 1);
   const location = formatWelcomeLocation(props.branch, props.cwd, width);
   const modelLine = truncate(`${props.model} \xB7 ${props.billing}`, width);
-  const logo = getOccLogo("plain");
-  const showLogo = !props.plain && width >= getOccLogoWidth(logo);
+  const logo = getOccMark("plain");
+  const showLogo = !props.plain && width >= getOccMarkWidth(logo);
+  const animate = !props.reducedMotion && !props.plain;
   return /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
     flexDirection: "column",
     children: [
       showLogo && /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
         marginBottom: 1,
-        children: /* @__PURE__ */ jsx_runtime263.jsx(OccLogo, {
-          art: logo,
-          animate: !props.reducedMotion
+        children: /* @__PURE__ */ jsx_runtime263.jsx(OccMark, {
+          mode: "plain",
+          animate
         })
       }),
       /* @__PURE__ */ jsx_runtime263.jsxs(ThemedText, {
@@ -685140,37 +685442,36 @@ function OccWelcome(props) {
       ...props
     });
   }
+  const [themeName] = useTheme();
   const cardWidth = Math.min(Math.max(props.columns, 1), WELCOME_MAX_WIDTH);
   const contentWidth = Math.max(cardWidth - 4, 1);
-  const logo = getOccLogo(mode);
-  const logoWidth = getOccLogoWidth(logo);
-  const location = formatWelcomeLocation(props.branch, props.cwd, mode === "wide" ? Math.max(contentWidth - logoWidth - 3, 1) : contentWidth);
+  const markMode = mode === "wide" ? "wide" : "compact";
+  const logo = getOccMark(markMode);
+  const logoWidth = getOccMarkWidth(logo);
+  const metaWidth = mode === "wide" ? Math.max(contentWidth - logoWidth - 3, 1) : contentWidth;
+  const location = formatWelcomeLocation(props.branch, props.cwd, metaWidth);
   const animate = !props.reducedMotion;
+  const borderTitle = `${color("claude", themeName)("OCC")}${color("inactive", themeName)(` v${props.version} \xB7 Open C Code`)}`;
   return /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
     width: cardWidth,
     flexDirection: "column",
     borderStyle: "round",
-    borderColor: "inactive",
-    borderDimColor: true,
+    borderColor: "claude",
+    borderText: { content: borderTitle, position: "top", align: "start", offset: 2 },
     paddingX: 1,
     children: [
-      /* @__PURE__ */ jsx_runtime263.jsx(Header, {
-        version: props.version,
-        showTagline: true,
-        width: contentWidth
-      }),
       mode === "wide" ? /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
         marginTop: 1,
         flexDirection: "row",
         gap: 3,
         alignItems: "center",
         children: [
-          /* @__PURE__ */ jsx_runtime263.jsx(OccLogo, {
-            art: logo,
+          /* @__PURE__ */ jsx_runtime263.jsx(OccMark, {
+            mode: "wide",
             animate
           }),
           /* @__PURE__ */ jsx_runtime263.jsx(Metadata, {
-            width: Math.max(contentWidth - logoWidth - 3, 1),
+            width: metaWidth,
             model: props.model,
             billing: props.billing,
             location,
@@ -685182,8 +685483,8 @@ function OccWelcome(props) {
         flexDirection: "column",
         alignItems: "center",
         children: [
-          /* @__PURE__ */ jsx_runtime263.jsx(OccLogo, {
-            art: logo,
+          /* @__PURE__ */ jsx_runtime263.jsx(OccMark, {
+            mode: "compact",
             animate
           }),
           /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
@@ -685199,19 +685500,22 @@ function OccWelcome(props) {
           })
         ]
       }),
-      /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
+      /* @__PURE__ */ jsx_runtime263.jsxs(ThemedBox_default, {
         marginTop: 1,
-        borderStyle: "single",
-        borderColor: "inactive",
-        borderDimColor: true,
-        borderBottom: false,
-        borderLeft: false,
-        borderRight: false,
-        children: /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
-          dimColor: true,
-          wrap: "truncate",
-          children: welcomeTip(mode, props.tip)
-        })
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsx_runtime263.jsx(DashedRule, {
+            width: contentWidth
+          }),
+          /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
+            marginTop: 0,
+            children: /* @__PURE__ */ jsx_runtime263.jsx(ThemedText, {
+              dimColor: true,
+              wrap: "truncate",
+              children: `\u25B8 ${welcomeTip(mode, props.tip)}`
+            })
+          })
+        ]
       }),
       props.children && /* @__PURE__ */ jsx_runtime263.jsx(ThemedBox_default, {
         marginTop: 1,
@@ -685220,32 +685524,13 @@ function OccWelcome(props) {
     ]
   });
 }
-var import_react147, jsx_runtime263, WELCOME_MAX_WIDTH = 84, WIDE_MIN_COLUMNS = 76, COMPACT_MIN_COLUMNS = 44, SHIMMER_FRAME_MS = 84, SHIMMER_DURATION_MS = 1850, SHIMMER_BAND_WIDTH = 0.24, OCC_LOGOS;
+var jsx_runtime263, WELCOME_MAX_WIDTH = 84, WIDE_MIN_COLUMNS = 76, COMPACT_MIN_COLUMNS = 44, LABEL_COLUMN_WIDTH = 7;
 var init_OccWelcome = __esm(() => {
   init_ink2();
-  init_stringWidth();
   init_format();
-  import_react147 = __toESM(require_react(), 1);
+  init_ThemeProvider();
+  init_OccMark();
   jsx_runtime263 = __toESM(require_jsx_runtime(), 1);
-  OCC_LOGOS = {
-    wide: normalizeLogo([
-      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
-      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B",
-      "\u2588\u2588        ",
-      "\u2588\u2588        ",
-      "\u2588\u2588        ",
-      "\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259C",
-      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
-    ]),
-    compact: normalizeLogo([
-      "\u259F\u2588\u2588\u2588\u2588\u2588\u2588\u2599",
-      "\u2588\u2588      ",
-      "\u2588\u2588      ",
-      "\u2588\u2588      ",
-      "\u259C\u2588\u2588\u2588\u2588\u2588\u2588\u259B"
-    ]),
-    plain: normalizeLogo(["\u259F\u2588\u2588\u2588\u2588\u2599", "\u2588\u2588    ", "\u259C\u2588\u2588\u2588\u2588\u259B"])
-  };
 });
 
 // src/components/LogoV2/welcomeTips.ts
@@ -686262,7 +686547,9 @@ function LogoV2() {
     if ($4[34] === Symbol.for("react.memo_cache_sentinel")) {
       t122 = /* @__PURE__ */ jsx_runtime270.jsx(ThemedBox_default, {
         marginY: 1,
-        children: /* @__PURE__ */ jsx_runtime270.jsx(Clawd, {})
+        children: /* @__PURE__ */ jsx_runtime270.jsx(OccMark, {
+          mode: "compact"
+        })
       });
       $4[34] = t122;
     } else {
@@ -686407,7 +686694,9 @@ function LogoV2() {
   }
   let t19;
   if ($4[48] === Symbol.for("react.memo_cache_sentinel")) {
-    t19 = /* @__PURE__ */ jsx_runtime270.jsx(Clawd, {});
+    t19 = /* @__PURE__ */ jsx_runtime270.jsx(OccMark, {
+      mode: "compact"
+    });
     $4[48] = t19;
   } else {
     t19 = $4[48];
@@ -686708,7 +686997,7 @@ var init_LogoV2 = __esm(() => {
   init_logoV2Utils();
   init_format();
   init_file();
-  init_Clawd();
+  init_OccMark();
   init_FeedColumn();
   init_feedConfigs();
   init_config4();
@@ -690594,8 +690883,8 @@ function formatSnippet({
   before,
   match,
   after
-}, highlightColor) {
-  return source_default.dim(before) + highlightColor(match) + source_default.dim(after);
+}, highlightColor2) {
+  return source_default.dim(before) + highlightColor2(match) + source_default.dim(after);
 }
 function extractSnippet(text2, query2, contextChars) {
   const matchIndex = text2.toLowerCase().indexOf(query2.toLowerCase());
@@ -690684,7 +690973,7 @@ function LogSelector(t0) {
   } else {
     t5 = $4[4];
   }
-  const highlightColor = t5;
+  const highlightColor2 = t5;
   const isAgenticSearchEnabled = false;
   const [currentBranch, setCurrentBranch] = import_react163.default.useState(null);
   const [branchFilterEnabled, setBranchFilterEnabled] = import_react163.default.useState(false);
@@ -691049,14 +691338,14 @@ function LogSelector(t0) {
       break bb2;
     }
     let t302;
-    if ($4[66] !== displayedLogs || $4[67] !== highlightColor || $4[68] !== maxLabelWidth || $4[69] !== showAllProjects || $4[70] !== snippets) {
+    if ($4[66] !== displayedLogs || $4[67] !== highlightColor2 || $4[68] !== maxLabelWidth || $4[69] !== showAllProjects || $4[70] !== snippets) {
       const sessionGroups = groupLogsBySessionId(displayedLogs);
       t302 = Array.from(sessionGroups.entries()).map((t312) => {
         const [sessionId, groupLogs] = t312;
         const latestLog = groupLogs[0];
         const indexInFiltered = displayedLogs.indexOf(latestLog);
         const snippet_0 = snippets.get(latestLog);
-        const snippetStr = snippet_0 ? formatSnippet(snippet_0, highlightColor) : null;
+        const snippetStr = snippet_0 ? formatSnippet(snippet_0, highlightColor2) : null;
         if (groupLogs.length === 1) {
           const metadata = buildLogMetadata(latestLog, {
             showProjectPath: showAllProjects
@@ -691077,7 +691366,7 @@ function LogSelector(t0) {
         const children3 = groupLogs.slice(1).map((log_8, index2) => {
           const childIndexInFiltered = displayedLogs.indexOf(log_8);
           const childSnippet = snippets.get(log_8);
-          const childSnippetStr = childSnippet ? formatSnippet(childSnippet, highlightColor) : null;
+          const childSnippetStr = childSnippet ? formatSnippet(childSnippet, highlightColor2) : null;
           const childMetadata = buildLogMetadata(log_8, {
             isChild: true,
             showProjectPath: showAllProjects
@@ -691116,7 +691405,7 @@ function LogSelector(t0) {
         };
       });
       $4[66] = displayedLogs;
-      $4[67] = highlightColor;
+      $4[67] = highlightColor2;
       $4[68] = maxLabelWidth;
       $4[69] = showAllProjects;
       $4[70] = snippets;
@@ -691141,9 +691430,9 @@ function LogSelector(t0) {
       break bb3;
     }
     let t312;
-    if ($4[73] !== displayedLogs || $4[74] !== highlightColor || $4[75] !== maxLabelWidth || $4[76] !== showAllProjects || $4[77] !== snippets) {
+    if ($4[73] !== displayedLogs || $4[74] !== highlightColor2 || $4[75] !== maxLabelWidth || $4[76] !== showAllProjects || $4[77] !== snippets) {
       let t323;
-      if ($4[79] !== highlightColor || $4[80] !== maxLabelWidth || $4[81] !== showAllProjects || $4[82] !== snippets) {
+      if ($4[79] !== highlightColor2 || $4[80] !== maxLabelWidth || $4[81] !== showAllProjects || $4[82] !== snippets) {
         t323 = (log_9, index_0) => {
           const rawSummary = getLogDisplayTitle(log_9);
           const summaryWithSidechain = rawSummary + (log_9.isSidechain ? " (sidechain)" : "");
@@ -691151,7 +691440,7 @@ function LogSelector(t0) {
           const baseDescription = formatLogMetadata(log_9);
           const projectSuffix = showAllProjects && log_9.projectPath ? ` \xB7 ${log_9.projectPath}` : "";
           const snippet_1 = snippets.get(log_9);
-          const snippetStr_0 = snippet_1 ? formatSnippet(snippet_1, highlightColor) : null;
+          const snippetStr_0 = snippet_1 ? formatSnippet(snippet_1, highlightColor2) : null;
           return {
             label: summary,
             description: snippetStr_0 ? `${baseDescription}${projectSuffix}
@@ -691160,7 +691449,7 @@ function LogSelector(t0) {
             value: index_0.toString()
           };
         };
-        $4[79] = highlightColor;
+        $4[79] = highlightColor2;
         $4[80] = maxLabelWidth;
         $4[81] = showAllProjects;
         $4[82] = snippets;
@@ -691170,7 +691459,7 @@ function LogSelector(t0) {
       }
       t312 = displayedLogs.map(t323);
       $4[73] = displayedLogs;
-      $4[74] = highlightColor;
+      $4[74] = highlightColor2;
       $4[75] = maxLabelWidth;
       $4[76] = showAllProjects;
       $4[77] = snippets;
@@ -700000,7 +700289,7 @@ var init_autocompact2 = __esm(() => {
 });
 
 // src/commands/cd/cdLogic.ts
-import { realpathSync as realpathSync8, statSync as statSync18 } from "fs";
+import { realpathSync as realpathSync8, statSync as statSync19 } from "fs";
 import { resolve as resolve57 } from "path";
 function resolveDirectoryTarget(target) {
   const resolved = resolve57(target);
@@ -700011,7 +700300,7 @@ function resolveDirectoryTarget(target) {
     return { ok: false, error: `Directory does not exist: ${resolved}` };
   }
   try {
-    if (!statSync18(physical).isDirectory()) {
+    if (!statSync19(physical).isDirectory()) {
       return { ok: false, error: `Not a directory: ${resolved}` };
     }
   } catch {
@@ -729276,7 +729565,7 @@ import {
   symlink as symlink5,
   utimes as utimes2
 } from "fs/promises";
-import { existsSync as existsSync26, readFileSync as readFileSync34, statSync as statSync19 } from "fs";
+import { existsSync as existsSync26, readFileSync as readFileSync34, statSync as statSync20 } from "fs";
 import { basename as basename51, dirname as dirname73, join as join166 } from "path";
 function validateWorktreeSlug(slug) {
   if (slug.length > MAX_WORKTREE_SLUG_LENGTH) {
@@ -729323,7 +729612,7 @@ function getLinkedGitWorktreePath() {
     const dotGit = join166(dir, ".git");
     try {
       if (existsSync26(dotGit)) {
-        const stats = statSync19(dotGit);
+        const stats = statSync20(dotGit);
         if (stats.isFile()) {
           const content = readFileSync34(dotGit, "utf8").trim();
           if (content.startsWith("gitdir:")) {
@@ -816549,8 +816838,7 @@ function runHeadlessStreaming(structuredIO, mcpClients, commands7, tools, initia
   const mutableMessages = initialMessages;
   let readFileState = extractReadFilesFromMessages(initialMessages, cwd2(), READ_FILE_STATE_CACHE_SIZE);
   const pendingSeeds = createFileStateCacheWithSizeLimit(READ_FILE_STATE_CACHE_SIZE);
-  const resumeInterruptedTurnEnv = process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN;
-  if (turnInterruptionState && turnInterruptionState.kind !== "none" && resumeInterruptedTurnEnv) {
+  if (turnInterruptionState && turnInterruptionState.kind !== "none" && isEnvTruthy(process.env.CLAUDE_CODE_RESUME_INTERRUPTED_TURN)) {
     logForDebugging(`[print.ts] Auto-resuming interrupted turn (kind: ${turnInterruptionState.kind})`);
     removeInterruptedMessage(mutableMessages, turnInterruptionState.message);
     enqueue({