@organizaone/o1-code 0.3.0 → 0.5.0

package/chunks/{chunk-YCZXGP63.js → chunk-NVNIFGY3.js}

@@ -1,13 +1,16 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  QUOTA_EXHAUSTED_PREFIX,
   classifyRetryError,
   formatQuotaExhaustedMessage,
+  getErrorHeader,
+  getRateLimitErrorDetails,
   getRetryAfterDelayMs,
   getRetryDelayMs,
   isQuotaExhaustedError,
   isRetryableUpstreamError
-} from "./chunk-4OCNSFYL.js";
+} from "./chunk-WUKHAI4J.js";
 import {
   ResponsesHttpError
 } from "./chunk-NGE3GHMN.js";
@@ -31,6 +34,65 @@ var retryContext = new AsyncLocalStorage();
 
 // packages/core/src/utils/retry.ts
 init_esbuild_shims();
+
+// packages/core/src/utils/proxy-waits.ts
+init_esbuild_shims();
+var PROXY_LONG_WAIT_MS = 5 * 6e4;
+var PROXY_WAIT_CODES = /* @__PURE__ */ new Set([
+  "account_limit_exceeded",
+  "upstream_rate_limited",
+  "provider_unavailable",
+  "limits_unavailable"
+]);
+function readProxyWait(error, now = Date.now()) {
+  const status = getErrorStatus(error);
+  if (status !== 429 && status !== 503) return null;
+  const details = getRateLimitErrorDetails(error);
+  const limit = getErrorHeader(error, "x-aipp-limit") ?? void 0;
+  const ours = limit !== void 0 || details.providerCode !== void 0 && PROXY_WAIT_CODES.has(details.providerCode) || /usage limit is reached/i.test(details.providerMessage ?? "");
+  if (!ours) return null;
+  const resetHeader = getErrorHeader(error, "x-aipp-limit-reset");
+  const resetFromHeader = resetHeader ? Date.parse(resetHeader) : NaN;
+  const retryAfterMs = getRetryAfterDelayMs(error);
+  const waitMs = retryAfterMs ?? (Number.isFinite(resetFromHeader) ? Math.max(0, resetFromHeader - now) : 0);
+  const resetAt = new Date(
+    Number.isFinite(resetFromHeader) ? resetFromHeader : now + waitMs
+  );
+  return {
+    ...limit ? { limit } : {},
+    resetAt,
+    waitMs,
+    ...details.providerMessage ? { message: details.providerMessage } : {}
+  };
+}
+__name(readProxyWait, "readProxyWait");
+function isLongProxyWait(error, now) {
+  const wait = readProxyWait(error, now);
+  return wait !== null && wait.waitMs > PROXY_LONG_WAIT_MS;
+}
+__name(isLongProxyWait, "isLongProxyWait");
+function formatDuration(ms) {
+  const minutes = Math.max(1, Math.round(ms / 6e4));
+  const hours = Math.floor(minutes / 60);
+  const rest = minutes % 60;
+  if (hours === 0) return `${minutes} min`;
+  return rest === 0 ? `${hours} h` : `${hours} h ${rest} min`;
+}
+__name(formatDuration, "formatDuration");
+function formatProxyWaitMessage(error, now = Date.now()) {
+  const wait = readProxyWait(error, now);
+  const reason = wait?.message?.replace(/^\d{3}\s+/, "").trim() || (wait?.limit ? `The account limit ${wait.limit} is reached.` : "The provider asks to wait.");
+  const when = wait ? `Try again at ${wait.resetAt.toLocaleTimeString([], {
+    hour: "2-digit",
+    minute: "2-digit"
+  })} (in ${formatDuration(wait.waitMs)}).` : "";
+  return `${QUOTA_EXHAUSTED_PREFIX}${reason}
+
+${when} The request was not retried; send it again then, or switch to another model or provider.`.trim();
+}
+__name(formatProxyWaitMessage, "formatProxyWaitMessage");
+
+// packages/core/src/utils/retry.ts
 var debugLogger = createDebugLogger("RETRY");
 var PERSISTENT_MAX_BACKOFF_MS = 5 * 60 * 1e3;
 var PERSISTENT_CAP_MS = 6 * 60 * 60 * 1e3;
