@atlasharness/atlascode 0.1.68 → 0.1.70

package/README.md

@@ -5,8 +5,8 @@
 （OpenAI-protocol 静态键车道，任意 OpenAI-compatible 端点）与国产平台工具链预留
 （Ascend NPU 域包为可插拔叠加层，W6 起接入）。
 
-> 版本现状：G-α 前置阶段（v0.1.0 发布待 W2–W4 闭环 + P-1 远端仓库，见
-> `docs/roadmap-domestic-and-residuals.md`）。
+> 版本现状：v0.1.x 持续发布（npm `@atlasharness/atlascode` live，P-1 远端仓已解除，
+> 见 `docs/roadmap-domestic-and-residuals.md`）。
 
 ## 安装
 
@@ -20,7 +20,22 @@ npm install -g @atlasharness/atlascode
 atlascode --help   # 别名 `atlas` 同效
 ```
 
-**② git 源码**（前置：`git` + [bun](https://bun.sh)（构建）+ `node`（运行））
+**Windows（PowerShell / cmd）**
+
+```powershell
+# npm 通道（与 Unix 同款，仅需 Node ≥ 20）
+npm install -g @atlasharness/atlascode
+atlascode --help   # 别名 `atlas` 同效
+```
+
+> - 装完 `atlascode`/`atlas` 不识别 → 重开终端（或把 npm 全局 bin 目录加入 `PATH`）。
+> - git 源码通道 `./install.sh` 为 Unix shell 脚本，Windows 不可直接用；Windows 走 npm 通道，
+>   或手动 `git clone <repo-url>` + [bun](https://bun.sh)（`bun install && bun run build`）。
+> - 镜像 registry（如 npmmirror）超时/403 时切官方源：
+>   `npm install -g @atlasharness/atlascode --registry https://registry.npmjs.org`
+>   （Windows 多 OS 波 0.1.43 已验 npm 通道安装 + 启动链）。
+
+**② git 源码**（Unix；前置：`git` + [bun](https://bun.sh)（构建）+ `node`（运行））
 
 ```bash
 ./install.sh [repo-url]

package/dist/cli.js

@@ -19926,10 +19926,7 @@ function getRoleConfig(role) {
   const provider = normalizeProvider(envProvider) ?? normalizeProvider(roleSetting.provider) ?? "openai";
   const model = envModel ?? roleSetting.model;
   const baseURL = envBaseUrl ?? roleSetting.baseURL;
-  let apiKey = envApiKey ?? roleSetting.apiKey;
-  if (apiKey === undefined) {
-    apiKey = getEndpointConfigSource().getGlobalApiKey();
-  }
+  const apiKey = envApiKey ?? roleSetting.apiKey;
   return { provider, model, baseURL, apiKey };
 }
 function getRoleModel(role) {
@@ -27063,6 +27060,9 @@ class OpenAIProvider {
     return this.timeoutResolver ? this.timeoutResolver() : this.timeoutMs;
   }
   async chat(args) {
+    if (args.onStreamDelta) {
+      return await this.chatWithDelta(args);
+    }
     const refs = getRoleModels(args.role, args.sessionModel, args.fallbackModel);
     if (refs.length === 0) {
       throw new Error(`No models configured for role '${args.role}' (empty pool). ` + `Add modelRoles/providers to ~/.atlas/settings.json, or set ATLAS_${args.role.toUpperCase()}_MODEL, then restart.`);
@@ -27160,6 +27160,66 @@ class OpenAIProvider {
       throw lastErr;
     throw new Error(`No models configured for role '${args.role}'.`);
   }
+  async chatWithDelta(args) {
+    const refs = getRoleModels(args.role, args.sessionModel, args.fallbackModel);
+    if (refs.length === 0) {
+      throw new Error(`No models configured for role '${args.role}' (empty pool). ` + `Add modelRoles/providers to ~/.atlas/settings.json, or set ATLAS_${args.role.toUpperCase()}_MODEL, then restart.`);
+    }
+    const attemptRefs = refs;
+    let lastErr = null;
+    const onDelta = args.onStreamDelta;
+    for (const ref of attemptRefs) {
+      const entry = resolveModel(ref);
+      if (!entry) {
+        lastErr = new Error(`unknown provider/model reference: ${ref}`);
+        continue;
+      }
+      const client = getClientForEntry(entry);
+      let params;
+      if (args.openaiParams) {
+        params = { ...args.openaiParams, model: entry.modelId, stream: true };
+      } else {
+        params = {
+          ...await buildOpenAIParams({
+            messages: args.messages ?? [],
+            systemPrompt: args.systemPrompt ?? asSystemPrompt([]),
+            tools: args.tools,
+            thinkingConfig: args.thinkingConfig,
+            options: args.options
+          }, args.role, entry),
+          ...args.responseFormat ? { response_format: args.responseFormat } : {},
+          stream: true
+        };
+      }
+      for (let attempt = 0;attempt < this.maxRetriesPerModel; attempt++) {
+        if (args.signal?.aborted)
+          throw args.signal.reason ?? new Error("aborted");
+        let assistant = null;
+        try {
+          for await (const ev of this.streamOneAttempt(client, params, entry, args.signal, attempt, this.maxRetriesPerModel)) {
+            const t = ev.type;
+            if (t === "text_delta" || t === "tool_use_start" || t === "tool_use_delta" || t === "tool_use_end") {
+              onDelta(ev);
+            } else if (t === "assistant") {
+              assistant = ev;
+            }
+          }
+          if (assistant)
+            return assistant;
+        } catch (err) {
+          lastErr = err;
+          if (!shouldRetryModelError(err, args.signal))
+            break;
+          if (attempt < this.maxRetriesPerModel - 1) {
+            await this.retryBackoffSleep(modelRetryBackoffMs(attempt, this.retryBackoffBaseMs, this.retryBackoffCapMs), args.signal);
+          }
+        }
+      }
+    }
+    if (lastErr)
+      throw lastErr;
+    throw new Error(`No models configured for role '${args.role}'.`);
+  }
   async* chatStream(args) {
     const refs = getRoleModels(args.role, args.sessionModel);
     if (refs.length === 0) {
@@ -81394,7 +81454,17 @@ REMINDER: Do NOT call any tools. Respond with plain text only — ` + "an <analy
 });
 
 // src/engine/context/autoCompactWindow.ts
