nolo-cli 0.157.0-alpha.1 → 0.158.0-alpha.1

package/{chunk-ZEHTARJA.js → chunk-ZBXIKCZ4.js}

@@ -9,7 +9,7 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-KOB75UNU.js";
+} from "./chunk-2SOS7OSQ.js";
 import {
   getReadableCliDb
 } from "./chunk-P5QACQDK.js";
@@ -27,7 +27,7 @@ import {
   resolveBoundMachineId,
   resolveFileWriteGateEnabled,
   resolveLocalUserId
-} from "./chunk-EJU23ST5.js";
+} from "./chunk-S72LMV7T.js";
 import {
   clearCredentialAvailability,
   readCredentialEntry,
@@ -39,7 +39,7 @@ import {
   t,
   toolLabel,
   toolLabelVariants
-} from "./chunk-SW4S4XYB.js";
+} from "./chunk-2AB2HA4M.js";
 import {
   _appendEntityBatch,
   _appendEvidenceBatch,
@@ -54,10 +54,13 @@ import {
   loadMemoryVNextCatalog,
   putMemoryEvidenceVNext
 } from "./chunk-TY3TIUJK.js";
+import {
+  parsePositiveFiniteNumberOrFallback
+} from "./chunk-Y5GCAMGP.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-HKT6QXP3.js";
+} from "./chunk-ZEY4NJRE.js";
 import {
   isLocalCliAgentKey
 } from "./chunk-NBTY7YJF.js";
@@ -72,30 +75,31 @@ import {
 } from "./chunk-BMQ2MJUK.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-XFKZ3MCV.js";
+} from "./chunk-YTXQ2U2X.js";
 import {
   isTransientFetchError
-} from "./chunk-I2ZMGXXF.js";
+} from "./chunk-KFHREHUQ.js";
 import {
   parseUiCard,
   uiCardFallback
-} from "./chunk-RUNKPFM5.js";
+} from "./chunk-CDWHHLK5.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
-import {
-  parsePositiveFiniteNumberOrFallback
-} from "./chunk-XPWGOTBQ.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-7A4LJCDR.js";
+} from "./chunk-G476FQ7Q.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
-  parseUiAskChoiceContent
-} from "./chunk-H4KACZMG.js";
+  estimateMessagesTokens,
+  parseUiAskChoiceContent,
+  resolveAgentContextWindow,
+  resolveOccupancy,
+  resolveOccupancyWindow
+} from "./chunk-WTFRBJT5.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-UKZX3NHN.js";
@@ -107,14 +111,10 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-PEO24UB5.js";
+} from "./chunk-3TBHZPNG.js";
 import {
-  devinChannelContextWindow,
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-ANJTRG52.js";
-import {
-  isDevinOAuthAgent
-} from "./chunk-5ZUL4CUO.js";
+} from "./chunk-G2WP7VPD.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -137,10 +137,7 @@ import {
 } from "./chunk-3MZAGMYY.js";
 import {
   normalizeUsage
-} from "./chunk-ZWG3C7VI.js";
-import {
-  findModelContextWindow
-} from "./chunk-2MTE2PEH.js";
+} from "./chunk-C6FY7HWI.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -190,9 +187,6 @@ import {
   formatStopRunCard,
   isAgentRunTerminalStatus
 } from "./chunk-PJNFNEJE.js";
-import {
-  estimateTokenCount
-} from "./chunk-PSCNXBYA.js";
 import {
   resolveClientVersion
 } from "./chunk-SUKSWFLP.js";