@@ -196,6 +258,10 @@ async function retryWithBackoff(fn, options) {
         );
         throw new Error(formatQuotaExhaustedMessage(error), { cause: error });
       }
+      if (isLongProxyWait(error)) {
+        debugLogger.error("Proxy asks for a long wait, fast-failing", error);
+        throw new Error(formatProxyWaitMessage(error), { cause: error });
+      }
       const isTransient = isTransientCapacityError(error);
       const callerAllowsRetry = hasCustomShouldRetryOnError ? shouldRetryOnError(error) : defaultShouldRetry(error, extraRetryErrorCodes);
       const isFailFast = retryDiagnostics.diagnosis === "fail-fast";
@@ -332,6 +398,11 @@ export {
  * Modified by the o1-code project; see NOTICE.
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * @license
+ * Copyright 2026 o1-code contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /**
  * @license
  * Copyright 2025 Google LLC

package/chunks/{chunk-ERV4L76G.js → chunk-OBGYVJZ6.js}

@@ -5,7 +5,7 @@ import {
   enableMouseEvents,
   useKeypress,
   useKeypressContext
-} from "./chunk-Y6NXDVBG.js";
+} from "./chunk-BDCHAXXY.js";
 import {
   INLINE_CODE_SPAN_PATTERN_SOURCE,
   calculateAverageLatency,
@@ -27,7 +27,7 @@ import {
   readInlineMathSpanAt,
   unescapeMarkdownBeforeMath,
   unescapeMarkdownDollars
-} from "./chunk-5ST67IZT.js";
+} from "./chunk-2I5ETR2G.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
@@ -51,7 +51,7 @@ import {
   isCollapsibleTool,
   isFindingsListDisplay,
   showsToolLabel
-} from "./chunk-C6U74Q6C.js";
+} from "./chunk-7YT5K5ST.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -101,10 +101,10 @@ import {
 } from "./chunk-XZ3MQL2U.js";
 import {
   relaunchApp
-} from "./chunk-NHKFCD4F.js";
+} from "./chunk-4ZA2DNDT.js";
 import {
   getErrorMessage
-} from "./chunk-QQQRGEHT.js";
+} from "./chunk-VIXCJWEM.js";
 import {
   cpLen,
   cpSlice,
@@ -123,10 +123,10 @@ import {
 } from "./chunk-F5IN4KK7.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-JE64TPWB.js";
+} from "./chunk-WGHVI55A.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-ELIXZXZC.js";
+} from "./chunk-Y3KJFSGP.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
@@ -134,12 +134,12 @@ import {
 } from "./chunk-3CMD4E67.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-BDKFE7EF.js";
+} from "./chunk-KRCRVCN5.js";
 import {
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-FWXUI7DZ.js";
+} from "./chunk-AI2PV62X.js";
 import {
   IdeClient,
   allowEditorTypeInSandbox,
@@ -149,10 +149,10 @@ import {
   ideContextStore,
   isEditorAvailable,
   isValidEditorType
-} from "./chunk-TNQJ66S4.js";
+} from "./chunk-S7EZBSGP.js";
 import {
   ShellExecutionService
-} from "./chunk-TKHMBUSK.js";
+} from "./chunk-FZUEC7ES.js";
 import {
   stripAnsi
 } from "./chunk-WU3R2YUE.js";
@@ -161,7 +161,7 @@ import {
 } from "./chunk-M7AWQAB7.js";
 import {
   buildHumanReadableRuleLabel
-} from "./chunk-I7XXUDXZ.js";
+} from "./chunk-NGPEFWU4.js";
 import {
   ALL_PROVIDERS,
   PROVIDER_METADATA_NS,
@@ -176,14 +176,14 @@ import {
   resolveMetadataKey,
   resolveOwnsModel,
   tryResolveModelProtocol
-} from "./chunk-4NV74I76.js";
+} from "./chunk-I2XHQTBX.js";
 import {
   MAIN_SOURCE,
   formatVisionBridgeNoticeDisplay,
   getMCPServerStatus,
   isVisionBridgeNoticeDisplay,
   uiTelemetryService
-} from "./chunk-RYKMFNWC.js";
+} from "./chunk-FXPZKL6H.js";
 import {
   isTerminalImageDisplay
 } from "./chunk-JOFGX5ZA.js";

package/chunks/{chunk-AQVYFR7E.js → chunk-OMJU4YIQ.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-CDYMT4OZ.js";
 import {
   isSubagentLikeExecutionContext
-} from "./chunk-I7XXUDXZ.js";
+} from "./chunk-NGPEFWU4.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation

package/chunks/{chunk-7OHUVM2P.js → chunk-PH4SO4P2.js}

@@ -3,7 +3,7 @@
 import {
   captureRuntimeFileVersion,
   writeRuntimeFile
-} from "./chunk-VNMKY2V3.js";
+} from "./chunk-UT656E5I.js";
 import {
   checkTeamMemorySecrets
 } from "./chunk-ZMZRVR62.js";
@@ -15,17 +15,17 @@ import {
   detectLineEnding,
   getDiffStat,
   needsUtf8Bom
-} from "./chunk-TNQJ66S4.js";
+} from "./chunk-S7EZBSGP.js";
 import {
   FileOperationEvent,
   ReadFileTool,
   getLanguageFromFilePath,
   logFileOperation
-} from "./chunk-RYKMFNWC.js";
+} from "./chunk-FXPZKL6H.js";
 import {
   fileExists,
   getSpecificMimeType
-} from "./chunk-E4BNWSC7.js";
+} from "./chunk-H5L5E5NI.js";
 import {
   isAnyAutoMemPath,
   isTeamAutoMemPath

package/chunks/{chunk-UNRHVAPY.js → chunk-QDZTSZTF.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   parseRule
-} from "./chunk-I7XXUDXZ.js";
+} from "./chunk-NGPEFWU4.js";
 import {
   init_esbuild_shims
 } from "./chunk-S2467S6L.js";

package/chunks/{chunk-AG2ELNEP.js → chunk-QFGGMNXV.js}

@@ -24,11 +24,11 @@ import {
 import {
   isGoalCheckpointBookkeepingRecord,
   projectGoalCard
-} from "./chunk-FWXUI7DZ.js";
+} from "./chunk-AI2PV62X.js";
 import {
   observeToolResultBoundary,
   toolResultBoundaryArtifact
-} from "./chunk-TNQJ66S4.js";
+} from "./chunk-S7EZBSGP.js";
 import {
   isShellResultDisplay
 } from "./chunk-GYGA6V6B.js";
@@ -43,11 +43,11 @@ import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   parseGoalStateRecordPayloadV2
-} from "./chunk-3YCUO772.js";
+} from "./chunk-WOZVQEFV.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-RYKMFNWC.js";
+} from "./chunk-FXPZKL6H.js";
 import {
   SchemaValidator
 } from "./chunk-V44Y3PCO.js";
@@ -2598,7 +2598,7 @@ async function collectSessionMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-3Q5WFRWL.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-T5ZBIEH5.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;
@@ -2768,6 +2768,8 @@ var ExportSessionContext = class {
         role: messageRole,
         parts: [{ text: content3.text }],
         timestamp: Date.now(),
+        uuid: this.getMessageUuid(),
+        recordTimestamp: this.getMessageTimestamp(),
         ...usageMetadata && role === "assistant" ? { usageMetadata } : {}
       };
     }
@@ -2838,11 +2840,11 @@ var ExportSessionContext = class {
   }
   flushCurrentMessage(freshUuid = false) {
     if (!this.currentMessage) return;
-    const uuid = freshUuid ? randomUUID() : this.getMessageUuid();
+    const uuid = freshUuid ? randomUUID() : this.currentMessage.uuid;
     const exportMessage = {
       uuid,
       sessionId: this.sessionId,
-      timestamp: this.getMessageTimestamp(),
+      timestamp: freshUuid ? this.getMessageTimestamp() : this.currentMessage.recordTimestamp,
       type: this.currentMessage.type,
       message: {
         role: this.currentMessage.role,
@@ -3430,7 +3432,7 @@ var DOCUMENT_HTML_TEMPLATE = `<!doctype html>
       id="transcript-stylesheet"
       integrity="sha384-pGE8/NNiGjEN6cs9ehdKVxXRu/C7j3ZWtGt3M/nUkYUw6b+dLpqzzwwwSdPn4cBA"
       crossorigin="anonymous"
-      href="https://unpkg.com/@organizaone/o1-code@0.3.0/export-transcript-document.css"
+      href="https://unpkg.com/@organizaone/o1-code@0.5.0/export-transcript-document.css"
     />
   </head>
   <body>
@@ -3484,14 +3486,14 @@ var DOCUMENT_HTML_TEMPLATE = `<!doctype html>
     <script
       nonce="__EXPORT_NONCE__"
       id="transcript-renderer"
-      integrity="sha384-76XXZgU9cO4AeqDeqQdUMfyur4nbt/6c9t1h3Ww8d06Zixlzj0gfgOPDinZO+lei"
+      integrity="sha384-fTl9YO9HkZYKjEOPvqXknmjyAG1FuEoyv799jx86j23fn3g1YddENSlfTc2XIl7M"
       crossorigin="anonymous"
-      src="https://unpkg.com/@organizaone/o1-code@0.3.0/export-transcript-document.js"
+      src="https://unpkg.com/@organizaone/o1-code@0.5.0/export-transcript-document.js"
     ></script>
   </body>
 </html>
 `;
-var EXPORT_TRANSCRIPT_RENDERER_VERSION = "0.3.0+9957e4232344d056";
+var EXPORT_TRANSCRIPT_RENDERER_VERSION = "0.5.0+9957e4232344d056";
 var EXPORT_TRANSCRIPT_RENDERER_LIMITS = Object.freeze({
   maxBlocks: 1e3,
   maxEnvelopeBytes: 33554432

package/chunks/{chunk-QPGBAI7B.js → chunk-QGVUKQPI.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getEffectiveOmniUploadConfig
-} from "./chunk-4JQ6AGCG.js";
+} from "./chunk-L37WUEXT.js";
 import {
   createDebugLogger
 } from "./chunk-UK2KIU2V.js";

package/chunks/{chunk-7J3ZEJUN.js → chunk-RBQQCGVG.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-KQCQCJBL.js";
 import {
   createSessionOrganizationService
-} from "./chunk-RHYRXRHW.js";
+} from "./chunk-ZZG3Z2XX.js";
 import {
   SessionArchivedError,
   SessionArchivingError,
@@ -23,7 +23,7 @@ import {
 import {
   readWorktreeSession,
   readWorktreeSessionStrict
-} from "./chunk-KXN7Q6SB.js";
+} from "./chunk-6TWJYLJE.js";
 import {
   GROUP_COLOR_OPTIONS,
   SESSION_PR_LIST_LIMIT,
@@ -33,10 +33,9 @@ import {
   SessionTranscriptChangedError,
   SessionWriterUnavailableError,
   canonicalSessionPrUrl,
-  gitEnv,
   readSessionPrs,
   toSessionPrInfo
-} from "./chunk-TNQJ66S4.js";
+} from "./chunk-S7EZBSGP.js";
 import {
   cronTaskSessionDeletionId,
   getCronFilePath,
@@ -44,12 +43,9 @@ import {
 } from "./chunk-EP7GGUVV.js";
 import {
   GitWorktreeService,
-  WORKTREE_SESSION_FILE,
-  readWorktreeSessionMarkerStrict
-} from "./chunk-S2LBLNBW.js";
-import {
-  NO_EXEC_CONFIG
-} from "./chunk-IO32UWHY.js";
+  readWorktreeSessionMarkerStrict,
+  worktreeHasWork
+} from "./chunk-CMZHL55Y.js";
 import {
   addDaemonRequestAttribute
 } from "./chunk-POHJY7RJ.js";
@@ -1526,8 +1522,6 @@ init_esbuild_shims();
 import fs from "node:fs";
 import * as fsp from "node:fs/promises";
 import path2 from "node:path";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 
 // packages/cli/src/serve/server/worktree-ownership-op.ts
 init_esbuild_shims();
@@ -1564,35 +1558,6 @@ function canonicalPath(candidate) {
   }
 }
 __name(canonicalPath, "canonicalPath");
-var execFileAsync = promisify(execFile);
-var DISPOSABLE_IGNORED_ROOTS = /* @__PURE__ */ new Set(["node_modules", "dist", "coverage"]);
-async function checkoutHasWork(worktreePath) {
-  try {
-    const { stdout } = await execFileAsync(
-      "git",
-      [
-        ...NO_EXEC_CONFIG,
-        "--no-optional-locks",
-        "status",
-        "--porcelain",
-        "--untracked-files=normal",
-        "--ignored=matching"
-      ],
-      { cwd: worktreePath, env: gitEnv() }
-    );
-    return stdout.split("\n").filter((line) => line.trim().length > 0).some((line) => {
-      const entry = line.slice(3);
-      if (entry === WORKTREE_SESSION_FILE) return false;
-      if (line.startsWith("!!")) {
-        return !DISPOSABLE_IGNORED_ROOTS.has(entry.split("/")[0]);
-      }
-      return true;
-    });
-  } catch {
-    return true;
-  }
-}
-__name(checkoutHasWork, "checkoutHasWork");
 function logWarning(message) {
   writeStderrLine(`o1-code serve: ${message}`);
 }
@@ -1778,7 +1743,7 @@ async function executeWorktreeCleanup(plan) {
     logWorktreeCleanupPreserve(sessionId, "marker changed after delete");
     return;
   }
-  if (await checkoutHasWork(plan.lockKey)) {
+  if (await worktreeHasWork(plan.lockKey)) {
     logWorktreeCleanupPreserve(sessionId, "checkout has uncommitted work");
     return;
   }

package/chunks/{chunk-J7G3OJOX.js → chunk-RMDWSEWQ.js}

@@ -2,40 +2,43 @@
 "use strict";
 import {
   buildModelReasoningRoutePreview
-} from "./chunk-UKS76REW.js";
+} from "./chunk-KFJXCZWZ.js";
 import {
   snapshotProcessEnv
-} from "./chunk-QS7N2YMJ.js";
+} from "./chunk-UQ34TBDD.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-3CO4GKLV.js";
+} from "./chunk-ZHYAWJRF.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-I3G7XU6U.js";
+} from "./chunk-ZATS5TUZ.js";
 import {
   getModelConfigurationKey
-} from "./chunk-ERJWPEY7.js";
+} from "./chunk-BLEJR2GA.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
   getCurrentAcpModelId,
   parseAcpBaseModelId,
   sanitizeProviderBaseUrl