-function resolveAutoCompactWindow(setting) {
+function isAutoCompactWindowSetting(x) {
+  return typeof x === "object" && x !== null && "kind" in x;
+}
+function normalizeAutoCompactWindowSetting(raw) {
+  if (!raw)
+    return {};
+  if (isAutoCompactWindowSetting(raw))
+    return { default: raw };
+  return raw;
+}
+function resolveAutoCompactWindowSingle(setting) {
   if (!setting || setting.kind === "auto") {
     return {};
   }
@@ -81412,6 +81482,11 @@ function resolveAutoCompactWindow(setting) {
   }
   return {};
 }
+function resolveAutoCompactWindow(setting, model) {
+  const perModel = normalizeAutoCompactWindowSetting(setting);
+  const chosen = model && perModel[model] || perModel.default;
+  return resolveAutoCompactWindowSingle(chosen);
+}
 function parseAutoCompactTierInput(raw) {
   const s = raw.trim();
   if (s === "") {
@@ -81464,16 +81539,16 @@ function setAutoCompactSettingsSource(next) {
 function setAutoCompactWindowSettingsSource(next) {
   autoCompactWindowSettingsSource = next;
 }
-function mergeAutoCompactOverrides(env, setting) {
-  const tier = resolveAutoCompactWindow(setting);
+function mergeAutoCompactOverrides(env, setting, model) {
+  const tier = resolveAutoCompactWindow(setting, model);
   return {
     pctOverride: env.pctOverride ?? tier.pctOverride,
     windowOverride: env.windowOverride ?? tier.windowOverride,
     autoCompactDisabled: env.disabled === true || env.autoCompactDisabled === true || tier.autoCompactDisabled === true
   };
 }
-function getMergedAutoCompactOverrides() {
-  return mergeAutoCompactOverrides(getAutoCompactEnvOverrides(), autoCompactWindowSettingsSource?.() ?? null);
+function getMergedAutoCompactOverrides(model) {
+  return mergeAutoCompactOverrides(getAutoCompactEnvOverrides(), autoCompactWindowSettingsSource?.() ?? null, model);
 }
 function getEffectiveContextWindowSizeCore(contextWindow, maxOutputTokens, windowOverride) {
   const window2 = windowOverride !== undefined && windowOverride > 0 ? Math.min(contextWindow, windowOverride) : contextWindow;
@@ -81482,7 +81557,7 @@ function getEffectiveContextWindowSizeCore(contextWindow, maxOutputTokens, windo
 }
 function getEffectiveContextWindowSize(contextWindowOrModel, maxOutputTokens, windowOverride) {
   if (typeof contextWindowOrModel === "string") {
-    const { windowOverride } = getMergedAutoCompactOverrides();
+    const { windowOverride } = getMergedAutoCompactOverrides(contextWindowOrModel);
     return getEffectiveContextWindowSizeCore(resolveModelContextWindow(contextWindowOrModel), undefined, windowOverride);
   }
   return getEffectiveContextWindowSizeCore(contextWindowOrModel, maxOutputTokens, windowOverride);
@@ -81497,7 +81572,7 @@ function getAutoCompactThresholdCore(contextWindow, maxOutputTokens, pctOverride
 }
 function getAutoCompactThreshold(contextWindowOrModel, maxOutputTokens, pctOverride, windowOverride) {
   if (typeof contextWindowOrModel === "string") {
-    const o = getMergedAutoCompactOverrides();
+    const o = getMergedAutoCompactOverrides(contextWindowOrModel);
     return getAutoCompactThresholdCore(resolveModelContextWindow(contextWindowOrModel), undefined, o.pctOverride, o.windowOverride);
   }
   return getAutoCompactThresholdCore(contextWindowOrModel, maxOutputTokens, pctOverride, windowOverride);
@@ -81508,10 +81583,10 @@ function isAutoCompactThresholdPositive(contextWindow, maxOutputTokens, pctOverr
 function calculateTokenWarningState(tokenUsage, paramsOrModel) {
   if (typeof paramsOrModel === "string") {
     const env = getAutoCompactEnvOverrides();
-    const o = getMergedAutoCompactOverrides();
+    const o = getMergedAutoCompactOverrides(paramsOrModel);
     return calculateTokenWarningStateCore(tokenUsage, {
       contextWindow: resolveModelContextWindow(paramsOrModel),
-      autoCompactEnabled: isAutoCompactEnabled(),
+      autoCompactEnabled: isAutoCompactEnabledForModel(paramsOrModel),
       pctOverride: o.pctOverride,
       windowOverride: o.windowOverride,
       blockingLimitOverride: env.blockingLimitOverride
@@ -81570,6 +81645,17 @@ function isAutoCompactEnabled(flags) {
     return false;
   return flags.settingsEnabled !== false;
 }
+function isAutoCompactEnabledForModel(model) {
+  const o = getAutoCompactEnvOverrides();
+  if (o.disabled)
+    return false;
+  if (o.autoCompactDisabled)
+    return false;
+  if (getMergedAutoCompactOverrides(model).autoCompactDisabled) {
+    return false;
+  }
+  return autoCompactSettingsSource ? autoCompactSettingsSource() ?? true : true;
+}
 async function shouldAutoCompact(messages, deps) {
   if (deps.querySource === "compact" || deps.querySource === "session_memory") {
     return false;
@@ -82163,7 +82249,8 @@ async function queryOneRound(deps, tools, messages) {
     thinkingConfig: deps.thinkingConfig,
     responseFormat: deps.responseFormat,
     fallbackModel: deps.fallbackModel,
-    options: deps.effortValue !== undefined ? { effortValue: deps.effortValue } : undefined
+    options: deps.effortValue !== undefined ? { effortValue: deps.effortValue } : undefined,
+    onStreamDelta: deps.emit ? (delta) => deps.emit({ type: "stream_delta", delta }) : undefined
   };
   let resp = await withTurnRecovery(() => deps.modelProvider.chat(chatArgs), {
     signal: deps.signal
@@ -123897,7 +123984,7 @@ var init_internalWrites = __esm(() => {
   timestamps = new Map;
 });
 // src/tui/utils/settings/types.ts
-var isMcpServerCommandEntry = () => ({}), isMcpServerNameEntry = () => ({}), isMcpServerUrlEntry = () => ({}), SettingsSchema2 = () => object({
+var isMcpServerCommandEntry = () => ({}), isMcpServerNameEntry = () => ({}), isMcpServerUrlEntry = () => ({}), autoCompactWindowSettingSchema, SettingsSchema2 = () => object({
   model: string2().optional(),
   modelRoles: record(string2(), any()).optional(),
   defaultRole: string2().optional(),
@@ -123940,11 +124027,9 @@ var isMcpServerCommandEntry = () => ({}), isMcpServerNameEntry = () => ({}), isM
   language: string2().optional(),
   theme: string2().optional(),
   tui: object({ fullscreen: boolean2().optional() }).optional(),
-  autoCompactWindow: discriminatedUnion("kind", [
-    object({ kind: literal("auto") }),
-    object({ kind: literal("off") }),
-    object({ kind: literal("window"), tokens: number2().int().min(1000) }),
-    object({ kind: literal("pct"), pct: number2().min(1).max(100) })
+  autoCompactWindow: union([
+    autoCompactWindowSettingSchema,
+    record(string2(), autoCompactWindowSettingSchema)
   ]).optional(),
   llmTimeoutMs: number2().int().positive().optional(),
   prefersReducedMotion: boolean2().optional(),
@@ -123983,6 +124068,12 @@ var isMcpServerCommandEntry = () => ({}), isMcpServerNameEntry = () => ({}), isM
 }).passthrough(), CUSTOMIZATION_SURFACES;
 var init_types7 = __esm(() => {
   init_zod();
+  autoCompactWindowSettingSchema = discriminatedUnion("kind", [
+    object({ kind: literal("auto") }),
+    object({ kind: literal("off") }),
+    object({ kind: literal("window"), tokens: number2().int().min(1000) }),
+    object({ kind: literal("pct"), pct: number2().min(1).max(100) })
+  ]);
   CUSTOMIZATION_SURFACES = ["mcp", "command", "agent"];
 });
 
@@ -180679,7 +180770,9 @@ __export(exports_engineCompat, {
   isAscendToolsEnabled: () => isAscendToolsEnabled,
   isAutoCompactCircuitTripped: () => isAutoCompactCircuitTripped,
   isAutoCompactEnabled: () => isAutoCompactEnabled,
+  isAutoCompactEnabledForModel: () => isAutoCompactEnabledForModel,
   isAutoCompactThresholdPositive: () => isAutoCompactThresholdPositive,
+  isAutoCompactWindowSetting: () => isAutoCompactWindowSetting,
   isAutoModeGateEnabled: () => isAutoModeGateEnabled,
   isBuiltInAgent: () => isBuiltInAgent,
   isBypassPermissionsModeDisabled: () => isBypassPermissionsModeDisabled,
@@ -180780,6 +180873,7 @@ __export(exports_engineCompat, {
   mergeWith: () => mergeWith,
   microcompactMessages: () => microcompactMessages,
   nextCronRunMs: () => nextCronRunMs,
+  normalizeAutoCompactWindowSetting: () => normalizeAutoCompactWindowSetting,
   normalizeControlMessageKeys: () => normalizeControlMessageKeys,
   normalizeNameForMCP: () => normalizeNameForMCP2,
   notifyTasksUpdated: () => notifyTasksUpdated,
@@ -256525,6 +256619,8 @@ async function* queryEngineLoopStream(params) {
         pending.push(event.assistantMessage, ...event.toolResultMessages);
       } else if (event.type === "compacted") {
         pending.push(event.messages[0]);
+      } else if (event.type === "stream_delta") {
+        pending.push(event);
       }
       notify();
     }
@@ -321290,7 +321386,7 @@ function buildAgentLoopParams(m) {
   const resolved = pool.length > 0 ? resolveModel(pool[0]) : undefined;
   const toolList = m.tools;
   const countTokens = (msgs) => modelProvider.countTokens(role, sessionModel, msgs, toolList);
-  const mergedAutoCompact = mergeAutoCompactOverrides(getAutoCompactEnvOverrides(), getInitialSettings2().autoCompactWindow);
+  const mergedAutoCompact = mergeAutoCompactOverrides(getAutoCompactEnvOverrides(), getInitialSettings2().autoCompactWindow, mainLoopModel);
   const autoCompact = {
     contextWindow: resolved?.contextWindow ?? HARD_DEFAULT_CONTEXT_WINDOW,
     maxOutputTokens: resolved?.maxTokens,
@@ -325748,7 +325844,7 @@ async function analyzeContextUsage(messages, model, getToolPermissionContext, to
   const skillInfo = skillResult.skillInfo;
   const skillFrontmatterTokens = skillInfo.skillFrontmatter.reduce((sum, skill) => sum + skill.tokens, 0);
   const messageTokens = messageBreakdown.totalTokens;
-  const isAutoCompact = isAutoCompactEnabled();
+  const isAutoCompact = isAutoCompactEnabledForModel(model);
   const autoCompactThreshold = isAutoCompact ? getEffectiveContextWindowSize(model) - AUTOCOMPACT_BUFFER_TOKENS : undefined;
   const cats = [];
   if (systemPromptTokens > 0) {
@@ -329411,7 +329507,7 @@ function getCompactionReminderAttachment(messages, model) {
   if (!getFeatureValue_CACHED_MAY_BE_STALE("atlas_marble_fox", false)) {
     return [];
   }
-  if (!isAutoCompactEnabled()) {
+  if (!isAutoCompactEnabledForModel(model)) {
     return [];
   }
   const contextWindow = getContextWindowForModel(model, getSdkBetas());
@@ -336878,7 +336974,7 @@ function getContentText(content) {
   return null;
 }
 function handleMessageFromStream(message, onMessage, onUpdateLength, onSetStreamMode, onStreamingToolUses, onTombstone, onStreamingThinking, onApiMetrics, onStreamingText) {
-  if (message.type !== "stream_event" && message.type !== "stream_request_start") {
+  if (message.type !== "stream_event" && message.type !== "stream_request_start" && message.type !== "stream_delta") {
     if (message.type === "tombstone") {
       onTombstone?.(message.message);
       return;
@@ -336904,6 +337000,14 @@ function handleMessageFromStream(message, onMessage, onUpdateLength, onSetStream
     onSetStreamMode("requesting");
     return;
   }
+  if (message.type === "stream_delta") {
+    if (message.delta.type === "text_delta") {
+      onSetStreamMode("responding");
+      onUpdateLength(message.delta.text);
+      onStreamingText?.((text) => (text ?? "") + message.delta.text);
+    }
+    return;
+  }
   if (message.event.type === "message_start") {
     if (message.ttftMs != null) {
       onApiMetrics?.({ ttftMs: message.ttftMs });
@@ -337311,6 +337415,13 @@ ${attachment.snippet}`,
           isMeta: true
         })
       ]);
+    case "git_status_refresh":
+      return wrapMessagesInSystemReminder([
+        createUserMessage2({
+          content: attachment.status,
+          isMeta: true
+        })
+      ]);
     case "file": {
       const fileContent = attachment.content;
       switch (fileContent.type) {
@@ -349063,6 +349174,10 @@ var exports_autocompact = {};
 __export(exports_autocompact, {
   call: () => call9
 });
+function currentTierFor(raw, model) {
+  const map = normalizeAutoCompactWindowSetting(raw);
+  return map[model] ?? map.default;
+}
 function currentToOptionValue(setting) {
   if (!setting || setting.kind === "auto")
     return "auto";
@@ -349079,21 +349194,25 @@ function customInitialValue(setting) {
   }
   return setting.kind === "window" ? `${setting.tokens / 1000}k` : `${setting.pct}%`;
 }
-function describeTier(setting) {
+function describeTier(setting, model) {
+  const label = ` [${renderModelName(model)}]`;
   switch (setting.kind) {
     case "auto":
-      return "Auto-compact: Auto (default) — compact near the model window limit";
+      return `Auto-compact: Auto (default)${label} — compact near the model window limit`;
     case "off":
-      return "Auto-compact: Off (manual /compact still works)";
+      return `Auto-compact: Off${label} (manual /compact still works)`;
     case "window":
-      return `Auto-compact window: ${setting.tokens / 1000}k tokens`;
+      return `Auto-compact window: ${setting.tokens / 1000}k tokens${label}`;
     case "pct":
-      return `Auto-compact threshold: ${setting.pct}% of the effective window`;
+      return `Auto-compact threshold: ${setting.pct}% of the effective window${label}`;
   }
 }
-function persistTier(setting, setAppState, onDone) {
+function persistTier(setting, model, setAppState, onDone) {
+  const map = normalizeAutoCompactWindowSetting(getInitialSettings2().autoCompactWindow);
+  map[model] = setting;
+  const mapForSettings = map;
   const { error } = updateSettingsForSource2("userSettings", {
-    autoCompactWindow: setting
+    autoCompactWindow: mapForSettings
   });
   if (error) {
     onDone(`Failed to persist auto-compact tier: ${error.message}`, {
@@ -349103,9 +349222,9 @@ function persistTier(setting, setAppState, onDone) {
   }
   setAppState((prev) => ({
     ...prev,
-    settings: { ...prev.settings, autoCompactWindow: setting }
+    settings: { ...prev.settings, autoCompactWindow: mapForSettings }
   }));
-  onDone(describeTier(setting));
+  onDone(describeTier(setting, model));
 }
 function AutoCompactApply({
   setting,
@@ -349113,34 +349232,23 @@ function AutoCompactApply({
 }) {
   const setAppState = useSetAppState();
   const doneRef = React41.useRef(false);
+  const model = getMainLoopModel();
   React41.useEffect(() => {
     if (doneRef.current) {
       return;
     }
     doneRef.current = true;
-    persistTier(setting, setAppState, onDone);
-  }, [setting, onDone, setAppState]);
+    persistTier(setting, model, setAppState, onDone);
+  }, [setting, model, onDone, setAppState]);
   return null;
 }
 function AutoCompactCommand({ onDone }) {
   const setAppState = useSetAppState();
+  const model = getMainLoopModel();
   const current = useAppState((s) => s.settings.autoCompactWindow);
   const [inputError, setInputError] = React41.useState(null);
   const apply = (setting) => {
-    const { error } = updateSettingsForSource2("userSettings", {
-      autoCompactWindow: setting
-    });
-    if (error) {
-      onDone(`Failed to persist auto-compact tier: ${error.message}`, {
-        display: "system"
-      });
-      return;
-    }
-    setAppState((prev) => ({
-      ...prev,
-      settings: { ...prev.settings, autoCompactWindow: setting }
-    }));
-    onDone(describeTier(setting));
+    persistTier(setting, model, setAppState, onDone);
   };
   const options = [
     {
@@ -349158,7 +349266,7 @@ function AutoCompactCommand({ onDone }) {
       value: "custom",
       type: "input",
       placeholder: "e.g. 150k (window) or 75% (bare number = percent)",
-      initialValue: customInitialValue(current),
+      initialValue: customInitialValue(currentTierFor(current, model)),
       onChange: (raw) => {
         const parsed = parseAutoCompactTierInput(raw);
         if (!parsed) {
@@ -349180,10 +349288,10 @@ function AutoCompactCommand({ onDone }) {
     children: [
       /* @__PURE__ */ jsx_dev_runtime140.jsxDEV(ThemedText, {
         bold: true,
-        children: "Auto-compact window tier"
+        children: `Auto-compact window tier — ${renderModelName(model)}`
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime140.jsxDEV(Select, {
-        defaultValue: currentToOptionValue(current),
+        defaultValue: currentToOptionValue(currentTierFor(current, model)),
         options,
         onChange: (value) => {
           if (value === "auto") {
@@ -349227,6 +349335,7 @@ var init_autocompact = __esm(() => {
   init_CustomSelect();
   init_ink2();
   init_AppState();
+  init_model();
   init_settings3();
   init_engine();
   React41 = __toESM(require_react(), 1);
@@ -374960,6 +375069,7 @@ var init_nullRenderingAttachments = __esm(() => {
     "critical_system_reminder",
     "edited_image_file",
     "edited_text_file",
+    "git_status_refresh",
     "opened_file_in_ide",
     "output_style",
     "plan_mode",
@@ -432146,7 +432256,8 @@ async function streamCompactSummary({
   appState,
   context,
   preCompactTokenCount,
-  cacheSafeParams
+  cacheSafeParams,
+  modelOverride
 }) {
   const promptCacheSharingEnabled = getFeatureValue_CACHED_MAY_BE_STALE("atlas_compact_cache_prefix", true);
   const activityInterval = isSessionActivityTrackingActive() ? setInterval((statusSetter) => {
@@ -432154,7 +432265,7 @@ async function streamCompactSummary({
     statusSetter?.("compacting");
   }, 30000, context.setSDKStatus) : undefined;
   try {
-    if (promptCacheSharingEnabled) {
+    if (promptCacheSharingEnabled && !modelOverride) {
       try {
         const result = await runForkedAgent({
           promptMessages: [summaryRequest],
@@ -432179,11 +432290,12 @@ async function streamCompactSummary({
     }
     const retryEnabled = getFeatureValue_CACHED_MAY_BE_STALE("atlas_compact_streaming_retry", false);
     const maxAttempts = retryEnabled ? MAX_COMPACT_STREAMING_RETRIES : 1;
+    const compactModel = modelOverride ?? context.options.mainLoopModel;
     for (let attempt = 1;attempt <= maxAttempts; attempt++) {
       let hasStartedStreaming = false;
       let response;
       context.setResponseLength?.(() => 0);
-      const useToolSearch = await isToolSearchEnabled(context.options.mainLoopModel, context.options.tools, async () => appState.toolPermissionContext, context.options.agentDefinitions.activeAgents, "compact");
+      const useToolSearch = await isToolSearchEnabled(compactModel, context.options.tools, async () => appState.toolPermissionContext, context.options.agentDefinitions.activeAgents, "compact");
       const tools = useToolSearch ? uniqBy_default([
         FileReadTool,
         ToolSearchTool2,
@@ -432193,7 +432305,6 @@ async function streamCompactSummary({
         ...getMessagesAfterCompactBoundary(messages),
         summaryRequest
       ])), context.options.tools);
-      const compactModel = context.options.mainLoopModel;
       const compactRole = modelToRole(compactModel);
       const params = await buildOpenAIParams({
         messages: compactMessages,
@@ -432283,6 +432394,23 @@ async function createPostCompactFileAttachments(readFileState, toolUseContext, m
     return false;
   });
 }
+async function createCurrentGitStatusAttachment() {
+  const baseline = getSessionStartGitStatusBlocks();
+  if (!baseline) {
+    return null;
+  }
+  const fresh = await getGitStatusFresh();
+  if (!fresh) {
+    return null;
+  }
+  if (JSON.stringify(fresh.blocks) === JSON.stringify(baseline)) {
+    return null;
+  }
+  return createAttachmentMessage({
+    type: "git_status_refresh",
+    status: fresh.text
+  });
+}
 function createPlanAttachmentIfNeeded(agentId) {
   const planContent = getPlan2(agentId);
   if (!planContent) {
@@ -432423,6 +432551,7 @@ var init_compact4 = __esm(() => {
   init_attachments();
   init_config6();
   init_context2();
+  init_context5();
   init_debug();
   init_errors4();
   init_fileStateCache();
@@ -432453,6 +432582,62 @@ var init_compact4 = __esm(() => {
   init_prompt22();
 });
 
+// src/tui/contextBodies/summarizeFallback.ts
+function isFallbackEligibleError(err) {
+  let msg = "";
+  if (err instanceof Error) {
+    if (err.name === "APIUserAbortError")
+      return false;
+    msg = err.message;
+  } else if (typeof err === "string") {
+    msg = err;
+  } else {
+    return false;
+  }
+  if (msg.includes(PROMPT_TOO_LONG_ERROR_MESSAGE))
+    return false;
+  if (msg.includes("Request was aborted."))
+    return false;
+  return true;
+}
+function isFallbackEligibleResult(msg, text) {
+  if (!text)
+    return false;
+  if (text.includes(PROMPT_TOO_LONG_ERROR_MESSAGE))
+    return false;
+  if (text.includes("Request was aborted."))
+    return false;
+  const flagged = typeof msg === "object" && msg !== null && msg.isApiErrorMessage === true;
+  return flagged || startsWithApiErrorPrefix(text);
+}
+function createSummarizeWithFallback(primary, opts) {
+  return async (p) => {
+    let result;
+    try {
+      result = await primary(p);
+    } catch (err) {
+      const fb = opts.resolveFallbackModel(p);
+      if (!fb || !isFallbackEligibleError(err)) {
+        throw err;
+      }
+      return primary({ ...p, modelOverride: fb });
+    }
+    if (opts.isEligibleResult?.(result)) {
+      const fb = opts.resolveFallbackModel(p);
+      if (fb) {
+        const retried = await primary({ ...p, modelOverride: fb });
+        if (!opts.isEligibleResult(retried)) {
+          return retried;
+        }
+      }
+    }
+    return result;
+  };
+}
+var init_summarizeFallback = __esm(() => {
+  init_modelprovider2();
+});
+
 // src/tui/services/SessionMemory/prompts.ts
 import { readFile as readFile61 } from "fs/promises";
 import { join as join165 } from "path";
@@ -433012,6 +433197,9 @@ async function composePostCompactAttachments(preCompactReadFileState, context) {
     createAsyncAgentAttachmentsIfNeeded(ctx)
   ]);
   const out = [...fileAttachments, ...asyncAgentAttachments];
+  const gitStatusAttachment = await createCurrentGitStatusAttachment();
+  if (gitStatusAttachment)
+    out.push(gitStatusAttachment);
   const planAttachment = createPlanAttachmentIfNeeded(ctx.agentId);
   if (planAttachment)
     out.push(planAttachment);
@@ -433033,8 +433221,20 @@ async function composePostCompactAttachments(preCompactReadFileState, context) {
   return out;
 }
 function wireContextHostPorts() {
+  const summarizePrimary = (p) => streamCompactSummary(p);
+  const summarizeWithFallback = createSummarizeWithFallback(summarizePrimary, {
+    resolveFallbackModel: (p) => {
+      const fb = getRoleModel("small");
+      if (!fb)
+        return;
+      if (p.context.options.mainLoopModel === fb)
+        return;
+      return fb;
+    },
+    isEligibleResult: (r) => isFallbackEligibleResult(r, getAssistantMessageText2(r))
+  });
   setCompactPorts({
-    summarize: (p) => streamCompactSummary({
+    summarize: (p) => summarizeWithFallback({
       messages: p.messages,
       summaryRequest: p.summaryRequest,
       appState: p.context.getAppState(),
@@ -433110,7 +433310,9 @@ var init_contextHostWiring = __esm(() => {
   init_sessionStorage();
   init_betaSessionTracing();
   init_compact4();
+  init_messages3();
   init_compact4();
+  init_summarizeFallback();
   init_sessionMemoryCompact();
   init_compact4();
 });
@@ -433216,17 +433418,12 @@ function createSettingsAdapter() {
       return settings.providers || {};
     },
     getGlobalApiKey() {
-      try {
-        return getApiKeyFromConfigOrMacOSKeychain()?.key;
-      } catch {
-        return;
-      }
+      return;
     }
   };
 }
 var init_settings_adapter = __esm(() => {
   init_settings3();
-  init_auth4();
 });
 
 // src/tui/factory.ts
@@ -434287,7 +434484,77 @@ function setSystemPromptInjection(value) {
   getUserContext.cache.clear?.();
   getSystemContext.cache.clear?.();
 }
-var MAX_STATUS_CHARS = 2000, systemPromptInjection = null, getGitStatus, getSystemContext, getUserContext;
+async function fetchGitStatusBlocks() {
+  if (false) {}
+  const startTime = Date.now();
+  logForDiagnosticsNoPII("info", "git_status_started");
+  const isGitStart = Date.now();
+  const isGit = await getIsGit();
+  logForDiagnosticsNoPII("info", "git_is_git_check_completed", {
+    duration_ms: Date.now() - isGitStart,
+    is_git: isGit
+  });
+  if (!isGit) {
+    logForDiagnosticsNoPII("info", "git_status_skipped_not_git", {
+      duration_ms: Date.now() - startTime
+    });
+    return null;
+  }
+  try {
+    const gitCmdsStart = Date.now();
+    const [branch, mainBranch, status, log, userName] = await Promise.all([
+      getBranch2(),
+      getDefaultBranch2(),
+      execFileNoThrow3(gitExe2(), ["--no-optional-locks", "status", "--short"], {
+        preserveOutputOnError: false
+      }).then(({ stdout }) => stdout.trim()),
+      execFileNoThrow3(gitExe2(), ["--no-optional-locks", "log", "--oneline", "-n", "5"], {
+        preserveOutputOnError: false
+      }).then(({ stdout }) => stdout.trim()),
+      execFileNoThrow3(gitExe2(), ["config", "user.name"], {
+        preserveOutputOnError: false
+      }).then(({ stdout }) => stdout.trim())
+    ]);
+    logForDiagnosticsNoPII("info", "git_commands_completed", {
+      duration_ms: Date.now() - gitCmdsStart,
+      status_length: status.length
+    });
+    const truncatedStatus = status.length > MAX_STATUS_CHARS ? status.substring(0, MAX_STATUS_CHARS) + `
+... (truncated because it exceeds 2k characters. If you need more information, run "git status" using BashTool)` : status;
+    logForDiagnosticsNoPII("info", "git_status_completed", {
+      duration_ms: Date.now() - startTime,
+      truncated: status.length > MAX_STATUS_CHARS
+    });
+    return { branch, mainBranch, status: truncatedStatus, log, userName };
+  } catch (error) {
+    logForDiagnosticsNoPII("error", "git_status_failed", {
+      duration_ms: Date.now() - startTime
+    });
+    logError3(error);
+    return null;
+  }
+}
+function formatGitStatus(blocks, header) {
+  return [
+    header,
+    `Current branch: ${blocks.branch}`,
+    `Main branch (you will usually use this for PRs): ${blocks.mainBranch}`,
+    ...blocks.userName ? [`Git user: ${blocks.userName}`] : [],
+    `Status:
+${blocks.status || "(clean)"}`,
+    `Recent commits:
+${blocks.log}`
+  ].join(`
+
+`);
+}
+function getGitStatusFresh() {
+  return fetchGitStatusBlocks().then((blocks) => blocks ? { text: formatGitStatus(blocks, GIT_STATUS_FRESH_HEADER), blocks } : null);
+}
+function getSessionStartGitStatusBlocks() {
+  return sessionStartGitStatusBlocks;
+}
+var MAX_STATUS_CHARS = 2000, systemPromptInjection = null, GIT_STATUS_START_HEADER = "This is the git status at the start of the conversation. Note that this status is a snapshot in time, and will not update during the conversation.", GIT_STATUS_FRESH_HEADER = "This is the current git status, re-injected after context compaction. It reflects the working tree as of now and supersedes any earlier session-start snapshot.", sessionStartGitStatusBlocks = null, getGitStatus, getSystemContext, getUserContext;
 var init_context5 = __esm(() => {
   init_shared();
   init_memoize();
@@ -434301,65 +434568,11 @@ var init_context5 = __esm(() => {
   init_gitSettings();
   init_log5();
   getGitStatus = memoize_default(async () => {
-    if (false) {}
-    const startTime = Date.now();
-    logForDiagnosticsNoPII("info", "git_status_started");
-    const isGitStart = Date.now();
-    const isGit = await getIsGit();
-    logForDiagnosticsNoPII("info", "git_is_git_check_completed", {
-      duration_ms: Date.now() - isGitStart,
-      is_git: isGit
-    });
-    if (!isGit) {
-      logForDiagnosticsNoPII("info", "git_status_skipped_not_git", {
-        duration_ms: Date.now() - startTime
-      });
-      return null;
-    }
-    try {
-      const gitCmdsStart = Date.now();
-      const [branch, mainBranch, status, log, userName] = await Promise.all([
-        getBranch2(),
-        getDefaultBranch2(),
-        execFileNoThrow3(gitExe2(), ["--no-optional-locks", "status", "--short"], {
-          preserveOutputOnError: false
-        }).then(({ stdout }) => stdout.trim()),
-        execFileNoThrow3(gitExe2(), ["--no-optional-locks", "log", "--oneline", "-n", "5"], {
-          preserveOutputOnError: false
-        }).then(({ stdout }) => stdout.trim()),
-        execFileNoThrow3(gitExe2(), ["config", "user.name"], {
-          preserveOutputOnError: false
-        }).then(({ stdout }) => stdout.trim())
-      ]);
-      logForDiagnosticsNoPII("info", "git_commands_completed", {
-        duration_ms: Date.now() - gitCmdsStart,
-        status_length: status.length
-      });
-      const truncatedStatus = status.length > MAX_STATUS_CHARS ? status.substring(0, MAX_STATUS_CHARS) + `
-... (truncated because it exceeds 2k characters. If you need more information, run "git status" using BashTool)` : status;
-      logForDiagnosticsNoPII("info", "git_status_completed", {
-        duration_ms: Date.now() - startTime,
-        truncated: status.length > MAX_STATUS_CHARS
-      });
-      return [
-        `This is the git status at the start of the conversation. Note that this status is a snapshot in time, and will not update during the conversation.`,
-        `Current branch: ${branch}`,
-        `Main branch (you will usually use this for PRs): ${mainBranch}`,
-        ...userName ? [`Git user: ${userName}`] : [],
-        `Status:
-${truncatedStatus || "(clean)"}`,
-        `Recent commits:
-${log}`
-      ].join(`
-
-`);
-    } catch (error) {
-      logForDiagnosticsNoPII("error", "git_status_failed", {
-        duration_ms: Date.now() - startTime
-      });
-      logError3(error);
+    const blocks = await fetchGitStatusBlocks();
+    if (!blocks)
       return null;
-    }
+    sessionStartGitStatusBlocks = blocks;
+    return formatGitStatus(blocks, GIT_STATUS_START_HEADER);
   });
   getSystemContext = memoize_default(async () => {
     const startTime = Date.now();
@@ -451387,7 +451600,7 @@ function TokenWarning(t0) {
   }
   let t2;
   if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
-    t2 = isAutoCompactEnabled();
+    t2 = isAutoCompactEnabledForModel(model);
     $[3] = t2;
   } else {
     t2 = $[3];
@@ -459943,7 +460156,7 @@ var jsx_dev_runtime381, ContextBarSegment = ({ input }) => {
   }
   const color = contextColorForPercentage(pct);
   const modelId = input.model?.id;
-  const showCompactWarning = modelId != null && isAutoCompactEnabled() && calculateTokenWarningState(used, modelId).isAboveWarningThreshold;
+  const showCompactWarning = modelId != null && isAutoCompactEnabledForModel(modelId) && calculateTokenWarningState(used, modelId).isAboveWarningThreshold;
   return /* @__PURE__ */ jsx_dev_runtime381.jsxDEV(ThemedText, {
     color,
     children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasharness/atlascode",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "AtlasCode \u2014 Coding Agent for the domestic computing ecosystem (Ascend NPU + domestic LLM backends)",
   "bin": {
     "atlas": "dist/cli.js",