@@ -434,40 +428,6 @@ ${cardText}` : cardText;
 // packages/chat/messages/attachmentWriteRollout.ts
 var ENABLE_REMOTE_ATTACHMENT_PART_WRITES = false;
 
-// packages/ai/context/contextOccupancy.ts
-function estimateMessagesTokens(messages) {
-  return messages.reduce((total, message) => {
-    const content = typeof message.content === "string" ? message.content : message.content == null ? "" : JSON.stringify(message.content);
-    return total + estimateTokenCount(content) + 4;
-  }, 0);
-}
-function historyTokensBeforeLatestAssistant(messages) {
-  const total = estimateMessagesTokens(messages);
-  const latest = messages[messages.length - 1];
-  if (latest?.role !== "assistant") return total;
-  return Math.max(0, total - estimateMessagesTokens([latest]));
-}
-function resolveOccupancy(input) {
-  if (input.authoritativeInput !== void 0 && input.authoritativeInput > 0) {
-    const generated = Math.max(0, input.generatedSinceAuthority ?? 0);
-    return {
-      tokens: input.authoritativeInput + generated,
-      estimated: generated > 0
-    };
-  }
-  return {
-    tokens: Math.max(0, input.baselineEstimate ?? 0),
-    estimated: true
-  };
-}
-function resolveOccupancyWindow(ref) {
-  if (!ref.model) return void 0;
-  if (isDevinOAuthAgent(ref)) {
-    return devinChannelContextWindow(ref.model) ?? findModelContextWindow(ref.model, ref.provider);
-  }
-  return findModelContextWindow(ref.model, ref.provider);
-}
-
 // packages/cli/client/tokenUsage.ts
 var PLATFORM_CREDIT_UNIT = "credits";
 var isUsableModelId = (model) => {
@@ -491,34 +451,10 @@ function resolveAgentModelIdentity(opts) {
     ...model ? { model } : {}
   };
 }
-function resolveAgentContextWindow(opts) {
+function resolveAgentContextWindow2(opts) {
   const model = resolveEffectiveModel(opts);
   if (model) return resolveContextWindow(model);
-  const byName = opts.agentName?.trim() ? resolveOccupancyWindow({ model: opts.agentName }) : void 0;
-  if (byName !== void 0) return byName;
-  const candidates = [
-    ...modelSlugCandidates(opts.agentKey, 2),
-    ...modelSlugCandidates(opts.agentName, 1)
-  ];
-  for (const candidate of candidates) {
-    const window = resolveOccupancyWindow({ model: candidate });
-    if (window !== void 0) return window;
-  }
-  return void 0;
-}
-var AGENT_KEY_PREFIX = /^agent-[a-z0-9]+-/i;
-function modelSlugCandidates(source, maxDrop) {
-  const raw = source?.trim();
-  if (!raw) return [];
-  const base = raw.replace(/\s+/g, "-").toLowerCase();
-  const seed = base.replace(AGENT_KEY_PREFIX, "");
-  const out = [seed];
-  if (seed !== base) out.push(base);
-  const segments = seed.split("-");
-  for (let drop = 1; drop <= maxDrop && drop < segments.length; drop++) {
-    out.push(segments.slice(drop).join("-"));
-  }
-  return [...new Set(out.filter(Boolean))];
+  return resolveAgentContextWindow(opts);
 }
 var PROVIDER_LOOKUP_ORDER = [
   "openrouter",
@@ -11245,7 +11181,7 @@ function isBalanceExhaustedError(error) {
 
 // packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-O5GDAFTN.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-NPJS2QDP.js");
   return runLocalAgentTurn;
 }
 var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
@@ -11342,7 +11278,8 @@ function buildDefaultLocalRuntimeAdapter(options) {
     // runtimeKey 接线：不传下去则本地 run 的 runtimeKey 在 agentRun 层就断了
     // ——adapter 收不到 → docker workload 永不创建，非 docker 云后端也不会
     // fail-closed（死代码）。
-    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {}
+    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {},
+    ...options.dockerWorkspaceMode ? { dockerWorkspaceMode: options.dockerWorkspaceMode } : {}
   });
 }
 function resolveLocalRuntimeAdapter(options) {
@@ -11350,7 +11287,8 @@ function resolveLocalRuntimeAdapter(options) {
     cwd: options.localRuntimeCwd,
     // 与 buildDefaultLocalRuntimeAdapter 同口径：注入式 factory 也必须拿到
     // runtimeKey，否则注入了 adapter 的本地 run 会静默丢掉 docker 语义。
-    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {}
+    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {},
+    ...options.dockerWorkspaceMode ? { dockerWorkspaceMode: options.dockerWorkspaceMode } : {}
   }) || buildDefaultLocalRuntimeAdapter(options);
 }
 function wrapAdapterEphemeral(adapter) {
@@ -12341,6 +12279,9 @@ async function runLocalAgentTurnForCliWithAdapter(options, settings, resolvedBas
       parentDialogId: options.parentDialogId,
       runtimeContext: runtimeContextWithOwnership,
       runKind: options.env.NOLO_AGENT_RUN_CHILD === "1" ? "subtask" : "interactive",
+      // 展示能力由宿主声明（TUI=narrow），非交互 CLI/后台留空 → unknown；
+      // 排版段只在能力已知时由 localLoop 注入，server 线不读该字段。
+      ...options.responseViewport ? { responseViewport: options.responseViewport } : {},
       background: options.background,
       noStream: options.noStream,
       ...options.contextBlockScopes?.length ? { contextBlockScopes: options.contextBlockScopes } : options.extraContextBlocks?.length ? { contextBlocks: options.extraContextBlocks } : {},
@@ -15770,6 +15711,12 @@ async function runAgentRunCommand(args, deps) {
       } } : {},
       agentName: targetAgentKey,
       agentKey: targetAgentKey,
+      // 当前执行链未提供可靠的最终展示能力，按约定使用 unknown（只注入行为段，不猜
+      // 宽/窄屏；`stdout.isTTY` 只说明是不是终端，说明不了宽度）。这不表示宿主永远
+      // 无法获得尺寸：将来接入时应传展示能力，不应由调用方拼接准则文本。
+      // 放在 buildRunOptions 这个唯一构造点上，首轮 / quota fallback / 队列 drain
+      // 三处 runner(...) 调用自动一致；远端分支走 server 线，不读该字段。
+      responseViewport: "unknown",
       serverUrl: resolveServerUrl(env),
       message: formatTurnMessage(turnMessage),
       imageUrls: parsed.imageUrls.map(normalizeCliImageInput),
@@ -15789,6 +15736,7 @@ async function runAgentRunCommand(args, deps) {
       // runtimeKey 与 machine-shell 的组合已在 parseAgentRunArgs 入口显式拒绝，
       // 这里直接透传即可（不再静默丢弃参数）。
       ...parsed.runtimeKey ? { runtimeKey: parsed.runtimeKey } : {},
+      ...parsed.dockerWorkspaceMode ? { dockerWorkspaceMode: parsed.dockerWorkspaceMode } : {},
       ...parsed.continueDialogId ? { continueDialogId: parsed.continueDialogId } : {},
       ...parsed.strictContinueHistory ? { strictContinueHistory: true } : {},
       ...parsed.spaceId ? { spaceId: parsed.spaceId } : {},
@@ -16059,10 +16007,8 @@ export {
   redactSecrets,
   safeAskText,
   TUI_TREE_MARKER,
-  estimateMessagesTokens,
-  historyTokensBeforeLatestAssistant,
   resolveAgentModelIdentity,
-  resolveAgentContextWindow,
+  resolveAgentContextWindow2 as resolveAgentContextWindow,
   platformCreditsFromUsage,
   formatCreditsChip,
   formatTokenCount,

package/{chunk-HKT6QXP3.js → chunk-ZEY4NJRE.js}

@@ -3,7 +3,7 @@ import {
   classifyAgentApiKeyRef,
   formatUnsupportedAgentApiKeyRefMessage,
   shouldReadAgentKeyRemotely
-} from "./chunk-UUPR3TD7.js";
+} from "./chunk-7RF4O6AT.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-NBTY7YJF.js";
@@ -556,7 +556,7 @@ async function buildCreatedAgentRecord(args) {
   const resolvedAgentInput = resolveCliAgentKeyInput(args.parsed.agentInput);
   const agentKey = resolvedAgentInput.startsWith("agent-") ? resolvedAgentInput : createAgentKey.private(userId || "local", resolvedAgentInput);
   if (args.parsed.presetId) {
-    const { resolveProviderPresetFields } = await import("./providerPresetApply-CRZFMQD5.js");
+    const { resolveProviderPresetFields } = await import("./providerPresetApply-GSJI4JBJ.js");
     const fields = resolveProviderPresetFields(args.parsed.presetId);
     if (fields.kind === "manual") {
       throw new Error(

package/{chunk-HP6O6LTV.js → chunk-ZVQHBIWV.js}

@@ -6,12 +6,12 @@ import {
   readAction,
   readRequestManager,
   resolveAgentReadServers
-} from "./chunk-6MPAEODB.js";
+} from "./chunk-NDZOXXIM.js";
 import {
   loadFileFromIndexedDb,
   removeAction,
   saveFileToIndexedDb
-} from "./chunk-D4OWHT5Y.js";
+} from "./chunk-SPKLALBU.js";
 import {
   beginWriteAck,
   compareRemoteRecordsByComparableTime,
@@ -28,13 +28,13 @@ import {
   shouldReplaceLocalWithRemoteRecord,
   shouldReplicateLocalRecord,
   uploadToCurrentServer
-} from "./chunk-Z6KQDSZW.js";
+} from "./chunk-2SGAI64X.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
   createEntityAdapter,
   noloDeleteRequest
-} from "./chunk-7BSQK2UC.js";
+} from "./chunk-WRCZXJ4N.js";
 import {
   fetchFromClientDb,
   fetchFromServer,
@@ -706,7 +706,7 @@ var dbSlice = createSliceWithThunks({
     // 动态 import 在调用期解析，避开 TDZ/求值顺序问题（同下方 share）。
     read: create.asyncThunk(
       async (payload, thunkApi) => {
-        const { readAction: readAction2 } = await import("./read-5KAZHHDM.js");
+        const { readAction: readAction2 } = await import("./read-L7QEJETH.js");
         return readAction2(payload, thunkApi);
       },
       {
@@ -780,7 +780,7 @@ var dbSlice = createSliceWithThunks({
     // 这里改成动态 import，运行期才解析，彻底断开这条边。
     share: create.asyncThunk(
       async (config, thunkApi) => {
-        const { shareResourceAction } = await import("./action-ZJYUBXFC.js");
+        const { shareResourceAction } = await import("./action-GPPJC5TI.js");
         return shareResourceAction(config, thunkApi);
       }
     ),