-} from "./chunk-D4RCT4J4.js";
+} from "./chunk-F5TEGYB2.js";
 import {
   loadSettings
-} from "./chunk-ELIXZXZC.js";
+} from "./chunk-Y3KJFSGP.js";
 import {
   APPROVAL_MODES
 } from "./chunk-KQAVEXYD.js";
 import {
   ModelsConfig,
   resolveReasoningCapabilities
-} from "./chunk-4NV74I76.js";
+} from "./chunk-I2XHQTBX.js";
 import {
   tokenLimit
-} from "./chunk-LVFKSBH3.js";
+} from "./chunk-HOVKZNOX.js";
+import {
+  redactProxyCredentials
+} from "./chunk-PLWOHBC7.js";
 import {
   createDebugLogger
 } from "./chunk-UK2KIU2V.js";
@@ -107,7 +110,7 @@ function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
       currentRegistryBaseUrl
     ) : void 0;
     const fastModelId = typeof settings.fastModel === "string" && settings.fastModel.length > 0 ? settings.fastModel : void 0;
-    const visionModelId = typeof settings.visionModel === "string" && settings.visionModel.length > 0 ? settings.visionModel : void 0;
+    const visionModelId = typeof settings.visionModel === "string" && settings.visionModel.length > 0 ? redactProxyCredentials(settings.visionModel) : void 0;
     const approvalMode = resolveApprovalMode(settings);
     const providers = /* @__PURE__ */ new Map();
     for (const option of modelOptions) {

package/chunks/{chunk-KTH2NXBH.js → chunk-RPOVX6MQ.js}

@@ -14,7 +14,7 @@ import {
 init_esbuild_shims();
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.3.0";
+  return "0.5.0";
 }
 __name(getCliVersion, "getCliVersion");
 function formatVersionLabel(version) {