@cnwenf/occ 2.1.299 → 2.1.300

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.299","BINARY_NAME":"occ","BUILD_TIME":"2026-08-12T20:49:17.819Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.300","BINARY_NAME":"occ","BUILD_TIME":"2026-08-13T23:37:42.199Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -189468,14 +189468,23 @@ function getCLISyspromptPrefix(options) {
   }
   return DEFAULT_PREFIX;
 }
-function isAttributionHeaderEnabled() {
-  if (isEnvDefinedFalsy(process.env.CLAUDE_CODE_ATTRIBUTION_HEADER)) {
+function isPlainAnthropicApiBaseUrl() {
+  const baseUrl = process.env.ANTHROPIC_BASE_URL;
+  if (!baseUrl) {
+    return true;
+  }
+  try {
+    return ["api.anthropic.com"].includes(new URL(baseUrl).host);
+  } catch {
     return false;
   }
-  return getFeatureValue_CACHED_MAY_BE_STALE("tengu_attribution_header", true);
 }
-function getAttributionHeader(fingerprint) {
-  if (!isAttributionHeaderEnabled()) {
+function getAttributionHeader(fingerprint, opts) {
+  const envOptOutBypassed = opts?.ignoreEnvOptOut === true && getAPIProvider() === "firstParty" && isPlainAnthropicApiBaseUrl() && !process.env.ANTHROPIC_UNIX_SOCKET;
+  if (!envOptOutBypassed && isEnvDefinedFalsy(process.env.CLAUDE_CODE_ATTRIBUTION_HEADER)) {
+    return "";
+  }
+  if (!getFeatureValue_CACHED_MAY_BE_STALE("tengu_attribution_header", true)) {
     return "";
   }
   const version5 = `${MACRO.VERSION}.${fingerprint}`;
@@ -389452,7 +389461,7 @@ async function sideQuery(opts) {
   }
   const messageText = extractFirstUserMessageText(messages);
   const fingerprint = computeFingerprint(messageText, MACRO.VERSION);
-  const attributionHeader = getAttributionHeader(fingerprint);
+  const attributionHeader = getAttributionHeader(fingerprint, opts.forceAttributionHeader ? { ignoreEnvOptOut: true } : undefined);
   const systemBlocks = [
     attributionHeader ? { type: "text", text: attributionHeader } : null,
     ...skipSystemPromptPrefix ? [] : [
@@ -390318,6 +390327,7 @@ async function classifyYoloActionXml(prefixMessages, systemPrompt, userPrompt, u
         max_tokens: (mode === "fast" ? 256 : 64) + thinkingPadding,
         system: systemBlocks,
         skipSystemPromptPrefix: true,
+        forceAttributionHeader: true,
         temperature: 0,
         thinking: disableThinking,
         messages: [
@@ -390398,6 +390408,7 @@ async function classifyYoloActionXml(prefixMessages, systemPrompt, userPrompt, u
       max_tokens: 4096 + thinkingPadding,
       system: systemBlocks,
       skipSystemPromptPrefix: true,
+      forceAttributionHeader: true,
       temperature: 0,
       thinking: disableThinking,
       messages: [
@@ -390594,6 +390605,7 @@ async function classifyYoloAction(messages, action2, tools, context4, signal) {
         }
       ],
       skipSystemPromptPrefix: true,
+      forceAttributionHeader: true,
       temperature: 0,
       thinking: disableThinking,
       messages: [
@@ -459890,11 +459902,27 @@ var init_bypassPermissionsKillswitch = __esm(() => {
 // src/commands/login/login.tsx
 var exports_login = {};
 __export(exports_login, {
+  getLoginStartingMessage: () => getLoginStartingMessage,
   call: () => call2,
+  buildLoginDoneMessage: () => buildLoginDoneMessage,
   Login: () => Login
 });
+function getLoginStartingMessage() {
+  return process.env.CLAUDE_CODE_OAUTH_TOKEN ? `Warning: CLAUDE_CODE_OAUTH_TOKEN is set in your environment. This session will switch to your new credentials after logging in, ${ENV_TOKEN_OVERRIDE_WARNING_TAIL}` : undefined;
+}
+function buildLoginDoneMessage(success2, opts) {
+  if (!success2)
+    return "Login interrupted";
+  const base2 = opts.bridgeDisconnected ? `Login successful. ${REMOTE_CONTROL_DISCONNECTED_NOTE}` : "Login successful";
+  return opts.envTokenWasSet && !opts.gatewayActive ? `${base2}
+
+${ENV_TOKEN_OVERRIDE_DONE_NOTE}` : base2;
+}
 async function call2(onDone, context6) {
+  const startingMessage = getLoginStartingMessage();
+  const envTokenWasSet = startingMessage !== undefined;
   return /* @__PURE__ */ jsx_runtime84.jsx(Login, {
+    startingMessage,
     onDone: async (success2) => {
       context6.onChangeAPIKey();
       context6.setMessages(stripSignatureBlocks);
@@ -459918,7 +459946,11 @@ async function call2(onDone, context6) {
           authVersion: prev.authVersion + 1
         }));
       }
-      onDone(success2 ? "Login successful" : "Login interrupted");
+      onDone(buildLoginDoneMessage(success2, {
+        bridgeDisconnected: false,
+        envTokenWasSet,
+        gatewayActive: getAPIProvider() === "gateway"
+      }));
     }
   });
 }
@@ -459986,7 +460018,7 @@ function _temp14(exitState) {
     description: "cancel"
   });
 }
-var import_compiler_runtime71, jsx_runtime84;
+var import_compiler_runtime71, jsx_runtime84, ENV_TOKEN_OVERRIDE_WARNING_TAIL = "but if that variable is set in your shell profile or a Claude Code settings file, new `claude` sessions will keep using the old token until you remove it there.", ENV_TOKEN_OVERRIDE_DONE_NOTE, REMOTE_CONTROL_DISCONNECTED_NOTE = "Remote Control disconnected.";
 var init_login = __esm(() => {
   init_featureFlags();
   init_state();
@@ -460000,10 +460032,12 @@ var init_login = __esm(() => {
   init_policyLimits();
   init_remoteManagedSettings();
   init_messages3();
+  init_providers();
   init_bypassPermissionsKillswitch();
   init_user();
   import_compiler_runtime71 = __toESM(require_compiler_runtime(), 1);
   jsx_runtime84 = __toESM(require_jsx_runtime(), 1);
+  ENV_TOKEN_OVERRIDE_DONE_NOTE = `Note: CLAUDE_CODE_OAUTH_TOKEN was set in your environment when /login started. This session will use your new credentials, ${ENV_TOKEN_OVERRIDE_WARNING_TAIL}`;
 });
 
 // src/utils/teleport/api.ts
@@ -584100,6 +584134,142 @@ var init_errors11 = __esm(() => {
   };
 });
 
+// src/tools/WorkflowTool/prefixStagger.ts
+function createWarmingEntry() {
+  let release;
+  const ready = new Promise((resolve44) => {
+    release = resolve44;
+  });
+  return { state: "warming", ready, release: () => release?.() };
+}
+function sleepWithAbort(ms, signal) {
+  return new Promise((resolve44) => {
+    if (signal?.aborted) {
+      resolve44();
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer2);
+      resolve44();
+    };
+    const timer2 = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve44();
+    }, ms);
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+function raceReadyWithTimeout(ready, timeoutMs, signal) {
+  if (signal?.aborted)
+    return Promise.resolve();
+  const controller = new AbortController;
+  const onAbort = () => controller.abort();
+  signal?.addEventListener("abort", onAbort, { once: true });
+  return Promise.race([ready, sleepWithAbort(timeoutMs, controller.signal)]).finally(() => {
+    controller.abort();
+    signal?.removeEventListener("abort", onAbort);
+  });
+}
+
+class WorkflowPrefixStaggerGate {
+  now;
+  entries = new Map;
+  constructor(now2 = Date.now) {
+    this.now = now2;
+  }
+  async enter(key3, opts) {
+    const now2 = this.now();
+    for (const [k5, entry] of this.entries) {
+      if (entry.state === "warm" && entry.until <= now2) {
+        this.entries.delete(k5);
+      }
+    }
+    const existing = this.entries.get(key3);
+    let warming;
+    let waitedMs = 0;
+    if (existing === undefined) {
+      warming = createWarmingEntry();
+      this.entries.set(key3, warming);
+    } else if (existing.state === "warming" && opts.capMs > 0) {
+      const start = this.now();
+      await raceReadyWithTimeout(existing.ready, opts.capMs, opts.signal);
+      waitedMs = Math.max(0, this.now() - start);
+    }
+    let respondedFired = false;
+    return {
+      leader: warming !== undefined,
+      waitedMs,
+      responded: () => {
+        respondedFired = true;
+        this.markWarm(key3);
+      },
+      done: () => {
+        if (respondedFired || warming === undefined)
+          return;
+        if (this.entries.get(key3) === warming && warming.state === "warming") {
+          this.entries.delete(key3);
+          warming.release();
+        }
+      }
+    };
+  }
+  stateOf(key3) {
+    const entry = this.entries.get(key3);
+    if (entry === undefined)
+      return "cold";
+    if (entry.state === "warm") {
+      return entry.until > this.now() ? "warm" : "cold";
+    }
+    return "warming";
+  }
+  clear() {
+    for (const entry of this.entries.values()) {
+      if (entry.state === "warming")
+        entry.release();
+    }
+    this.entries.clear();
+  }
+  markWarm(key3) {
+    const existing = this.entries.get(key3);
+    this.entries.set(key3, {
+      state: "warm",
+      until: this.now() + WORKFLOW_PREFIX_WARM_TTL_MS
+    });
+    if (existing?.state === "warming")
+      existing.release();
+  }
+}
+function getWorkflowPrefixStaggerGate() {
+  return singleton ??= new WorkflowPrefixStaggerGate;
+}
+function getWorkflowPrefixStaggerCapMs(env7 = process.env) {
+  if (isEnvTruthy(env7.DISABLE_PROMPT_CACHING)) {
+    return 0;
+  }
+  const raw = env7.CLAUDE_CODE_WORKFLOW_PREFIX_STAGGER_MS;
+  if (raw !== undefined && raw !== "") {
+    const parsed = Number.parseInt(raw, 10);
+    if (Number.isFinite(parsed) && parsed >= 0)
+      return parsed;
+  }
+  return WORKFLOW_PREFIX_STAGGER_DEFAULT_MS;
+}
+function buildWorkflowPrefixKey(parts) {
+  return [
+    parts.model ?? "",
+    String(parts.effort ?? ""),
+    parts.agentType,
+    parts.toolNames,
+    parts.schemaJson,
+    parts.cwd
+  ].join(`
+`);
+}
+var WORKFLOW_PREFIX_WARM_TTL_MS = 270000, WORKFLOW_PREFIX_STAGGER_DEFAULT_MS = 5000, singleton;
+var init_prefixStagger = __esm(() => {
+  init_envUtils();
+});
+
 // src/tools/WorkflowTool/primitives.ts
 function workflowAgentTelemetryAttributes(runId, workflowName) {
   return {
@@ -584291,10 +584461,29 @@ You MUST call the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool exactly once at the end of
       })
     ];
     let agentTokens = 0;
-    const onQueryProgress = () => {};
     const agentId = createAgentId("wf");
     const agentShortId = agentId.slice(0, 16);
     const agentLabel = opts.label ?? prompt.slice(0, 80);
+    const agentStartTime = Date.now();
+    const agentModel = opts.model ?? getMainLoopModel();
+    const prefixKey = buildWorkflowPrefixKey({
+      model: agentModel,
+      effort: opts.effort,
+      agentType: agentDef.agentType,
+      toolNames: ctx.availableTools.map((t4) => t4.name).join(","),
+      schemaJson: opts.schema ? JSON.stringify(opts.schema) : "",
+      cwd: worktreePath ?? getCwd()
+    });
+    const staggerHandle = await getWorkflowPrefixStaggerGate().enter(prefixKey, {
+      capMs: getWorkflowPrefixStaggerCapMs(),
+      signal: ctx.abortController.signal
+    });
+    if (staggerHandle.waitedMs > 0) {
+      logForDebugging(`workflow agent [${agentLabel}] held ${staggerHandle.waitedMs}ms for a same-prefix sibling's first response (prompt-cache warm-up)`);
+    }
+    const onQueryProgress = () => {
+      staggerHandle.responded();
+    };
     const gen = runAgent({
       agentDefinition: agentDef,
       promptMessages,
@@ -584313,8 +584502,6 @@ You MUST call the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool exactly once at the end of
       onQueryProgress,
       override: { agentId }
     });
-    const agentStartTime = Date.now();
-    const agentModel = opts.model ?? getMainLoopModel();
     logEvent2("tengu_workflow_agent_started", {
       ...workflowAgentTelemetryAttributes(ctx.runId, ctx.workflowName),
       agent_id: agentShortId,
@@ -584361,6 +584548,8 @@ You MUST call the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool exactly once at the end of
         elapsedMs: Math.max(0, Date.now() - agentStartTime)
       });
       throw e4;
+    } finally {
+      staggerHandle.done();
     }
     agentTokens = extractTokenUsage(messages);
     ctx.counters.spentTokens += agentTokens;
@@ -584617,7 +584806,10 @@ var init_primitives = __esm(() => {
   init_SyntheticOutputTool();
   init_errors11();
   init_journal();
+  init_prefixStagger();
   init_model();
+  init_cwd2();
+  init_debug();
 });
 
 // src/utils/effort/workflowDiscovery.ts
@@ -616820,7 +617012,7 @@ function getMcpAutoBackgroundMs(tool, {
 function isPipeNonInteractiveModeDefault() {
   return isPipeNonInteractiveMode();
 }
-function sleepWithAbort(ms, signal) {
+function sleepWithAbort2(ms, signal) {
   return new Promise((resolve53) => {
     if (signal.aborted) {
       resolve53("timeout");
@@ -616862,7 +617054,7 @@ async function callMcpToolWithAutoBackground({
   while (true) {
     const winner = await Promise.race([
       settledPromise,
-      sleepWithAbort(autoBackgroundMs, raceController.signal)
+      sleepWithAbort2(autoBackgroundMs, raceController.signal)
     ]);
     if (winner === "settled" || parentAbortController.signal.aborted) {
       raceController.abort();
@@ -823248,6 +823440,7 @@ async function autoModeCritiqueHandler(options) {
       model,
       system: CRITIQUE_SYSTEM_PROMPT,
       skipSystemPromptPrefix: true,
+      forceAttributionHeader: true,
       max_tokens: 4096,
       messages: [
         {

package/package.json

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