nolo-cli 0.1.46 → 0.1.48

package/index.js

@@ -1443,6 +1443,15 @@ var init_agentAliases = __esm({
       nolo: NOLO_DEFAULT_AGENT_KEY,
       default: NOLO_DEFAULT_AGENT_KEY,
       "default-nolo": NOLO_DEFAULT_AGENT_KEY,
+      // Product implementation & coordination aliases
+      "frontend-implementer": NOLO_FRONTEND_AGENT_KEY,
+      "frontend-agent": NOLO_FRONTEND_AGENT_KEY,
+      frontend: NOLO_FRONTEND_AGENT_KEY,
+      "frontend agent": NOLO_FRONTEND_AGENT_KEY,
+      "\u524D\u7AEFagent": NOLO_FRONTEND_AGENT_KEY,
+      "\u524D\u7AEF agent": NOLO_FRONTEND_AGENT_KEY,
+      "project-manager": NOLO_PROJECT_MANAGER_AGENT_KEY,
+      pm: NOLO_PROJECT_MANAGER_AGENT_KEY,
       // Explicit local CLI agents. These are ordinary private agent records that
       // run through the current computer local runtime when unbound.
       "local-codex": LOCAL_CODEX_AGENT_KEY,
@@ -1464,7 +1473,9 @@ var init_agentAliases = __esm({
       grok: LOCAL_GROK_AGENT_KEY,
       "grok-agent": LOCAL_GROK_AGENT_KEY,
       "grok cli": LOCAL_GROK_AGENT_KEY,
-      "grok-cli": LOCAL_GROK_AGENT_KEY
+      "grok-cli": LOCAL_GROK_AGENT_KEY,
+      "minimax-m3": "agent-0e95801d90-minimax-m3",
+      minimax: "agent-0e95801d90-minimax-m3"
     };
   }
 });
@@ -1593,6 +1604,19 @@ function buildMessages(args2) {
     { role: "user", content: args2.input }
   ];
 }
+function mergeTurnUsage(current, next) {
+  if (!next) return current;
+  const read2 = (usage2) => ({
+    input: Number(usage2.input_tokens ?? usage2.prompt_tokens ?? 0),
+    output: Number(usage2.output_tokens ?? usage2.completion_tokens ?? 0)
+  });
+  const right = read2(next);
+  const left = current ? read2(current) : { input: 0, output: 0 };
+  return {
+    input_tokens: right.input || left.input,
+    output_tokens: left.output + right.output
+  };
+}
 function extractUserInputText(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -1618,11 +1642,14 @@ async function runLocalAgentTurn(input2) {
   const userInputText = extractUserInputText(input2.input);
   let toolCallCount = 0;
   let result;
+  let turnUsage;
   let round = 0;
   while (true) {
     result = await provider.complete(messages, {
-      ...typeof input2.timeoutMs === "number" ? { timeoutMs: input2.timeoutMs } : {}
+      ...typeof input2.timeoutMs === "number" ? { timeoutMs: input2.timeoutMs } : {},
+      ...input2.onTextDelta ? { onTextDelta: input2.onTextDelta } : {}
     });
+    turnUsage = mergeTurnUsage(turnUsage, result.usage);
     const toolCalls = result.tool_calls ?? [];
     if (toolCalls.length === 0) break;
     toolCallCount += toolCalls.length;
@@ -1715,6 +1742,7 @@ async function runLocalAgentTurn(input2) {
   });
   return {
     ...result,
+    ...turnUsage ? { usage: turnUsage } : {},
     ...toolCallCount > 0 ? { toolCallCount } : {},
     ...agentConfig.toolSurface ? { runtimeToolSurface: agentConfig.toolSurface } : {},
     dialogId: saved.dialogId,
@@ -3350,9 +3378,10 @@ function buildOpenAiCompatibleChatCompletionRequest(args2) {
   const body = {
     model: args2.providerConfig.model,
     messages: toOpenAiCompatibleMessages(args2.messages),
-    stream: false,
+    stream: args2.stream ?? false,
     ...args2.providerConfig.requestOptions,
-    ...args2.tools && args2.tools.length > 0 ? { tools: args2.tools } : {}
+    ...args2.tools && args2.tools.length > 0 ? { tools: args2.tools } : {},
+    ...args2.stream ? { stream_options: { include_usage: true } } : {}
   };
   return {
     url: args2.providerConfig.endpoint,
@@ -3382,6 +3411,138 @@ function parseOpenAiCompatibleChatCompletionResponse(args2) {
     trace: args2.trace
   };
 }
+function accumulateToolCallDelta(accumulated, deltas) {
+  for (const delta of deltas) {
+    const index = typeof delta.index === "number" ? delta.index : 0;
+    const current = accumulated[index] ?? {
+      id: "",
+      type: "function",
+      function: { name: "", arguments: "" }
+    };
+    if (typeof delta.id === "string" && delta.id) current.id = delta.id;
+    const fn = delta.function;
+    if (fn && typeof fn === "object") {
+      const functionDelta = fn;
+      if (typeof functionDelta.name === "string" && functionDelta.name) {
+        current.function.name += functionDelta.name;
+      }
+      if (typeof functionDelta.arguments === "string" && functionDelta.arguments) {
+        current.function.arguments += functionDelta.arguments;
+      }
+    }
+    accumulated[index] = current;
+  }
+}
+function finalizeAccumulatedToolCalls(accumulated) {
+  return Object.keys(accumulated).map((key2) => accumulated[Number(key2)]).filter((call) => call?.function?.name);
+}
+async function readOpenAiCompatibleSseCompletion(args2) {
+  const reader = args2.response.body?.getReader();
+  if (!reader) {
+    throw new Error("OpenAI-compatible stream response did not include a readable body.");
+  }
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let content = "";
+  let reasoning = "";
+  let usage2;
+  const accumulatedToolCalls = {};
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    while (true) {
+      const boundary = buffer.indexOf("\n\n");
+      if (boundary === -1) break;
+      const event = buffer.slice(0, boundary);
+      buffer = buffer.slice(boundary + 2);
+      for (const line of event.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("data:")) continue;
+        const payload = trimmed.slice(5).trim();
+        if (!payload || payload === "[DONE]") continue;
+        let parsed;
+        try {
+          parsed = JSON.parse(payload);
+        } catch {
+          continue;
+        }
+        if (parsed?.usage && typeof parsed.usage === "object") {
+          usage2 = parsed.usage;
+        }
+        const delta = parsed?.choices?.[0]?.delta;
+        if (!delta || typeof delta !== "object") continue;
+        const reasoningChunk = typeof delta.reasoning_content === "string" ? delta.reasoning_content : typeof delta.reasoning === "string" ? delta.reasoning : "";
+        if (reasoningChunk) reasoning += reasoningChunk;
+        if (Array.isArray(delta.tool_calls) && delta.tool_calls.length > 0) {
+          accumulateToolCallDelta(accumulatedToolCalls, delta.tool_calls);
+        }
+        const textChunk = typeof delta.content === "string" ? delta.content : "";
+        if (textChunk) {
+          content += textChunk;
+          args2.onTextDelta?.(textChunk);
+        }
+      }
+    }
+  }
+  const tool_calls = finalizeAccumulatedToolCalls(accumulatedToolCalls);
+  return {
+    content,
+    ...reasoning ? { reasoning_content: reasoning } : {},
+    ...tool_calls.length > 0 ? { tool_calls } : {},
+    ...usage2 ? { usage: usage2 } : {}
+  };
+}
+async function executeOpenAiCompatibleChatCompletion(args2) {
+  const request = buildOpenAiCompatibleChatCompletionRequest({
+    providerConfig: args2.providerConfig,
+    messages: args2.messages,
+    tools: args2.tools,
+    stream: args2.stream
+  });
+  const res = await args2.fetchImpl(request.url, {
+    ...request.init,
+    ...args2.signal ? { signal: args2.signal } : {}
+  });
+  if (!res.ok) {
+    const raw2 = await res.text().catch(() => "");
+    let data2 = raw2;
+    try {
+      data2 = JSON.parse(raw2);
+    } catch {
+    }
+    throw new Error(`local provider failed: HTTP ${res.status} ${JSON.stringify(data2)}`);
+  }
+  const contentType = res.headers.get("content-type") ?? "";
+  const shouldStream = Boolean(args2.stream && args2.onTextDelta) && contentType.includes("text/event-stream");
+  if (shouldStream && args2.onTextDelta) {
+    const streamed = await readOpenAiCompatibleSseCompletion({
+      response: res,
+      onTextDelta: args2.onTextDelta
+    });
+    return {
+      content: streamed.content,
+      model: args2.providerConfig.model,
+      provider: args2.providerConfig.provider,
+      ...streamed.tool_calls ? { tool_calls: streamed.tool_calls } : {},
+      ...streamed.reasoning_content ? { reasoning_content: streamed.reasoning_content } : {},
+      ...streamed.usage ? { usage: streamed.usage } : {},
+      trace: args2.messages
+    };
+  }
+  const raw = await res.text().catch(() => "");
+  let data = {};
+  try {
+    data = raw ? JSON.parse(raw) : {};
+  } catch {
+    data = {};
+  }
+  return parseOpenAiCompatibleChatCompletionResponse({
+    providerConfig: args2.providerConfig,
+    data,
+    trace: args2.messages
+  });
+}
 var init_openAiCompatibleProvider = __esm({
   "packages/agent-runtime/openAiCompatibleProvider.ts"() {
     "use strict";
@@ -3679,7 +3840,8 @@ function buildPlatformChatCompletionRequest(args2) {
   const body = {
     model: args2.providerConfig.model,
     ...usesResponsesApi ? { input: convertMessagesToResponsesInput(args2.messages) } : { messages: toOpenAiCompatibleMessages2(args2.messages) },
-    stream: false,
+    stream: args2.stream ?? false,
+    ...args2.stream ? { stream_options: { include_usage: true } } : {},
     ...requestOptions,
     ...args2.tools && args2.tools.length > 0 ? {
       tools: usesResponsesApi ? toResponsesTools(args2.tools) : args2.tools,
@@ -10109,6 +10271,8 @@ var init_ai_locale = __esm({
           creating: "Creating...",
           edit: "Edit",
           delete: "Delete",
+          favorite: "Favorite",
+          unfavorite: "Unfavorite",
           confirmDelete: "Confirm Delete",
           resetToDefaults: "Reset to Defaults",
           loading: "Loading...",
@@ -10420,6 +10584,8 @@ var init_ai_locale = __esm({
           creating: "\u521B\u5EFA\u4E2D...",
           edit: "\u7F16\u8F91",
           delete: "\u5220\u9664",
+          favorite: "\u6536\u85CF",
+          unfavorite: "\u53D6\u6D88\u6536\u85CF",
           confirmDelete: "\u786E\u8BA4\u5220\u9664",
           resetToDefaults: "\u91CD\u7F6E\u4E3A\u9ED8\u8BA4\u503C",
           loading: "\u52A0\u8F7D\u4E2D...",
@@ -10732,6 +10898,8 @@ var init_ai_locale = __esm({
           creating: "\u5EFA\u7ACB\u4E2D...",
           edit: "\u7DE8\u8F2F",
           delete: "\u522A\u9664",
+          favorite: "\u6536\u85CF",
+          unfavorite: "\u53D6\u6D88\u6536\u85CF",
           confirmDelete: "\u78BA\u8A8D\u522A\u9664",
           resetToDefaults: "\u91CD\u8A2D\u70BA\u9810\u8A2D\u503C",
           loading: "\u8F09\u5165\u4E2D...",
@@ -10967,6 +11135,8 @@ var init_ai_locale = __esm({
           creating: "\u4F5C\u6210\u4E2D...",
           edit: "\u7DE8\u96C6",
           delete: "\u524A\u9664",
+          favorite: "\u304A\u6C17\u306B\u5165\u308A",
+          unfavorite: "\u304A\u6C17\u306B\u5165\u308A\u89E3\u9664",
           confirmDelete: "\u524A\u9664\u306E\u78BA\u8A8D",
           resetToDefaults: "\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u30EA\u30BB\u30C3\u30C8",
           loading: "\u8AAD\u307F\u8FBC\u307F\u4E2D...",
@@ -13042,6 +13212,31 @@ var init_interface_locale = __esm({
               stop: "Stop",
               refresh: "Refresh"
             },
+            productivity: {
+              title: "Productivity",
+              default_space: {
+                title: "Default startup space",
+                description: "Choose the workspace you land in after signing in to get into flow faster.",
+                all: "All (no fixed default space)"
+              },
+              shortcuts: {
+                title: "Keyboard shortcuts",
+                description: "View and customize shortcuts for common actions to keep your workflow smooth.",
+                sendMessage: "Send message",
+                newChat: "New chat",
+                deleteDialog: "Delete current conversation",
+                clickToRecord: "Click to change shortcut",
+                updated: "Shortcut updated",
+                pressKeys: "Press shortcut keys...",
+                none: "Disabled",
+                cleared: "Shortcut disabled",
+                clearError: "Failed to disable shortcut",
+                clear: "Disable shortcut",
+                resetSuccess: "Shortcut reset",
+                resetError: "Failed to reset shortcut",
+                reset: "Reset to default"
+              }
+            },
             appearance: {
               title: "Appearance",
               theme: {
@@ -13735,6 +13930,31 @@ var init_interface_locale = __esm({
               productivity: "\u6548\u7387",
               secrets: "\u5BC6\u94A5"
             },
+            productivity: {
+              title: "\u6548\u7387\u8BBE\u7F6E",
+              default_space: {
+                title: "\u9ED8\u8BA4\u542F\u52A8\u7A7A\u95F4",
+                description: "\u9009\u62E9\u4F60\u767B\u5F55\u540E\u9ED8\u8BA4\u8FDB\u5165\u7684\u5DE5\u4F5C\u7A7A\u95F4\u3002\u8FD9\u80FD\u5E2E\u52A9\u4F60\u5FEB\u901F\u8FDB\u5165\u5DE5\u4F5C\u72B6\u6001\u3002",
+                all: "\u5168\u90E8\uFF08\u4E0D\u56FA\u5B9A\u9ED8\u8BA4\u7A7A\u95F4\uFF09"
+              },
+              shortcuts: {
+                title: "\u952E\u76D8\u5FEB\u6377\u952E",
+                description: "\u67E5\u770B\u5E76\u7BA1\u7406\u5E38\u7528\u64CD\u4F5C\u7684\u5FEB\u6377\u952E\u914D\u7F6E\uFF0C\u8BA9\u4F60\u7684\u5DE5\u4F5C\u6D41\u66F4\u52A0\u987A\u7545\u3002",
+                sendMessage: "\u53D1\u9001\u6D88\u606F",
+                newChat: "\u65B0\u5EFA\u5BF9\u8BDD",
+                deleteDialog: "\u5220\u9664\u5F53\u524D\u4F1A\u8BDD",
+                clickToRecord: "\u70B9\u51FB\u4FEE\u6539\u5FEB\u6377\u952E",
+                updated: "\u5FEB\u6377\u952E\u5DF2\u66F4\u65B0",
+                pressKeys: "\u6309\u4E0B\u5FEB\u6377\u952E...",
+                none: "\u5DF2\u7981\u7528",
+                cleared: "\u5FEB\u6377\u952E\u5DF2\u7981\u7528",
+                clearError: "\u7981\u7528\u5931\u8D25",
+                clear: "\u7981\u7528\u5FEB\u6377\u952E",
+                resetSuccess: "\u5FEB\u6377\u952E\u5DF2\u91CD\u7F6E",
+                resetError: "\u91CD\u7F6E\u5931\u8D25",
+                reset: "\u91CD\u7F6E\u4E3A\u9ED8\u8BA4"
+              }
+            },
             appearance: {
               title: "\u5916\u89C2",
               theme: {
@@ -14429,6 +14649,31 @@ var init_interface_locale = __esm({
               productivity: "\u6548\u7387",
               secrets: "\u5BC6\u9470"
             },
+            productivity: {
+              title: "\u6548\u7387\u8A2D\u5B9A",
+              default_space: {
+                title: "\u9810\u8A2D\u555F\u52D5\u7A7A\u9593",
+                description: "\u9078\u64C7\u4F60\u767B\u5165\u5F8C\u9810\u8A2D\u9032\u5165\u7684\u5DE5\u4F5C\u7A7A\u9593\uFF0C\u5E6B\u52A9\u4F60\u66F4\u5FEB\u9032\u5165\u5DE5\u4F5C\u72C0\u614B\u3002",
+                all: "\u5168\u90E8\uFF08\u4E0D\u56FA\u5B9A\u9810\u8A2D\u7A7A\u9593\uFF09"
+              },
+              shortcuts: {
+                title: "\u9375\u76E4\u5FEB\u6377\u9375",
+                description: "\u67E5\u770B\u4E26\u7BA1\u7406\u5E38\u7528\u64CD\u4F5C\u7684\u5FEB\u6377\u9375\u8A2D\u5B9A\uFF0C\u8B93\u4F60\u7684\u5DE5\u4F5C\u6D41\u66F4\u52A0\u9806\u66A2\u3002",
+                sendMessage: "\u50B3\u9001\u8A0A\u606F",
+                newChat: "\u65B0\u5EFA\u5C0D\u8A71",
+                deleteDialog: "\u522A\u9664\u76EE\u524D\u6703\u8A71",
+                clickToRecord: "\u9EDE\u64CA\u4FEE\u6539\u5FEB\u6377\u9375",
+                updated: "\u5FEB\u6377\u9375\u5DF2\u66F4\u65B0",
+                pressKeys: "\u6309\u4E0B\u5FEB\u6377\u9375...",
+                none: "\u5DF2\u505C\u7528",
+                cleared: "\u5FEB\u6377\u9375\u5DF2\u505C\u7528",
+                clearError: "\u505C\u7528\u5931\u6557",
+                clear: "\u505C\u7528\u5FEB\u6377\u9375",
+                resetSuccess: "\u5FEB\u6377\u9375\u5DF2\u91CD\u8A2D",
+                resetError: "\u91CD\u8A2D\u5931\u6557",
+                reset: "\u91CD\u8A2D\u70BA\u9810\u8A2D"
+              }
+            },
             appearance: {
               title: "\u5916\u89C0",
               theme: {
@@ -15121,6 +15366,31 @@ var init_interface_locale = __esm({
               productivity: "\u52B9\u7387",
               secrets: "\u30B7\u30FC\u30AF\u30EC\u30C3\u30C8"
             },
+            productivity: {
+              title: "\u52B9\u7387\u8A2D\u5B9A",
+              default_space: {
+                title: "\u65E2\u5B9A\u306E\u8D77\u52D5\u30B9\u30DA\u30FC\u30B9",
+                description: "\u30ED\u30B0\u30A4\u30F3\u5F8C\u306B\u6700\u521D\u306B\u958B\u304F\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u3073\u3001\u3059\u3050\u4F5C\u696D\u306B\u5165\u308C\u308B\u3088\u3046\u306B\u3057\u307E\u3059\u3002",
+                all: "\u3059\u3079\u3066\uFF08\u65E2\u5B9A\u30B9\u30DA\u30FC\u30B9\u3092\u56FA\u5B9A\u3057\u306A\u3044\uFF09"
+              },
+              shortcuts: {
+                title: "\u30AD\u30FC\u30DC\u30FC\u30C9\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8",
+                description: "\u3088\u304F\u4F7F\u3046\u64CD\u4F5C\u306E\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u78BA\u8A8D\u30FB\u5909\u66F4\u3057\u3066\u3001\u4F5C\u696D\u306E\u6D41\u308C\u3092\u30B9\u30E0\u30FC\u30BA\u306B\u3057\u307E\u3059\u3002",
+                sendMessage: "\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u4FE1",
+                newChat: "\u65B0\u3057\u3044\u30C1\u30E3\u30C3\u30C8",
+                deleteDialog: "\u73FE\u5728\u306E\u4F1A\u8A71\u3092\u524A\u9664",
+                clickToRecord: "\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u5909\u66F4",
+                updated: "\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3057\u305F",
+                pressKeys: "\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30FC\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044...",
+                none: "\u7121\u52B9",
+                cleared: "\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u7121\u52B9\u306B\u3057\u307E\u3057\u305F",
+                clearError: "\u7121\u52B9\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
+                clear: "\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u7121\u52B9\u5316",
+                resetSuccess: "\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3057\u305F",
+                resetError: "\u30EA\u30BB\u30C3\u30C8\u306B\u5931\u6557\u3057\u307E\u3057\u305F",
+                reset: "\u65E2\u5B9A\u306B\u623B\u3059"
+              }
+            },
             appearance: {
               title: "\u5916\u89B3",
               theme: {
@@ -19818,7 +20088,7 @@ var init_userPreferenceRegister = __esm({
 });
 
 // packages/app/theme/colors.ts
-var semantic, mkLight, mkDark, neutral, ocean, iris, forest, trail, wave, rose, ember, blue, purple, green, graphite, mocha, pink, red, orange, yellow;
+var semantic, mkLight, mkDark, neutral, ocean, iris, forest, trail, wave, rose, ember, catppuccin, blue, purple, green, graphite, mocha, pink, red, orange, yellow;
 var init_colors = __esm({
   "packages/app/theme/colors.ts"() {
     "use strict";
@@ -19847,7 +20117,8 @@ var init_colors = __esm({
       codeBackground: bg3,
       shadowLight: `rgba(0,0,0,0.04)`,
       shadowMedium: `rgba(0,0,0,0.08)`,
-      shadowHeavy: `rgba(0,0,0,0.14)`
+      shadowHeavy: `rgba(0,0,0,0.14)`,
+      textOnPrimary: "#FFFFFF"
     });
     mkDark = (bg, bg2, bg3, textPrimary, textSec, textTer, border, borderL, shadowBase = "0,0,0") => ({
       background: bg,
@@ -19870,7 +20141,8 @@ var init_colors = __esm({
       codeBackground: bg2,
       shadowLight: `rgba(${shadowBase},0.18)`,
       shadowMedium: `rgba(${shadowBase},0.30)`,
-      shadowHeavy: `rgba(${shadowBase},0.44)`
+      shadowHeavy: `rgba(${shadowBase},0.44)`,
+      textOnPrimary: "#FFFFFF"
     });
     neutral = {
       light: {
@@ -19881,7 +20153,8 @@ var init_colors = __esm({
         primaryGhost: "rgba(113,113,122,0.08)",
         primaryHover: "rgba(113,113,122,0.10)",
         borderAccent: "#D4D4D8",
-        ...semantic.light
+        ...semantic.light,
+        ...mkLight("#FFFFFF", "#F4F4F5", "#E4E4E7", "#18181B", "#52525B", "#71717A", "#E4E4E7", "#F4F4F5")
       },
       dark: {
         primary: "#A1A1AA",
@@ -19891,7 +20164,9 @@ var init_colors = __esm({
         primaryGhost: "rgba(161,161,170,0.10)",
         primaryHover: "rgba(161,161,170,0.12)",
         borderAccent: "#52525B",
-        ...semantic.dark
+        ...semantic.dark,
+        ...mkDark("#18181B", "#27272A", "#3F3F46", "#FAFAFA", "#D4D4D8", "#A1A1AA", "#3F3F46", "#27272A", "24,24,27"),
+        textOnPrimary: "#18181B"
       }
     };
     ocean = {
@@ -19916,7 +20191,8 @@ var init_colors = __esm({
         borderAccent: "#1F6FEB",
         ...semantic.dark,
         ...mkDark("#0D1117", "#161B22", "#21262D", "#E6EDF3", "#8B949E", "#6E7681", "#30363D", "#161B22", "13,17,23"),
-        textHeading: "#E6EDF3"
+        textHeading: "#E6EDF3",
+        textOnPrimary: "#0D1117"
       }
     };
     iris = {
@@ -19941,7 +20217,8 @@ var init_colors = __esm({
         borderAccent: "#4A55C0",
         ...semantic.dark,
         ...mkDark("#0F0E17", "#16141F", "#1E1B2E", "#E8E5F7", "#A8A4C8", "#7B7698", "#272435", "#16141F", "15,14,23"),
-        textHeading: "#E8E5F7"
+        textHeading: "#E8E5F7",
+        textOnPrimary: "#0F0E17"
       }
     };
     forest = {
@@ -19967,10 +20244,12 @@ var init_colors = __esm({
         ...semantic.dark,
         ...mkDark("#0C1209", "#121A0E", "#1A2416", "#E4F0E2", "#87A882", "#5E7A5A", "#1A2416", "#121A0E", "12,18,9"),
         success: "#4ADE80",
-        textHeading: "#C8EEC4"
+        textHeading: "#C8EEC4",
+        textOnPrimary: "#0C1209"
       }
     };
     trail = {
+      meta: { radiusBoost: 1, motionEase: "cubic-bezier(0.22, 1, 0.36, 1)" },
       light: {
         primary: "#2E7DB5",
         primaryLight: "#6BB5E0",
@@ -20007,7 +20286,8 @@ var init_colors = __esm({
         shadowLight: "rgba(28, 36, 48, 0.05)",
         shadowMedium: "rgba(28, 36, 48, 0.09)",
         shadowHeavy: "rgba(28, 36, 48, 0.14)",
-        textHeading: "#1C2430"
+        textHeading: "#1C2430",
+        textOnPrimary: "#FFFFFF"
       },
       dark: {
         primary: "#5BA3D9",
@@ -20045,7 +20325,8 @@ var init_colors = __esm({
         shadowLight: "rgba(4, 8, 12, 0.22)",
         shadowMedium: "rgba(4, 8, 12, 0.34)",
         shadowHeavy: "rgba(4, 8, 12, 0.46)",
-        textHeading: "#E8F4FC"
+        textHeading: "#E8F4FC",
+        textOnPrimary: "#0B1218"
       }
     };
     wave = {
@@ -20082,7 +20363,8 @@ var init_colors = __esm({
         codeBackground: "#ECEAE3",
         shadowLight: "rgba(26, 26, 34, 0.05)",
         shadowMedium: "rgba(26, 26, 34, 0.09)",
-        shadowHeavy: "rgba(26, 26, 34, 0.14)"
+        shadowHeavy: "rgba(26, 26, 34, 0.14)",
+        textOnPrimary: "#FFFFFF"
       },
       dark: {
         // Kanagawa Wave — crystalBlue accent（#7E9CD8 是函数名颜色，最标志性的 Kanagawa 蓝）
@@ -20129,8 +20411,9 @@ var init_colors = __esm({
         shadowLight: "rgba(13, 12, 12, 0.18)",
         shadowMedium: "rgba(13, 12, 12, 0.28)",
         shadowHeavy: "rgba(13, 12, 12, 0.38)",
-        textHeading: "#DCD7BA"
+        textHeading: "#DCD7BA",
         // fujiWhite — 暖色标题
+        textOnPrimary: "#1F1F28"
       }
     };
     rose = {
@@ -20166,7 +20449,8 @@ var init_colors = __esm({
         codeBackground: "#F2E9E1",
         shadowLight: "rgba(87, 82, 121, 0.05)",
         shadowMedium: "rgba(87, 82, 121, 0.09)",
-        shadowHeavy: "rgba(87, 82, 121, 0.14)"
+        shadowHeavy: "rgba(87, 82, 121, 0.14)",
+        textOnPrimary: "#FFFFFF"
       },
       dark: {
         // Rosé Pine main
@@ -20201,7 +20485,8 @@ var init_colors = __esm({
         shadowLight: "rgba(12, 10, 20, 0.20)",
         shadowMedium: "rgba(12, 10, 20, 0.30)",
         shadowHeavy: "rgba(12, 10, 20, 0.44)",
-        textHeading: "#E0DEF4"
+        textHeading: "#E0DEF4",
+        textOnPrimary: "#191724"
       }
     };
     ember = {
@@ -20226,14 +20511,54 @@ var init_colors = __esm({
         borderAccent: "#92400E",
         ...semantic.dark,
         ...mkDark("#1A1207", "#221809", "#2E220C", "#F0E2C0", "#C4A056", "#8A7040", "#3A2A10", "#221809", "26,18,7"),
-        textHeading: "#FCD34D"
+        textHeading: "#FCD34D",
+        textOnPrimary: "#1A1207"
+      }
+    };
+    catppuccin = {
+      light: {
+        // Catppuccin Latte
+        primary: "#1e66f5",
+        // Blue
+        primaryLight: "#89b4fa",
+        // Blue Light
+        primaryDark: "#4c4f69",
+        // Text
+        primaryGradient: "linear-gradient(135deg, #1e66f5, #89b4fa)",
+        primaryGhost: "rgba(30, 102, 245, 0.08)",
+        primaryHover: "rgba(30, 102, 245, 0.10)",
+        borderAccent: "#ccd0da",
+        success: "#40a02b",
+        warning: "#df8e1d",
+        info: "#1e66f5",
+        error: "#d20f39",
+        ...mkLight("#eff1f5", "#e6e9ef", "#dce0e8", "#4c4f69", "#5c5f77", "#6c6f85", "#ccd0da", "#e6e9ef")
+      },
+      dark: {
+        // Catppuccin Mocha
+        primary: "#89b4fa",
+        // Blue
+        primaryLight: "#b4befe",
+        // Lavender
+        primaryDark: "#1e66f5",
+        primaryGradient: "linear-gradient(135deg, #89b4fa, #b4befe)",
+        primaryGhost: "rgba(137, 180, 250, 0.10)",
+        primaryHover: "rgba(137, 180, 250, 0.14)",
+        borderAccent: "#313244",
+        success: "#a6e3a1",
+        warning: "#f9e2af",
+        info: "#89b4fa",
+        error: "#f38ba8",
+        ...mkDark("#1e1e2e", "#181825", "#11111b", "#cdd6f4", "#bac2de", "#a6adc8", "#313244", "#181825", "30,30,46"),
+        textHeading: "#f5e0dc",
+        textOnPrimary: "#11111b"
       }
     };
     blue = ocean;
     purple = iris;
     green = forest;
     graphite = neutral;
-    mocha = rose;
+    mocha = catppuccin;
     pink = rose;
     red = ember;
     orange = ember;
@@ -20242,7 +20567,7 @@ var init_colors = __esm({
 });
 
 // packages/app/theme/theme.config.ts
-var SPACE, THEME_COLORS, THEME_NAME_ALIASES, DEFAULT_THEME_NAME, BASE_COLORS, MODE_COLORS;
+var SPACE, THEME_COLORS, THEME_NAME_ALIASES, DEFAULT_THEME_NAME;
 var init_theme_config = __esm({
   "packages/app/theme/theme.config.ts"() {
     "use strict";
@@ -20273,6 +20598,7 @@ var init_theme_config = __esm({
       wave,
       rose,
       ember,
+      catppuccin,
       // alias — DB 中可能存了旧 key，映射到最近似的新主题
       blue,
       purple,
@@ -20285,7 +20611,8 @@ var init_theme_config = __esm({
       mocha
     };
     THEME_NAME_ALIASES = {
-      blue: "ocean",
+      blue: "catppuccin",
+      ocean: "catppuccin",
       purple: "iris",
       green: "forest",
       orange: "ember",
@@ -20293,86 +20620,9 @@ var init_theme_config = __esm({
       graphite: "neutral",
       pink: "rose",
       red: "ember",
-      mocha: "rose"
+      mocha: "catppuccin"
     };
-    DEFAULT_THEME_NAME = "ocean";
-    BASE_COLORS = {
-      light: {
-        background: "#FFFFFF",
-        backgroundSecondary: "#F4F4F5",
-        // zinc-100
-        backgroundTertiary: "#E4E4E7",
-        // zinc-200
-        backgroundGhost: "rgba(255, 255, 255, 0.94)",
-        backgroundHover: "#D4D4D8",
-        // zinc-300
-        backgroundSelected: "#A1A1AA",
-        // zinc-400
-        text: "#18181B",
-        // zinc-900
-        textSecondary: "#52525B",
-        // zinc-600
-        textTertiary: "#71717A",
-        // zinc-500
-        textQuaternary: "#A1A1AA",
-        // zinc-400
-        textLight: "#D4D4D8",
-        // zinc-300
-        placeholder: "#A1A1AA",
-        // zinc-400
-        border: "#E4E4E7",
-        // zinc-200
-        borderHover: "#A1A1AA",
-        // zinc-400
-        borderLight: "#F4F4F5",
-        // zinc-100
-        error: "#DC2626",
-        shadowLight: "rgba(0, 0, 0, 0.04)",
-        shadowMedium: "rgba(0, 0, 0, 0.08)",
-        shadowHeavy: "rgba(0, 0, 0, 0.14)",
-        messageBackground: "#FFFFFF",
-        codeBackground: "#F4F4F5"
-      },
-      dark: {
-        background: "#18181B",
-        // zinc-900
-        backgroundSecondary: "#27272A",
-        // zinc-800
-        backgroundTertiary: "#3F3F46",
-        // zinc-700
-        backgroundGhost: "rgba(24, 24, 27, 0.94)",
-        backgroundHover: "#52525B",
-        // zinc-600
-        backgroundSelected: "#3F3F46",
-        // zinc-700
-        text: "#FAFAFA",
-        // zinc-50
-        textSecondary: "#D4D4D8",
-        // zinc-300
-        textTertiary: "#A1A1AA",
-        // zinc-400
-        textQuaternary: "#71717A",
-        // zinc-500
-        textLight: "#52525B",
-        // zinc-600
-        placeholder: "#71717A",
-        // zinc-500
-        border: "#3F3F46",
-        // zinc-700
-        borderHover: "#71717A",
-        // zinc-500
-        borderLight: "#27272A",
-        // zinc-800
-        error: "#F87171",
-        shadowLight: "rgba(0, 0, 0, 0.16)",
-        shadowMedium: "rgba(0, 0, 0, 0.28)",
-        shadowHeavy: "rgba(0, 0, 0, 0.40)",
-        messageBackground: "#27272A",
-        codeBackground: "#09090B"
-        // zinc-950
-      }
-    };
-    MODE_COLORS = BASE_COLORS;
+    DEFAULT_THEME_NAME = "catppuccin";
   }
 });
 
@@ -20779,6 +21029,7 @@ __export(settingSlice_exports, {
   selectDefaultAgentId: () => selectDefaultAgentId,
   selectDefaultAgentPreference: () => selectDefaultAgentPreference,
   selectDefaultSpaceId: () => selectDefaultSpaceId,
+  selectDeleteShortcut: () => selectDeleteShortcut,
   selectDensity: () => selectDensity,
   selectDesktopChromeConnectorEnabled: () => selectDesktopChromeConnectorEnabled,
   selectEditorAutoSave: () => selectEditorAutoSave,
@@ -20847,7 +21098,7 @@ import {
   asyncThunkCreator,
   createSelector as createSelector2
 } from "@reduxjs/toolkit";
-var SYSTEM_DEFAULT_AGENT_ID, initialState, createSliceWithThunks, hasOwn, normalizeSidebarVisibleTypesSetting, normalizeDefaultAgentIdSetting, normalizeAuthorityHomeServerSetting, normalizeTonePresetSetting, normalizePolicyLevelSetting, resolveDefaultAgentIdSetting, selectResolvedDefaultAgentId, hexToRgbString, alphaColor, getCachedDefaultAgentRegisterRecord, persistDefaultAgentRegister, omitKeys, normalizeSettingChanges, LOCAL_FIRST_APPEARANCE_KEYS, LOCAL_ONLY_SETTINGS_KEYS, isLocalFirstAppearanceChange, stripRegisterBackedFieldsFromSettingsWrite, sanitizeStoredSettingsRecord, hydrateStoredSettings, buildSettingsPersistencePlan, settingSlice, getSettings, setSettings, clearDefaultSpaceId, addHostToCurrentServer, changeTheme, changeDensity, changeFontPreset, changeDarkMode, toggleShowThinking, setThemeFollowsSystem, setSidebarWidth, toggleEnableReadCurrentSpace, setEditorDefaultMode, setEditorLightCodeTheme, setEditorDarkCodeTheme, setEditorCodeTheme, toggleEditorWordCount, toggleEditorShortcut, setEditorFontSize, toggleEditorAutoSave, setEditorAutoSaveInterval, setGlobalPrompt, setUserTonePreset, setKnowledgeCaptureLevel, setSpaceContextLevel, setAiRecentContentLimit, setContextRetention, setMaxExecutionTime, setDefaultAgentId, setPreferredAnimationSet, setThemeMode, selectSettings, isLocalServerUrl2, resolveDesktopSafeServer, selectCurrentServer, selectSyncServers, selectRemoteServer, selectRemoteSyncServers, selectRemoteServers, selectDefaultSpaceId, selectPreferredAnimationSet, selectShowThinking, selectMaxCost, selectMaxExecutionTime, selectIsDark, selectThemeMode, selectHeaderHeight, selectThemeName, selectThemeFollowsSystem, selectSidebarWidth, selectDensity, selectFontPreset, selectEnableReadCurrentSpace, selectSidebarVisibleTypes, selectGlobalPrompt, selectUserTonePreset, selectKnowledgeCaptureLevel, selectSpaceContextLevel, selectAutoApproveSelfUpdateFields, selectAiRecentContentLimit, selectContextRetention, selectDefaultAgentPreference, selectDefaultAgentId, selectOcrModel, selectShowScrollToTopButton, selectShowScrollToBottomButton, selectCreateMenuOpenCount, selectDesktopChromeConnectorEnabled, selectEditorDefaultMode, selectEditorLightCodeTheme, selectEditorDarkCodeTheme, selectEditorCodeTheme, selectEditorWordCountEnabled, selectEditorShortcuts, selectEditorFontSize, selectEditorAutoSave, selectEditorAutoSaveInterval, selectTheme, selectEditorConfig, settingSlice_default;
+var SYSTEM_DEFAULT_AGENT_ID, initialState, createSliceWithThunks, hasOwn, normalizeSidebarVisibleTypesSetting, normalizeDefaultAgentIdSetting, normalizeAuthorityHomeServerSetting, normalizeTonePresetSetting, normalizePolicyLevelSetting, resolveDefaultAgentIdSetting, selectResolvedDefaultAgentId, hexToRgbString, alphaColor, getCachedDefaultAgentRegisterRecord, persistDefaultAgentRegister, omitKeys, normalizeSettingChanges, LOCAL_FIRST_APPEARANCE_KEYS, LOCAL_ONLY_SETTINGS_KEYS, isLocalFirstAppearanceChange, stripRegisterBackedFieldsFromSettingsWrite, sanitizeStoredSettingsRecord, hydrateStoredSettings, buildSettingsPersistencePlan, settingSlice, getSettings, setSettings, clearDefaultSpaceId, addHostToCurrentServer, changeTheme, changeDensity, changeFontPreset, changeDarkMode, toggleShowThinking, setThemeFollowsSystem, setSidebarWidth, toggleEnableReadCurrentSpace, setEditorDefaultMode, setEditorLightCodeTheme, setEditorDarkCodeTheme, setEditorCodeTheme, toggleEditorWordCount, toggleEditorShortcut, setEditorFontSize, toggleEditorAutoSave, setEditorAutoSaveInterval, setGlobalPrompt, setUserTonePreset, setKnowledgeCaptureLevel, setSpaceContextLevel, setAiRecentContentLimit, setContextRetention, setMaxExecutionTime, setDefaultAgentId, setPreferredAnimationSet, setThemeMode, selectSettings, isLocalServerUrl2, resolveDesktopSafeServer, selectCurrentServer, selectSyncServers, selectRemoteServer, selectRemoteSyncServers, selectRemoteServers, selectDefaultSpaceId, selectPreferredAnimationSet, selectShowThinking, selectMaxCost, selectMaxExecutionTime, selectIsDark, selectThemeMode, selectHeaderHeight, selectThemeName, selectThemeFollowsSystem, selectSidebarWidth, selectDensity, selectFontPreset, selectEnableReadCurrentSpace, selectSidebarVisibleTypes, selectGlobalPrompt, selectUserTonePreset, selectKnowledgeCaptureLevel, selectSpaceContextLevel, selectAutoApproveSelfUpdateFields, selectAiRecentContentLimit, selectContextRetention, selectDefaultAgentPreference, selectDefaultAgentId, selectOcrModel, selectShowScrollToTopButton, selectShowScrollToBottomButton, selectCreateMenuOpenCount, selectDesktopChromeConnectorEnabled, selectEditorDefaultMode, selectEditorLightCodeTheme, selectEditorDarkCodeTheme, selectEditorCodeTheme, selectEditorWordCountEnabled, selectEditorShortcuts, selectDeleteShortcut, selectEditorFontSize, selectEditorAutoSave, selectEditorAutoSaveInterval, selectTheme, selectEditorConfig, settingSlice_default;
 var init_settingSlice = __esm({
   "packages/app/settings/settingSlice.tsx"() {
     "use strict";
@@ -20920,7 +21171,8 @@ var init_settingSlice = __esm({
       showScrollToTopButton: false,
       showScrollToBottomButton: false,
       createMenuOpenCount: 0,
-      desktopChromeConnectorEnabled: false
+      desktopChromeConnectorEnabled: false,
+      deleteShortcut: typeof window !== "undefined" && typeof window.navigator !== "undefined" && /Mac|iPod|iPhone|iPad/.test(window.navigator.platform) ? "meta+backspace" : "ctrl+backspace"
     };
     createSliceWithThunks = buildCreateSlice({
       creators: { asyncThunk: asyncThunkCreator }
@@ -21548,6 +21800,7 @@ var init_settingSlice = __esm({
     );
     selectEditorWordCountEnabled = (state) => state.settings.editorWordCountEnabled;
     selectEditorShortcuts = (state) => state.settings.editorShortcuts;
+    selectDeleteShortcut = (state) => state.settings.deleteShortcut;
     selectEditorFontSize = (state) => state.settings.editorFontSize;
     selectEditorAutoSave = (state) => state.settings.editorAutoSave;
     selectEditorAutoSaveInterval = (state) => state.settings.editorAutoSaveInterval;
@@ -21564,9 +21817,9 @@ var init_settingSlice = __esm({
         const mode = isDark ? "dark" : "light";
         const validThemeName = THEME_COLORS[themeName] ? themeName : DEFAULT_THEME_NAME;
         const validFontPreset = normalizeFontPreset(fontPreset) ?? DEFAULT_FONT_PRESET;
-        const baseColors = MODE_COLORS[mode];
-        const themeColors = THEME_COLORS[validThemeName][mode];
-        const c = { ...baseColors, ...themeColors };
+        const themeData = THEME_COLORS[validThemeName];
+        const c = themeData[mode];
+        const meta = themeData.meta;
         const compact2 = density === "compact";
         return {
           sidebarWidth: `${sidebarWidth}px`,
@@ -21618,14 +21871,14 @@ var init_settingSlice = __esm({
           },
           // Border radius scale — xs/sm/md map to control/surface/overlay tiers.
           // lg/xl remain as aliases for gradual migration of legacy CSS.
-          radius: /* @__PURE__ */ (() => {
-            const trail2 = validThemeName === "trail";
+          radius: (() => {
+            const boost = meta?.radiusBoost ?? 0;
             const xs = compact2 ? "10px" : "12px";
-            const sm = trail2 ? compact2 ? "15px" : "17px" : compact2 ? "14px" : "16px";
+            const sm = compact2 ? `${14 + boost}px` : `${16 + boost}px`;
             const md = compact2 ? "20px" : "24px";
             return { xs, sm, md, lg: sm, xl: md };
           })(),
-          motionEase: validThemeName === "trail" ? "cubic-bezier(0.22, 1, 0.36, 1)" : "cubic-bezier(0.33, 0, 0.2, 1)",
+          motionEase: meta?.motionEase ?? "cubic-bezier(0.33, 0, 0.2, 1)",
           motionEaseTide: "cubic-bezier(0.22, 1, 0.36, 1)",
           motionEaseBreath: "cubic-bezier(0.4, 0, 0.6, 1)",
           motionDuration: "0.32s",
@@ -22130,7 +22383,7 @@ var init_addContentAction = __esm({
         contentKey,
         fileCategory,
         mimeType,
-        fileSize,
+        fileSize: fileSize2,
         originalName,
         categoryId: rawCategoryId,
         pinned = false,
@@ -22168,7 +22421,7 @@ var init_addContentAction = __esm({
         contentKey,
         ...fileCategory !== void 0 ? { fileCategory } : {},
         ...mimeType !== void 0 ? { mimeType } : {},
-        ...fileSize !== void 0 ? { fileSize } : {},
+        ...fileSize2 !== void 0 ? { fileSize: fileSize2 } : {},
         ...originalName !== void 0 ? { originalName } : {},
         ...categoryIdForStorage !== void 0 && {
           categoryId: categoryIdForStorage
@@ -43545,7 +43798,7 @@ function appendCliCapabilityWarnings(content, warnings) {
 ${warnings.map((warning) => `- ${warning}`).join("\n")}`;
   return `${content}${warningBlock}`;
 }
-var buildParallelMessageMetadata, filterMessagesForParallelBranch, buildDesktopRuntimeToolMessagesForUi, extractDesktopRuntimeToolCallsForUi, shouldUseDesktopLocalRuntime, resolveWebAgentRuntimeToolSurface, formatMachineAgentRunError, normalizeThreadMetadataPatch, patchDialogThreadMetadata, patchDialogActiveAgent, QUICK_CHAT_AGENT_CONFIG_READ_TIMEOUT_MS, QUICK_CHAT_DYNAMIC_CONTEXT_TIMEOUT_MS, EMPTY_DYNAMIC_CONTEXTS, logQuickChatPerfStage4, readAgentConfigForTurn, buildDynamicContextsForTurn, finalizeQuickChatAgentTurnFailure, normalizeAgentRunUserInput, isSimpleTextInput, canUseQuickChatEmptyDynamicContexts, QUICK_CHAT_DIRECT_ANSWER_PATTERN, QUICK_CHAT_TOOL_INTENT_PATTERN, shouldDisableQuickChatToolsForDirectAnswer, classifyQuickChatAccessError, isUsableAgentConfig, extractAgentRunUserText, hasAgentRunUserInputContent, setLoopStopReason2, streamAgentChatTurnHandler;
+var buildParallelMessageMetadata, filterMessagesForParallelBranch, buildDesktopRuntimeToolMessagesForUi, extractDesktopRuntimeToolCallsForUi, shouldUseDesktopLocalRuntime, readCurrentDesktopMachineId, resolveRemoteBoundMachineId, resolveWebAgentRuntimeToolSurface, formatMachineAgentRunError, normalizeThreadMetadataPatch, patchDialogThreadMetadata, patchDialogActiveAgent, QUICK_CHAT_AGENT_CONFIG_READ_TIMEOUT_MS, QUICK_CHAT_DYNAMIC_CONTEXT_TIMEOUT_MS, EMPTY_DYNAMIC_CONTEXTS, logQuickChatPerfStage4, readAgentConfigForTurn, buildDynamicContextsForTurn, finalizeQuickChatAgentTurnFailure, normalizeAgentRunUserInput, isSimpleTextInput, canUseQuickChatEmptyDynamicContexts, QUICK_CHAT_DIRECT_ANSWER_PATTERN, QUICK_CHAT_TOOL_INTENT_PATTERN, shouldDisableQuickChatToolsForDirectAnswer, classifyQuickChatAccessError, isUsableAgentConfig, extractAgentRunUserText, hasAgentRunUserInputContent, setLoopStopReason2, streamAgentChatTurnHandler;
 var init_streamAgentChatTurn = __esm({
   "packages/ai/agent/streamAgentChatTurn.ts"() {
     "use strict";
@@ -43675,6 +43928,18 @@ var init_streamAgentChatTurn = __esm({
       if (!getIsDesktopApp()) return false;
       return agentConfig?.apiSource !== "cli";
     };
+    readCurrentDesktopMachineId = () => {
+      const fromProcess = typeof process !== "undefined" ? (process.env?.NOLO_CURRENT_MACHINE_ID || process.env?.NOLO_MACHINE_ID || "").trim() : "";
+      if (fromProcess) return fromProcess;
+      const w = typeof globalThis !== "undefined" && globalThis.window ? globalThis.window : null;
+      const fromWindow = typeof w?.__NOLO_CURRENT_MACHINE_ID__ === "string" ? w.__NOLO_CURRENT_MACHINE_ID__.trim() : typeof w?.__NOLO_MACHINE_ID__ === "string" ? w.__NOLO_MACHINE_ID__.trim() : "";
+      return fromWindow;
+    };
+    resolveRemoteBoundMachineId = (machineId) => {
+      if (!machineId || !getIsDesktopApp()) return machineId;
+      const currentMachineId = readCurrentDesktopMachineId();
+      return currentMachineId && currentMachineId === machineId ? "" : machineId;
+    };
     resolveWebAgentRuntimeToolSurface = (agentConfig, state) => {
       const toolSurface = resolveRuntimeToolSurfaceForAgent({
         explicitToolNames: Array.isArray(agentConfig.tools) ? agentConfig.tools : [],
@@ -43999,7 +44264,8 @@ var init_streamAgentChatTurn = __esm({
           apiSource: agentConfig.apiSource,
           source: cachedAgentConfig === rawAgentConfig ? "cache" : "read"
         });
-        const boundMachineId = typeof agentConfig.runtimeBinding?.machineId === "string" ? agentConfig.runtimeBinding.machineId.trim() : "";
+        const configuredBoundMachineId = typeof agentConfig.runtimeBinding?.machineId === "string" ? agentConfig.runtimeBinding.machineId.trim() : "";
+        const boundMachineId = resolveRemoteBoundMachineId(configuredBoundMachineId);
         if (agentConfig.apiSource === "cli" || boundMachineId && !getIsDesktopApp()) {
           console.info("[streamAgentChatTurn] Triggered CLI/machine route. apiSource:", agentConfig.apiSource, "boundMachineId:", boundMachineId, "agentKey:", agentKey);
           const currentState = getState();
@@ -63688,14 +63954,6 @@ function summarizeEndpoint(value) {
     return "invalid-url";
   }
 }
-function parseJsonObject2(raw) {
-  try {
-    const parsed = JSON.parse(raw);
-    return parsed && typeof parsed === "object" ? parsed : {};
-  } catch {
-    return {};
-  }
-}
 function isCliProviderAgent(agentConfig) {
   return Boolean(
     agentConfig.apiSource === "cli" || agentConfig.provider === "cli" || agentConfig.cliProvider
@@ -64419,6 +64677,9 @@ function createCliLocalRuntimeAdapter(deps) {
                 raw: result.raw
               };
             } catch (error) {
+              if (error instanceof CliProviderQuotaError) {
+                throw error;
+              }
               const message = error instanceof Error ? error.message : String(error);
               throw new Error(
                 `Local CLI provider "${provider}" is unavailable or failed: ${message}`
@@ -64458,12 +64719,15 @@ function createCliLocalRuntimeAdapter(deps) {
               toolNames: requestedToolNames,
               env: deps.env
             });
+            const timeoutSignal = buildRequestTimeoutSignal(options?.timeoutMs);
+            const usesResponsesApi = providerConfig2.endpoint.includes("/responses");
+            const stream = Boolean(options?.onTextDelta) && !usesResponsesApi;
             const request = buildPlatformChatCompletionRequest({
               providerConfig: providerConfig2,
               messages,
-              tools
+              tools,
+              stream
             });
-            const timeoutSignal = buildRequestTimeoutSignal(options?.timeoutMs);
             logLocalRuntimeDiagnostic("provider.request.start", {
               agentKey: agentConfig.key,
               transport: "platform-proxy",
@@ -64474,32 +64738,62 @@ function createCliLocalRuntimeAdapter(deps) {
               toolCount: tools.length,
               requestedToolNames,
               openAiToolNames: summarizeOpenAiToolNames(tools),
-              timeoutMs: options?.timeoutMs ?? null
+              timeoutMs: options?.timeoutMs ?? null,
+              stream
             });
-            const res = await fetchWithTransientRetry(fetchImpl, request.url, {
-              ...request.init,
-              ...timeoutSignal ? { signal: timeoutSignal.signal } : {}
-            }, {
-              sleep: deps.sleep,
-              loopbackRequest
-            }).finally(() => timeoutSignal?.clear());
-            const raw = await res.text().catch(() => "");
-            logLocalRuntimeDiagnostic("provider.request.result", {
-              agentKey: agentConfig.key,
-              transport: "platform-proxy",
-              status: res.status,
-              ok: res.ok,
-              responseBytes: raw.length
-            });
-            const data = parsePlatformChatCompletionData(raw);
-            if (!res.ok) {
-              throw new Error(`platform provider failed: HTTP ${res.status} ${JSON.stringify(data)}`);
+            try {
+              const res = await fetchWithTransientRetry(fetchImpl, request.url, {
+                ...request.init,
+                ...timeoutSignal ? { signal: timeoutSignal.signal } : {}
+              }, {
+                sleep: deps.sleep,
+                loopbackRequest
+              });
+              if (!res.ok) {
+                const raw2 = await res.text().catch(() => "");
+                const data2 = parsePlatformChatCompletionData(raw2);
+                throw new Error(`platform provider failed: HTTP ${res.status} ${JSON.stringify(data2)}`);
+              }
+              if (stream && options?.onTextDelta) {
+                const streamed = await readOpenAiCompatibleSseCompletion({
+                  response: res,
+                  onTextDelta: options.onTextDelta
+                });
+                logLocalRuntimeDiagnostic("provider.request.result", {
+                  agentKey: agentConfig.key,
+                  transport: "platform-proxy",
+                  ok: true,
+                  stream: true,
+                  contentChars: streamed.content.length,
+                  toolCallCount: streamed.tool_calls?.length ?? 0
+                });
+                return {
+                  content: streamed.content,
+                  model: providerConfig2.model,
+                  provider: providerConfig2.provider,
+                  ...streamed.tool_calls ? { tool_calls: streamed.tool_calls } : {},
+                  ...streamed.reasoning_content ? { reasoning_content: streamed.reasoning_content } : {},
+                  ...streamed.usage ? { usage: streamed.usage } : {},
+                  trace: messages
+                };
+              }
+              const raw = await res.text().catch(() => "");
+              logLocalRuntimeDiagnostic("provider.request.result", {
+                agentKey: agentConfig.key,
+                transport: "platform-proxy",
+                status: res.status,
+                ok: res.ok,
+                responseBytes: raw.length
+              });
+              const data = parsePlatformChatCompletionData(raw);
+              return parsePlatformChatCompletionResponse({
+                providerConfig: providerConfig2,
+                data,
+                trace: messages
+              });
+            } finally {
+              timeoutSignal?.clear();
             }
-            return parsePlatformChatCompletionResponse({
-              providerConfig: providerConfig2,
-              data,
-              trace: messages
-            });
           }
         };
       }
@@ -64531,47 +64825,45 @@ function createCliLocalRuntimeAdapter(deps) {
             toolNames: requestedToolNames,
             env: deps.env
           });
-          const request = buildOpenAiCompatibleChatCompletionRequest({
-            providerConfig,
-            messages,
-            tools
-          });
           const timeoutSignal = buildRequestTimeoutSignal(options?.timeoutMs);
+          const stream = Boolean(options?.onTextDelta);
           logLocalRuntimeDiagnostic("provider.request.start", {
             agentKey: agentConfig.key,
             transport: "direct-openai-compatible",
-            requestUrl: summarizeEndpoint(request.url) ?? null,
+            requestUrl: summarizeEndpoint(providerConfig.endpoint) ?? null,
             model: providerConfig.model,
             messageCount: messages.length,
             toolCount: tools.length,
             requestedToolNames,
             openAiToolNames: summarizeOpenAiToolNames(tools),
-            timeoutMs: options?.timeoutMs ?? null
+            timeoutMs: options?.timeoutMs ?? null,
+            stream
           });
-          const res = await fetchWithTransientRetry(fetchImpl, request.url, {
-            ...request.init,
-            ...timeoutSignal ? { signal: timeoutSignal.signal } : {}
-          }, {
-            sleep: deps.sleep,
-            loopbackRequest
-          }).finally(() => timeoutSignal?.clear());
-          const raw = await res.text().catch(() => "");
-          logLocalRuntimeDiagnostic("provider.request.result", {
-            agentKey: agentConfig.key,
-            transport: "direct-openai-compatible",
-            status: res.status,
-            ok: res.ok,
-            responseBytes: raw.length
-          });
-          const data = parseJsonObject2(raw);
-          if (!res.ok) {
-            throw new Error(`local provider failed: HTTP ${res.status} ${JSON.stringify(data)}`);
+          try {
+            const result = await executeOpenAiCompatibleChatCompletion({
+              providerConfig,
+              messages,
+              tools,
+              fetchImpl: (url, init) => fetchWithTransientRetry(fetchImpl, url, init, {
+                sleep: deps.sleep,
+                loopbackRequest
+              }),
+              stream,
+              onTextDelta: options?.onTextDelta,
+              signal: timeoutSignal?.signal
+            });
+            logLocalRuntimeDiagnostic("provider.request.result", {
+              agentKey: agentConfig.key,
+              transport: "direct-openai-compatible",
+              ok: true,
+              stream,
+              contentChars: result.content.length,
+              toolCallCount: result.tool_calls?.length ?? 0
+            });
+            return result;
+          } finally {
+            timeoutSignal?.clear();
           }
-          return parseOpenAiCompatibleChatCompletionResponse({
-            providerConfig,
-            data,
-            trace: messages
-          });
         }
       };
     },
@@ -65989,8 +66281,8 @@ var init_localDialogRead = __esm({
 });
 
 // packages/cli/index.ts
-import { dirname as dirname8, join as join12 } from "node:path";
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { dirname as dirname9, join as join13 } from "node:path";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // packages/cli/cliCommandDispatch.ts
 import { fileURLToPath } from "node:url";
@@ -66155,17 +66447,6 @@ function parseIsoTimestampOption(raw, flag) {
   }
   return new Date(time).toISOString();
 }
-function buildUsageProbeConfig(kind) {
-  if (!kind) return void 0;
-  if (kind !== "qoder-local-quota-log") {
-    throw new Error("--usage-probe currently supports qoder-local-quota-log.");
-  }
-  return {
-    kind,
-    command: "nolo agent usage qoder",
-    capability: "qoder-usage"
-  };
-}
 async function curlFetch(url, init) {
   const method = init?.method ?? "GET";
   const headers = new Headers(init?.headers ?? {});
@@ -66422,7 +66703,6 @@ function parseAgentUpdateArgs(args2) {
     "--max-concurrent"
   );
   const expiresAt = parseIsoTimestampOption(readOption2(args2, "--expires-at"), "--expires-at");
-  const usageProbe = buildUsageProbeConfig(readOption2(args2, "--usage-probe"));
   const handle = readOption2(args2, "--handle")?.trim();
   const promptSources = [prompt, promptFile, promptDoc].filter(Boolean);
   if (promptSources.length > 1) {
@@ -66439,11 +66719,8 @@ function parseAgentUpdateArgs(args2) {
   if (customProviderUrl) updates.customProviderUrl = customProviderUrl;
   if (apiKey) updates.apiKey = apiKey;
   if (maxConcurrent != null) updates.admission = { maxConcurrent };
-  if (expiresAt || usageProbe) {
-    updates.scheduling = {
-      ...expiresAt ? { expiresAt } : {},
-      ...usageProbe ? { usageProbe } : {}
-    };
+  if (expiresAt) {
+    updates.scheduling = { expiresAt };
   }
   if (handle) updates.handle = handle;
   for (const entry of readRepeatedOption(args2, "--field")) {
@@ -67582,7 +67859,7 @@ async function runAgentUpdateCommand(args2, deps = {}) {
   }
   if (!parsed) {
     output2.write(
-      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--usage-probe qoder-local-quota-log] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
+      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
     );
     return args2[0] ? 0 : 1;
   }
@@ -67654,7 +67931,7 @@ async function runAgentCreateCommand(args2, deps = {}) {
   }
   if (!parsed) {
     output2.write(
-      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--usage-probe qoder-local-quota-log] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--provider-api-key <key>] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
+      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--provider-api-key <key>] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
     );
     return args2[0] ? 0 : 1;
   }
@@ -67753,6 +68030,412 @@ function createStreamingTextWriter({
   };
 }
 
+// packages/cli/client/assistantOutput.ts
+var ANSI = {
+  reset: "\x1B[0m",
+  bold: "\x1B[1m",
+  dim: "\x1B[2m",
+  cyan: "\x1B[36m"
+};
+function normalizeRenderDisplayMode(raw, fallback = "rich") {
+  const normalized = raw?.trim().toLowerCase();
+  if (normalized === "plain" || normalized === "raw" || normalized === "off" || normalized === "0") {
+    return "plain";
+  }
+  if (normalized === "rich" || normalized === "on" || normalized === "1" || normalized === "styled") {
+    return "rich";
+  }
+  return fallback;
+}
+function resolveRenderDisplayMode(env = process.env) {
+  return normalizeRenderDisplayMode(env.NOLO_CLI_RENDER ?? env.NOLO_RENDER, "rich");
+}
+function splitTableCells(line) {
+  const trimmed = line.trim();
+  if (!trimmed.includes("|")) return [];
+  const core = trimmed.replace(/^\|/, "").replace(/\|$/, "");
+  return core.split("|").map((cell) => cell.trim()).filter(Boolean);
+}
+function isTableSeparator(line) {
+  const cells = splitTableCells(line);
+  return cells.length > 0 && cells.every((cell) => /^:?-{3,}:?$/.test(cell));
+}
+function isTableRow(line) {
+  const cells = splitTableCells(line);
+  return cells.length >= 2 && cells.some((cell) => cell.length > 0);
+}
+function convertMarkdownTablesForTerminal(text) {
+  const lines = text.split("\n");
+  const out = [];
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index] ?? "";
+    const next = lines[index + 1] ?? "";
+    if (isTableRow(line) && isTableSeparator(next)) {
+      const headers = splitTableCells(line);
+      index += 1;
+      while (index + 1 < lines.length && isTableRow(lines[index + 1] ?? "") && !isTableSeparator(lines[index + 1] ?? "")) {
+        index += 1;
+        const row = splitTableCells(lines[index] ?? "");
+        const label = row[0] ?? "";
+        const detail = row.slice(1).join(" \u2014 ").trim();
+        out.push(detail ? `  \u2022 ${label} \u2014 ${detail}` : `  \u2022 ${label}`);
+      }
+      if (out.length > 0 && out[out.length - 1] !== "") out.push("");
+      continue;
+    }
+    out.push(line);
+  }
+  return out.join("\n");
+}
+function polishAssistantStructure(text) {
+  return convertMarkdownTablesForTerminal(text).replace(/\r\n/g, "\n").replace(/([^\n])\n(#{1,3} )/g, "$1\n\n$2").replace(/\n{4,}/g, "\n\n\n").trim();
+}
+function styleInlineMarkdown(line, mode) {
+  if (mode === "plain") return line;
+  return line.replace(/\*\*(.+?)\*\*/g, `${ANSI.bold}$1${ANSI.reset}`);
+}
+function styleRichMarkdownLine(line) {
+  const heading = line.match(/^(#{1,3})\s+(.+)$/);
+  if (heading) {
+    const level = heading[1].length;
+    const title = heading[2];
+    if (level <= 2) return `${ANSI.bold}${title}${ANSI.reset}`;
+    return `${ANSI.cyan}${title}${ANSI.reset}`;
+  }
+  if (/^---+$/.test(line.trim())) {
+    return `${ANSI.dim}${line}${ANSI.reset}`;
+  }
+  return styleInlineMarkdown(line, "rich");
+}
+function formatAssistantDisplay(text, mode = "rich") {
+  const polished = polishAssistantStructure(text);
+  if (mode === "plain") {
+    return polished.split("\n").map((line) => styleInlineMarkdown(line, "plain")).join("\n");
+  }
+  return polished.split("\n").map((line) => styleRichMarkdownLine(line)).join("\n");
+}
+
+// packages/cli/client/thinkingOutput.ts
+var THINK_OPEN = /<think>/i;
+var THINK_CLOSE = /<\/think>/i;
+var COLLAPSED_MARKER = /^\s*▸ 思考已折叠\s*$/;
+function normalizeThinkingDisplayMode(raw, fallback = "hide") {
+  const normalized = raw?.trim().toLowerCase();
+  if (normalized === "hide" || normalized === "off" || normalized === "false" || normalized === "0") {
+    return "hide";
+  }
+  if (normalized === "marker" || normalized === "collapsed" || normalized === "fold") {
+    return "marker";
+  }
+  if (normalized === "show" || normalized === "on" || normalized === "true" || normalized === "1") {
+    return "show";
+  }
+  return fallback;
+}
+function resolveThinkingDisplayMode(env = process.env) {
+  return normalizeThinkingDisplayMode(env.NOLO_CLI_THINKING ?? env.NOLO_THINKING, "hide");
+}
+function collapseThinkingBlocks(text, mode = "hide") {
+  if (mode === "show") return text;
+  const replacement = mode === "marker" ? "\u25B8 \u601D\u8003\u5DF2\u6298\u53E0\n" : "";
+  return text.replace(/<think>[\s\S]*?<\/think>\s*/gi, replacement).replace(/\n{3,}/g, "\n\n").trim();
+}
+function stripCollapsedThinkingMarkers(text) {
+  return text.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n").replace(/\n{2,}/g, "\n").trim();
+}
+function formatAssistantTextForCli(text, mode = "hide") {
+  const collapsed = collapseThinkingBlocks(text, mode);
+  return mode === "hide" ? stripCollapsedThinkingMarkers(collapsed) : collapsed;
+}
+function createThinkingAwareStreamFilter(write2, mode = "hide") {
+  if (mode === "show") {
+    return {
+      push(chunk) {
+        write2(chunk);
+      },
+      flush() {
+      }
+    };
+  }
+  let pending = "";
+  let insideThink = false;
+  let markerEmitted = false;
+  const emit = (chunk) => {
+    if (chunk) write2(chunk);
+  };
+  const emitMarker = () => {
+    if (mode !== "marker" || markerEmitted) return;
+    emit("\n\u25B8 \u601D\u8003\u5DF2\u6298\u53E0\n");
+    markerEmitted = true;
+  };
+  const consume = (input2) => {
+    pending += input2;
+    while (pending.length > 0) {
+      if (insideThink) {
+        const closeMatch = pending.match(THINK_CLOSE);
+        if (!closeMatch || closeMatch.index == null) {
+          emitMarker();
+          pending = "";
+          return;
+        }
+        emitMarker();
+        pending = pending.slice(closeMatch.index + closeMatch[0].length);
+        insideThink = false;
+        markerEmitted = false;
+        continue;
+      }
+      const openMatch = pending.match(THINK_OPEN);
+      if (!openMatch || openMatch.index == null) {
+        const nextMarker = pending.indexOf("<");
+        if (nextMarker === -1) {
+          const cleaned = mode === "hide" ? pending.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : pending;
+          emit(cleaned);
+          pending = "";
+          return;
+        }
+        if (nextMarker > 0) {
+          const head = pending.slice(0, nextMarker);
+          const cleaned = mode === "hide" ? head.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : head;
+          emit(cleaned);
+          pending = pending.slice(nextMarker);
+          continue;
+        }
+        if (pending.length < 7) return;
+        emit(pending[0]);
+        pending = pending.slice(1);
+        continue;
+      }
+      if (openMatch.index > 0) {
+        const head = pending.slice(0, openMatch.index);
+        const cleaned = mode === "hide" ? head.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : head;
+        emit(cleaned);
+        pending = pending.slice(openMatch.index);
+        continue;
+      }
+      pending = pending.slice(openMatch[0].length);
+      insideThink = true;
+      markerEmitted = false;
+    }
+  };
+  return {
+    push(chunk) {
+      consume(chunk);
+    },
+    flush() {
+      if (insideThink) emitMarker();
+      if (pending) {
+        const cleaned = mode === "hide" ? pending.split("\n").filter((line) => !COLLAPSED_MARKER.test(line)).join("\n") : pending;
+        emit(cleaned);
+      }
+      pending = "";
+      insideThink = false;
+      markerEmitted = false;
+    }
+  };
+}
+
+// packages/cli/client/tokenUsage.ts
+init_providers();
+var PROVIDER_LOOKUP_ORDER = [
+  "openrouter",
+  "fireworks",
+  "openai",
+  "mimo",
+  "gmi",
+  "google",
+  "deepseek",
+  "mistral",
+  "vultr",
+  "deepinfra",
+  "cloudflare"
+];
+function parseUsageRecord(usage2) {
+  if (!usage2 || typeof usage2 !== "object") return void 0;
+  const input2 = Number(usage2.input_tokens ?? usage2.prompt_tokens ?? 0);
+  const output2 = Number(usage2.output_tokens ?? usage2.completion_tokens ?? 0);
+  if (!Number.isFinite(input2) || !Number.isFinite(output2)) return void 0;
+  if (!input2 && !output2) return void 0;
+  return { input: input2, output: output2 };
+}
+function fuzzyContextWindow(model) {
+  const lower = model.toLowerCase();
+  if (lower.includes("minimax-m3") || lower.includes("minimax_m3")) return 1e6;
+  if (lower.includes("minimax-m2")) return 262144;
+  if (lower.includes("gpt-5") || lower.includes("gpt-4.1")) return 1047576;
+  if (lower.includes("claude")) return 2e5;
+  return void 0;
+}
+function resolveContextWindow(model) {
+  const raw = model?.trim();
+  if (!raw) return void 0;
+  for (const provider of PROVIDER_LOOKUP_ORDER) {
+    const config = findModelConfig(provider, raw);
+    if (config?.contextWindow) return config.contextWindow;
+  }
+  return fuzzyContextWindow(raw);
+}
+function buildTurnTokenUsage(usage2, model) {
+  const parsed = parseUsageRecord(usage2);
+  if (!parsed) return void 0;
+  const contextWindow = resolveContextWindow(model);
+  const remaining = contextWindow && parsed.input > 0 ? Math.max(0, contextWindow - parsed.input) : void 0;
+  return {
+    ...parsed,
+    ...contextWindow ? { contextWindow } : {},
+    ...remaining != null ? { remaining } : {}
+  };
+}
+function formatTokenCount(value) {
+  if (!Number.isFinite(value) || value < 0) return "\u2014";
+  if (value < 1e3) return String(Math.round(value));
+  if (value < 1e6) {
+    const compact3 = value / 1e3;
+    if (Number.isInteger(compact3)) return `${compact3}k`;
+    return `${compact3.toFixed(1).replace(/\.0$/, "")}k`;
+  }
+  const compact2 = value / 1e6;
+  return compact2 >= 100 ? `${Math.round(compact2)}M` : `${compact2.toFixed(1).replace(/\.0$/, "")}M`;
+}
+function renderTokenStatus(tokens) {
+  if (!tokens) return "in \u2014 out \u2014 left \u2014";
+  const left = tokens.remaining != null ? formatTokenCount(tokens.remaining) : tokens.contextWindow ? "\u2014" : "\u2014";
+  return `in ${formatTokenCount(tokens.input)} out ${formatTokenCount(tokens.output)} left ${left}`;
+}
+
+// packages/cli/client/terminalStyles.ts
+var ANSI2 = {
+  dim: "\x1B[2m",
+  bold: "\x1B[1m",
+  cyan: "\x1B[36m",
+  green: "\x1B[32m",
+  red: "\x1B[31m"
+};
+var RESET = "\x1B[0m";
+function resolveCliColorEnabled(env = process.env, isTTY = Boolean(process.stdout.isTTY)) {
+  const setting = (env.NOLO_CLI_COLOR ?? "").trim().toLowerCase();
+  if (setting === "0" || setting === "false" || setting === "off") return false;
+  if (env.NO_COLOR) return false;
+  if (setting === "1" || setting === "true" || setting === "on") return true;
+  return isTTY;
+}
+function styleCliText(text, style, enabled = resolveCliColorEnabled()) {
+  if (!enabled || !text) return text;
+  return `${ANSI2[style]}${text}${RESET}`;
+}
+function dimCliText(text, enabled = resolveCliColorEnabled()) {
+  return styleCliText(text, "dim", enabled);
+}
+
+// packages/cli/client/toolOutput.ts
+function normalizeToolDisplayMode(raw, fallback = "compact") {
+  const normalized = raw?.trim().toLowerCase();
+  if (normalized === "hide" || normalized === "off" || normalized === "false" || normalized === "0") {
+    return "hide";
+  }
+  if (normalized === "verbose" || normalized === "debug" || normalized === "trace" || normalized === "full") {
+    return "verbose";
+  }
+  if (normalized === "compact" || normalized === "minimal" || normalized === "short") {
+    return "compact";
+  }
+  return fallback;
+}
+function resolveToolDisplayMode(env = process.env) {
+  const legacyTrace = env.NOLO_TRACE_TOOLS?.trim().toLowerCase();
+  if (legacyTrace === "0" || legacyTrace === "false" || legacyTrace === "off") {
+    return "hide";
+  }
+  if (legacyTrace === "verbose" || legacyTrace === "full") {
+    return "verbose";
+  }
+  return normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "compact");
+}
+function shouldEmitToolEvents(mode) {
+  return mode !== "hide";
+}
+function clip4(value, max = 72) {
+  const compact2 = value.replace(/\s+/g, " ").trim();
+  return compact2.length > max ? `${compact2.slice(0, max - 1)}\u2026` : compact2;
+}
+function compactResultHint(summary, toolName) {
+  if (!summary) return "";
+  const linesMatch = summary.match(/(\d+)\s+lines?/);
+  if (linesMatch) {
+    if (toolName === "readFile" || toolName === "listFiles" || toolName === "globFiles") {
+      return `${linesMatch[1]} lines`;
+    }
+    if (toolName === "execShell" || toolName === "runCommand") {
+      return `${linesMatch[1]} lines`;
+    }
+  }
+  const exitMatch = summary.match(/exit=(\d+)/);
+  if (exitMatch && exitMatch[1] !== "0") return `exit ${exitMatch[1]}`;
+  return "";
+}
+function formatToolTraceLine(text, colorEnabled, accent = "none") {
+  if (!colorEnabled) return `${text}
+`;
+  if (accent === "error") {
+    return `${styleCliText(text, "red", true)}
+`;
+  }
+  return `${dimCliText(text, true)}
+`;
+}
+function formatVerboseToolEvent(event, colorEnabled) {
+  const round = event.round + 1;
+  const detail = event.argumentsPreview ? ` ${event.argumentsPreview}` : "";
+  if (event.type === "tool-call") {
+    return formatToolTraceLine(`[nolo:tool] #${round} -> ${event.toolName}${detail}`, colorEnabled);
+  }
+  if (event.type === "tool-error") {
+    const elapsed2 = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
+    return formatToolTraceLine(
+      `[nolo:tool] #${round} !! ${event.toolName}${elapsed2}: ${event.message ?? "failed"}`,
+      colorEnabled,
+      "error"
+    );
+  }
+  const elapsed = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
+  const summary = event.summary ? ` ${event.summary}` : "";
+  return formatToolTraceLine(
+    `[nolo:tool] #${round} <- ${event.toolName}${elapsed}${summary}`,
+    colorEnabled
+  );
+}
+function formatCompactToolLine(event, pending, colorEnabled) {
+  const toolName = event.toolName || pending?.toolName || "tool";
+  const args2 = clip4(event.argumentsPreview || pending?.argumentsPreview || "");
+  const label = args2 ? `${toolName} ${args2}` : toolName;
+  const ms = typeof event.elapsedMs === "number" ? `${event.elapsedMs}ms` : "";
+  if (event.type === "tool-error") {
+    const message = clip4(event.message ?? "failed", 96);
+    const timing2 = ms ? ` \xB7 ${ms}` : "";
+    return formatToolTraceLine(`  \u25B8 ${label}  \u2717 ${message}${timing2}`, colorEnabled, "error");
+  }
+  const hint = compactResultHint(event.summary, toolName);
+  const timing = ms ? ` ${ms}` : "";
+  const suffix = hint ? ` \xB7 ${hint}` : "";
+  return formatToolTraceLine(`  \u25B8 ${label}  \u2713${timing}${suffix}`, colorEnabled);
+}
+function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled()) {
+  const pending = /* @__PURE__ */ new Map();
+  return (event) => {
+    if (mode === "hide") return "";
+    if (mode === "verbose") return formatVerboseToolEvent(event, colorEnabled);
+    if (event.type === "tool-call") {
+      pending.set(event.toolCallId, {
+        toolName: event.toolName,
+        argumentsPreview: event.argumentsPreview
+      });
+      return "";
+    }
+    const call = pending.get(event.toolCallId);
+    pending.delete(event.toolCallId);
+    return formatCompactToolLine(event, call, colorEnabled);
+  };
+}
+
 // packages/cli/client/agentRun.ts
 var Spinner = class {
   constructor(output2, text) {
@@ -67858,6 +68541,23 @@ function isCliProviderAgentConfig(agentConfig) {
   const provider = typeof agentConfig?.provider === "string" ? agentConfig.provider.trim() : "";
   return Boolean(cliProvider) || provider === "agy" || provider === "codex" || provider === "claude";
 }
+function resolveBoundMachineId(agentConfig) {
+  return agentConfig?.runtimeBinding && typeof agentConfig.runtimeBinding === "object" ? String(agentConfig.runtimeBinding.machineId ?? "").trim() : "";
+}
+async function detectCurrentMachineId(env) {
+  const fromEnv = (env.NOLO_CURRENT_MACHINE_ID || env.NOLO_MACHINE_ID || "").trim();
+  if (fromEnv) return fromEnv;
+  try {
+    const { detectMachineInfo: detectMachineInfo2 } = await Promise.resolve().then(() => (init_machineInfo(), machineInfo_exports));
+    const machine = await detectMachineInfo2({ probeLaunchable: true });
+    return typeof machine?.machineId === "string" && machine.machineId.trim() ? machine.machineId.trim() : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function resolveCurrentMachineId(options) {
+  return options.currentMachineIdResolver ? options.currentMachineIdResolver(options.env) : detectCurrentMachineId(options.env);
+}
 function resolveAuthToken5(env) {
   return env.AUTH_TOKEN || env.AUTH || env.BENCHMARK_AUTH_TOKEN || "";
 }
@@ -67902,7 +68602,16 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
     }
     return false;
   }
-  if (isCliProviderAgentConfig(agentConfig)) return false;
+  if (isCliProviderAgentConfig(agentConfig)) {
+    const boundMachineId = resolveBoundMachineId(agentConfig);
+    if (!boundMachineId) return false;
+    const currentMachineId = (await resolveCurrentMachineId(options))?.trim() || "";
+    if (currentMachineId && currentMachineId === boundMachineId) return false;
+    options.output.write(
+      `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is bound to ${boundMachineId}` + (currentMachineId ? ` and this machine is ${currentMachineId}.` : ".") + " Use --local explicitly to force the current machine.\n"
+    );
+    return true;
+  }
   if (knownServerPlatformAgent) {
     options.output.write(
       `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. Use --local explicitly to force local workspace tools.
@@ -67972,10 +68681,13 @@ function buildSubjectRefs(options) {
   }
   return refs.length ? refs : void 0;
 }
-function shouldTraceLocalTools(options) {
-  const setting = (options.env.NOLO_TRACE_TOOLS ?? "").trim().toLowerCase();
-  if (setting === "0" || setting === "false" || setting === "off") return false;
-  return true;
+function formatAssistantResponseForCli(text, options) {
+  const thinkingMode = resolveThinkingDisplayMode(options.env);
+  const renderMode = resolveRenderDisplayMode(options.env);
+  return formatAssistantDisplay(
+    formatAssistantTextForCli(text, thinkingMode),
+    renderMode
+  );
 }
 function resolveAgentEventMode(options) {
   if (options.eventsMode === "jsonl") return "jsonl";
@@ -67986,23 +68698,6 @@ function isMissingLocalAgentConfigError(error, agentRef) {
     error && typeof error === "object" && "code" in error && error.code === LOCAL_AGENT_CONFIG_MISSING_CODE && error.agentRef === agentRef
   );
 }
-function formatToolTraceEvent(event) {
-  const round = event.round + 1;
-  const detail = event.argumentsPreview ? ` ${event.argumentsPreview}` : "";
-  if (event.type === "tool-call") {
-    return `[nolo:tool] #${round} -> ${event.toolName}${detail}
-`;
-  }
-  if (event.type === "tool-error") {
-    const elapsed2 = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
-    return `[nolo:tool] #${round} !! ${event.toolName}${elapsed2}: ${event.message ?? "failed"}
-`;
-  }
-  const elapsed = typeof event.elapsedMs === "number" ? ` ${event.elapsedMs}ms` : "";
-  const summary = event.summary ? ` ${event.summary}` : "";
-  return `[nolo:tool] #${round} <- ${event.toolName}${elapsed}${summary}
-`;
-}
 function formatToolJsonEvent(event) {
   return `${JSON.stringify({
     schemaVersion: 1,
@@ -68023,6 +68718,9 @@ function shouldAttemptAutoLocal(options) {
   if (options.env.NOLO_DISABLE_CLI_WORKSPACE_TOOLS !== "1" && isBuiltinNoloAgentRef(options.agentKey) && resolveAuthToken5(options.env)) {
     return true;
   }
+  if (options.env.NOLO_DISABLE_CLI_WORKSPACE_TOOLS !== "1" && resolveAuthToken5(options.env) && !isKnownServerPlatformAgent(options)) {
+    return true;
+  }
   return Boolean(
     options.env.NOLO_LOCAL_OPENAI_API_KEY || options.env.OPENAI_API_KEY || options.env.NOLO_LOCAL_OPENAI_BASE_URL || options.env.OPENAI_BASE_URL || options.env.NOLO_LOCAL_AGENT_KEY
   );
@@ -68131,8 +68829,8 @@ async function runHttpAgentTurn(options, authToken) {
   const contentType = res.headers.get("content-type") || "";
   if (contentType.includes("text/event-stream") && res.body) {
     spinner.stop();
-    const result2 = await readStreamingAgentRun(options, res);
-    return result2;
+    const result = await readStreamingAgentRun(options, res);
+    return result;
   }
   spinner.stop();
   let data = {};
@@ -68175,7 +68873,10 @@ async function runHttpAgentTurn(options, authToken) {
     }
     return dialogIdText ? { exitCode: 1, dialogId: dialogIdText } : { exitCode: 1 };
   }
-  const content = String(data?.content ?? data?.message ?? "").trim();
+  const content = formatAssistantResponseForCli(
+    String(data?.content ?? data?.message ?? ""),
+    options
+  );
   if (content) {
     options.output.write(`
 ${options.agentName} > ${content}
@@ -68188,11 +68889,14 @@ ${options.agentName} > (no text response)
   const usage2 = formatUsage(data?.usage, data?.dialogId);
   if (usage2 && shouldShowUsage(options.env)) options.output.write(`${usage2}
 `);
-  const result = {
+  return {
     exitCode: 0,
-    ...typeof data?.dialogId === "string" && data.dialogId ? { dialogId: data.dialogId } : {}
+    ...typeof data?.dialogId === "string" && data.dialogId ? { dialogId: data.dialogId } : {},
+    turnTokens: buildTurnTokenUsage(
+      data?.usage,
+      typeof data?.model === "string" ? data.model : options.agentKey
+    )
   };
-  return result;
 }
 async function runInjectedLocalAgentTurn(options) {
   return runLocalAgentTurnForCli(options, { reportFailure: true });
@@ -68212,8 +68916,18 @@ async function runLocalAgentTurnForCli(options, settings) {
   const spinner = new Spinner(options.output, `${options.agentName} -> working locally`);
   spinner.start();
   try {
-    const traceLocalTools = shouldTraceLocalTools(options);
+    const toolDisplayMode = resolveToolDisplayMode(options.env);
+    const traceLocalTools = shouldEmitToolEvents(toolDisplayMode);
+    const formatToolEvent = createToolEventFormatter(toolDisplayMode);
     const eventMode = resolveAgentEventMode(options);
+    let wroteToolTrace = false;
+    let streamedAssistantText = false;
+    let printedAssistantLabel = false;
+    const thinkingMode = resolveThinkingDisplayMode(options.env);
+    const thinkingFilter = createThinkingAwareStreamFilter(
+      (chunk) => options.output.write(chunk),
+      thinkingMode
+    );
     const subjectRefs = buildSubjectRefs(options);
     const allowedChildAgentKeys = options.allowedChildAgentKeys?.filter((key2) => key2.trim());
     const allowedToolNames = options.allowedToolNames?.filter((name) => name.trim());
@@ -68242,27 +68956,48 @@ async function runLocalAgentTurnForCli(options, settings) {
       ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
       ...traceLocalTools ? {
         onToolEvent: (event) => {
-          if (traceLocalTools) {
-            spinner.stop();
-            options.output.write(
-              eventMode === "jsonl" ? formatToolJsonEvent(event) : formatToolTraceEvent(event)
-            );
+          spinner.stop();
+          const chunk = eventMode === "jsonl" ? formatToolJsonEvent(event) : formatToolEvent(event);
+          if (chunk) {
+            wroteToolTrace = true;
+            options.output.write(chunk);
+          }
+        }
+      } : {},
+      ...!options.noStream ? {
+        onTextDelta: (chunk) => {
+          spinner.stop();
+          if (!printedAssistantLabel) {
+            options.output.write(`
+${options.agentName} > `);
+            printedAssistantLabel = true;
           }
+          streamedAssistantText = true;
+          thinkingFilter.push(chunk);
         }
       } : {}
     });
     spinner.stop();
-    const content = result.content.trim();
-    if (content) {
-      options.output.write(`
+    if (streamedAssistantText) {
+      thinkingFilter.flush();
+      options.output.write("\n");
+    } else {
+      const content = formatAssistantResponseForCli(result.content.trim(), options);
+      if (content) {
+        options.output.write(`
 ${options.agentName} > ${content}
 `);
-    } else {
-      options.output.write(`
+      } else {
+        options.output.write(`
 ${options.agentName} > (no text response)
 `);
+      }
     }
-    return { exitCode: 0, dialogId: result.dialogId };
+    return {
+      exitCode: 0,
+      dialogId: result.dialogId,
+      turnTokens: buildTurnTokenUsage(result.usage, result.model)
+    };
   } catch (error) {
     spinner.stop();
     if (settings.reportFailure) {
@@ -68281,9 +69016,14 @@ async function readStreamingAgentRun(options, res) {
     return { exitCode: 1 };
   }
   const decoder = new TextDecoder();
+  const thinkingMode = resolveThinkingDisplayMode(options.env);
   const writer = createStreamingTextWriter({
     write: (chunk) => options.output.write(chunk)
   });
+  const thinkingFilter = createThinkingAwareStreamFilter(
+    (chunk) => writer.push(chunk),
+    thinkingMode
+  );
   let buffer = "";
   let content = "";
   let dialogId;
@@ -68313,7 +69053,7 @@ ${options.agentName} > `);
     if (!chunk) return;
     printLabel();
     content += chunk;
-    writer.push(chunk);
+    thinkingFilter.push(chunk);
   };
   try {
     while (true) {
@@ -68350,6 +69090,7 @@ ${options.agentName} > `);
     return { exitCode: 1 };
   } finally {
     writer.flushAll();
+    thinkingFilter.flush();
   }
   if (!content) {
     options.output.write(`
@@ -68363,7 +69104,8 @@ ${options.agentName} > (no text response)
 `);
   return {
     exitCode: 0,
-    ...dialogId ? { dialogId } : {}
+    ...dialogId ? { dialogId } : {},
+    turnTokens: buildTurnTokenUsage(usage2, options.agentKey)
   };
 }
 async function runAgentTurn(options) {
@@ -68376,10 +69118,17 @@ async function runAgentTurn(options) {
     const skipLocal = await shouldSkipAutoLocalForServerPlatformTools(options);
     if (!skipLocal) {
       const localResult = await runLocalAgentTurnForCli(options, { reportFailure: false });
+      if (localResult.exitCode !== 0 && localResult.localError) {
+        options.output.write(
+          `[nolo] auto runtime: local run unavailable (${localResult.localError instanceof Error ? localResult.localError.message : String(localResult.localError)}); falling back to server.
+`
+        );
+      }
       if (localResult.exitCode === 0) {
         return {
           exitCode: localResult.exitCode,
-          ...localResult.dialogId ? { dialogId: localResult.dialogId } : {}
+          ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
+          ...localResult.turnTokens ? { turnTokens: localResult.turnTokens } : {}
         };
       }
       if (isMissingLocalAgentConfigError(localResult.localError, options.agentKey)) {
@@ -68396,7 +69145,8 @@ async function runAgentTurn(options) {
             if (retriedLocalResult.exitCode === 0) {
               return {
                 exitCode: retriedLocalResult.exitCode,
-                ...retriedLocalResult.dialogId ? { dialogId: retriedLocalResult.dialogId } : {}
+                ...retriedLocalResult.dialogId ? { dialogId: retriedLocalResult.dialogId } : {},
+                ...retriedLocalResult.turnTokens ? { turnTokens: retriedLocalResult.turnTokens } : {}
               };
             }
           }
@@ -69598,7 +70348,7 @@ function countByName(values) {
 function uniq(values) {
   return [...new Set(values.filter(Boolean))];
 }
-function parseJsonObject3(raw) {
+function parseJsonObject2(raw) {
   if (typeof raw !== "string" || !raw.trim()) return null;
   try {
     const parsed = JSON.parse(raw);
@@ -69614,7 +70364,7 @@ function deriveWrittenFiles(toolMessages) {
     const toolName = toToolName(message?.toolName ?? message?.name);
     if (!writeToolNames.has(toolName)) continue;
     const payload = message?.toolPayload ?? {};
-    const content = parseJsonObject3(message?.content);
+    const content = parseJsonObject2(message?.content);
     for (const candidate of [payload?.input?.filePath, payload?.response?.filePath, content?.filePath]) {
       const normalized = typeof candidate === "string" ? candidate.trim() : "";
       if (normalized) files.push(normalized);
@@ -69627,7 +70377,7 @@ function deriveToolErrors(toolMessages) {
   for (const message of toolMessages) {
     const toolName = toToolName(message?.toolName ?? message?.name);
     const payload = message?.toolPayload ?? {};
-    const content = parseJsonObject3(message?.content);
+    const content = parseJsonObject2(message?.content);
     if (payload?.status === "failed" || content?.ok === false || content?.applied === false || content?.success === false) {
       errors.push(toolName || "unknown-tool");
     }
@@ -71467,7 +72217,6 @@ function getSpaceInternalCommandEntries() {
 // packages/cli/authCommands.ts
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
-import { rmSync as rmSync2 } from "node:fs";
 import { spawn as spawn5 } from "node:child_process";
 
 // packages/cli/client/profileConfig.ts
@@ -71502,16 +72251,31 @@ function loadProfileConfig(path7 = getDefaultProfileConfigPath()) {
   }
   return parsed;
 }
+function clearProfileAuthToken(path7 = getDefaultProfileConfigPath()) {
+  const config = loadProfileConfig(path7);
+  if (!config) return false;
+  const profile = config.profiles[config.currentProfile];
+  if (!profile?.authToken?.trim()) return false;
+  delete profile.authToken;
+  mkdirSync5(dirname6(path7), { recursive: true });
+  writeFileSync4(path7, `${JSON.stringify(config, null, 2)}
+`, "utf8");
+  return true;
+}
 function saveDefaultProfile(path7, profile) {
+  const existing = loadProfileConfig(path7);
+  const mergedDefault = {
+    ...existing?.profiles?.default ?? {},
+    serverUrl: normalizeProfileServerUrl(profile.serverUrl),
+    authToken: profile.authToken.trim()
+  };
   const config = {
     currentProfile: "default",
     profiles: {
-      default: profile
+      ...existing?.profiles ?? {},
+      default: mergedDefault
     }
   };
-  config.profiles.default.serverUrl = normalizeProfileServerUrl(
-    config.profiles.default.serverUrl
-  );
   mkdirSync5(dirname6(path7), { recursive: true });
   writeFileSync4(path7, `${JSON.stringify(config, null, 2)}
 `, "utf8");
@@ -71524,7 +72288,7 @@ function buildEnvFromProfile(config) {
   return {
     NOLO_PROFILE: config.currentProfile,
     NOLO_SERVER: profile.serverUrl,
-    AUTH_TOKEN: profile.authToken,
+    ...profile.authToken?.trim() ? { AUTH_TOKEN: profile.authToken.trim() } : {},
     ...profile.agentKey ? { NOLO_AGENT: profile.agentKey } : {},
     ...profile.agentName ? { NOLO_AGENT_NAME: profile.agentName } : {}
   };
@@ -71545,9 +72309,65 @@ function getCurrentProfile(config) {
   if (!config) return null;
   return config.profiles[config.currentProfile] ?? null;
 }
+function saveProfileAgentSelection(selection, path7 = getDefaultProfileConfigPath()) {
+  const config = loadProfileConfig(path7);
+  if (!config) return null;
+  const profile = config.profiles[config.currentProfile];
+  if (!profile) return null;
+  profile.agentKey = selection.agentKey.trim();
+  profile.agentName = selection.agentName.trim();
+  mkdirSync5(dirname6(path7), { recursive: true });
+  writeFileSync4(path7, `${JSON.stringify(config, null, 2)}
+`, "utf8");
+  return config;
+}
 
 // packages/cli/authCommands.ts
+init_cliEnvHelpers();
 init_defaultServer();
+var LOGIN_HELP_TEXT = `Log in to Nolo and save a local profile.
+
+Usage:
+  nolo login [--server <url>] [--no-browser] [--token <jwt>] [--manual]
+
+Options:
+  --server <url>   Nolo server URL (default: ${DEFAULT_NOLO_SERVER_URL})
+  --no-browser     Print the authorization URL instead of opening a browser
+  --token <jwt>    Save a token directly without browser authorization
+  --manual         Prompt to paste a token interactively
+
+By default, opens the Nolo website and polls until authorization completes.
+In SSH sessions, use --no-browser and open the printed URL on a machine with a browser
+where you are already logged into Nolo.
+`;
+var LOGOUT_HELP_TEXT = `Log out of Nolo by clearing the saved auth token.
+
+Usage:
+  nolo logout
+
+Keeps other profile settings such as server URL and default agent preferences.
+Does not unset AUTH_TOKEN or other auth-related environment variables.
+`;
+var WHOAMI_HELP_TEXT = `Show the current login state.
+
+Usage:
+  nolo whoami
+`;
+function wantsHelp(args2) {
+  return args2.includes("--help") || args2.includes("-h");
+}
+function formatDuration(ms) {
+  const totalSec = Math.max(0, Math.ceil(ms / 1e3));
+  const minutes = Math.floor(totalSec / 60);
+  const seconds = totalSec % 60;
+  if (minutes > 0) return `${minutes}m ${seconds}s`;
+  return `${seconds}s`;
+}
+function formatTokenPreview(token) {
+  const trimmed = token.trim();
+  if (!trimmed) return "";
+  return `${trimmed.slice(0, 8)}...`;
+}
 function getArg(args2, flag) {
   const index = args2.indexOf(flag);
   return index >= 0 ? args2[index + 1] : void 0;
@@ -71609,6 +72429,11 @@ async function runWebLogin(args2) {
   const intervalMs = Math.max(1, Number(start.interval) || 2) * 1e3;
   const timeoutMs = Math.max(1, Number(start.expiresIn) || 600) * 1e3;
   const deadline = args2.now() + timeoutMs;
+  const statusLogIntervalMs = 15e3;
+  let lastStatusLogAt = 0;
+  args2.output.log(
+    `[nolo] Waiting for browser authorization (${formatDuration(timeoutMs)} remaining)...`
+  );
   while (args2.now() <= deadline) {
     const pollResponse = await postJson(
       args2.fetchImpl,
@@ -71617,6 +72442,16 @@ async function runWebLogin(args2) {
     );
     const poll = await pollResponse.json().catch(() => ({}));
     if (pollResponse.status === 202) {
+      const currentTime = args2.now();
+      if (lastStatusLogAt > 0 && currentTime - lastStatusLogAt >= statusLogIntervalMs) {
+        const remainingMs = Math.max(0, deadline - currentTime);
+        args2.output.log(
+          `[nolo] Still waiting... (${formatDuration(remainingMs)} remaining)`
+        );
+        lastStatusLogAt = currentTime;
+      } else if (lastStatusLogAt === 0) {
+        lastStatusLogAt = currentTime;
+      }
       await args2.sleep(intervalMs);
       continue;
     }
@@ -71639,12 +72474,16 @@ async function runWebLogin(args2) {
   return 1;
 }
 async function runLoginCommand(args2, deps = {}) {
+  const outputTarget = deps.output ?? console;
+  const errorTarget = deps.error ?? console;
+  if (wantsHelp(args2)) {
+    outputTarget.log(LOGIN_HELP_TEXT);
+    return 0;
+  }
   const configPath = deps.configPath ?? getDefaultProfileConfigPath();
   const serverArg = getArg(args2, "--server");
   const tokenArg = getArg(args2, "--token");
   const noBrowser = args2.includes("--no-browser");
-  const outputTarget = deps.output ?? console;
-  const errorTarget = deps.error ?? console;
   const serverUrl = (serverArg || DEFAULT_NOLO_SERVER_URL).replace(/\/+$/, "");
   if (tokenArg) {
     return saveTokenLogin({
@@ -71684,33 +72523,68 @@ async function runLoginCommand(args2, deps = {}) {
   });
 }
 function runWhoamiCommand(deps = {}) {
-  const env = deps.env ?? process.env;
   const output2 = deps.output ?? console;
+  if (wantsHelp(deps.args ?? [])) {
+    output2.log(WHOAMI_HELP_TEXT);
+    return 0;
+  }
+  const env = deps.env ?? process.env;
   const config = loadProfileConfig(deps.configPath);
   const profile = getCurrentProfile(config);
-  if (!config || !profile) {
+  const profileToken = profile?.authToken?.trim() ?? "";
+  const envToken = resolveAuthTokenFromEnv(env);
+  if (!profileToken && !envToken) {
     output2.log("Not logged in. Run: nolo login");
     return 1;
   }
   const runtimeEnv2 = buildCliRuntimeEnv(env, config);
-  const effectiveServer = runtimeEnv2.NOLO_SERVER ?? profile.serverUrl;
   const explicitServer = env.NOLO_SERVER || env.NOLO_SERVER_URL || env.BASE_URL;
+  if (!profileToken && envToken) {
+    output2.log("profile: not logged in (no saved token)");
+    if (profile?.serverUrl) {
+      output2.log(`profile server: ${profile.serverUrl}`);
+    }
+    output2.log(`effective server: ${runtimeEnv2.NOLO_SERVER ?? resolveServerUrlFallback(profile)}`);
+    output2.log(`server source: ${explicitServer ? "env" : profile?.serverUrl ? "profile" : "default"}`);
+    output2.log(`env token: ${formatTokenPreview(envToken)} (source: environment)`);
+    return 0;
+  }
+  const effectiveServer = runtimeEnv2.NOLO_SERVER ?? profile.serverUrl;
   output2.log(`profile: ${config.currentProfile}`);
   output2.log(`profile server: ${profile.serverUrl}`);
   output2.log(`effective server: ${effectiveServer}`);
   output2.log(`server source: ${explicitServer ? "env" : "profile"}`);
-  output2.log(`token: ${profile.authToken.slice(0, 8)}...`);
+  output2.log(`token: ${formatTokenPreview(profileToken)} (source: profile)`);
+  if (envToken && envToken !== profileToken) {
+    output2.log(`env token: ${formatTokenPreview(envToken)} (source: environment, unused while profile token is set)`);
+  }
   return 0;
 }
-function runLogoutCommand() {
-  const configPath = getDefaultProfileConfigPath();
-  rmSync2(configPath, { force: true });
-  console.log("Logged out.");
+function resolveServerUrlFallback(profile) {
+  return profile?.serverUrl ?? DEFAULT_NOLO_SERVER_URL;
+}
+function runLogoutCommand(deps = {}) {
+  const output2 = deps.output ?? console;
+  if (wantsHelp(deps.args ?? [])) {
+    output2.log(LOGOUT_HELP_TEXT);
+    return 0;
+  }
+  const env = deps.env ?? process.env;
+  const configPath = deps.configPath ?? getDefaultProfileConfigPath();
+  if (!clearProfileAuthToken(configPath)) {
+    output2.log("Not logged in.");
+    return 0;
+  }
+  output2.log("Logged out.");
+  if (resolveAuthTokenFromEnv(env)) {
+    output2.log(
+      "Note: AUTH_TOKEN in the environment is unchanged and may still authenticate commands."
+    );
+  }
   return 0;
 }
 
 // packages/cli/systemInternalCommandEntries.ts
-init_defaultServer();
 init_machineCommands();
 
 // packages/cli/runtimeDoctorCommands.ts
@@ -71871,15 +72745,352 @@ async function runDoctorRuntimeCommand(args2, deps = {}) {
   return decision.runnable ? 0 : 1;
 }
 
-// packages/cli/updateCommands.ts
+// packages/cli/standaloneBundle.ts
 init_processSpawn();
-import { readFileSync as readFileSync8 } from "node:fs";
+import { createHash as createHash3 } from "node:crypto";
+import {
+  cpSync,
+  existsSync as existsSync9,
+  mkdirSync as mkdirSync6,
+  readFileSync as readFileSync8,
+  readdirSync as readdirSync3,
+  renameSync,
+  rmSync as rmSync2,
+  statSync as statSync2,
+  writeFileSync as writeFileSync5
+} from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
 import { dirname as dirname7, join as join10 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-var CLI_DIR2 = dirname7(fileURLToPath4(import.meta.url));
-var PACKAGE_JSON_PATH = join10(CLI_DIR2, "package.json");
+var CLI_DOWNLOADS_SUBPATH = "cli";
+function getCliInstallChannel(serverUrl) {
+  const normalized = typeof serverUrl === "string" ? serverUrl.trim().replace(/\/+$/, "") : "";
+  if (!normalized) {
+    return "latest";
+  }
+  try {
+    const hostname2 = new URL(normalized).hostname.toLowerCase();
+    if (hostname2 === "us.nolo.chat" || hostname2.endsWith(".us.nolo.chat")) {
+      return "alpha";
+    }
+  } catch {
+    if (/us\.nolo\.chat/i.test(normalized)) {
+      return "alpha";
+    }
+  }
+  return "latest";
+}
+function resolveBundleUpdateChannel(args2) {
+  const fromServer = getCliInstallChannel(args2.serverUrl);
+  const fromInstall = args2.install.manifest.channel;
+  if (fromInstall && fromInstall !== fromServer) {
+    args2.output?.write(
+      `[nolo] Warning: server channel (${fromServer}) differs from installed bundle channel (${fromInstall}); using installed channel.
+`
+    );
+    return fromInstall;
+  }
+  return fromServer;
+}
+function resolveCliBundlePlatform() {
+  const { platform: platform2, arch: arch2 } = process;
+  if (platform2 === "linux" && (arch2 === "x64" || arch2 === "amd64")) {
+    return "linux-x64";
+  }
+  if (platform2 === "darwin" && arch2 === "arm64") {
+    return "darwin-arm64";
+  }
+  if (platform2 === "darwin" && (arch2 === "x64" || arch2 === "amd64")) {
+    return "darwin-x64";
+  }
+  if (platform2 === "win32" && (arch2 === "x64" || arch2 === "amd64")) {
+    return "win-x64";
+  }
+  return null;
+}
+function detectStandaloneBundleInstall(entrypointPath) {
+  const cliDir = entrypointPath ? entrypointPath.startsWith("file:") ? dirname7(fileURLToPath4(entrypointPath)) : dirname7(entrypointPath) : dirname7(fileURLToPath4(import.meta.url));
+  const bundleRoot = join10(cliDir, "..", "..");
+  const manifestPath = join10(bundleRoot, "manifest.json");
+  if (!existsSync9(manifestPath)) {
+    return null;
+  }
+  try {
+    const manifest = JSON.parse(
+      readFileSync8(manifestPath, "utf8")
+    );
+    if (manifest?.name !== "nolo-cli" || manifest?.schemaVersion !== 1) {
+      return null;
+    }
+    const entrypoint = join10(cliDir, "index.js");
+    if (!existsSync9(entrypoint)) {
+      return null;
+    }
+    return { bundleRoot, cliDir, manifest };
+  } catch {
+    return null;
+  }
+}
+function buildBundleManifestUrl(args2) {
+  const origin = args2.serverUrl.trim().replace(/\/+$/, "");
+  return `${origin}/public/downloads/${CLI_DOWNLOADS_SUBPATH}/nolo-cli-${args2.channel}-${args2.platform}-manifest.json`;
+}
+function buildNpmSelfUpdateCommand(channel = "latest") {
+  return ["npm", "install", "-g", `nolo-cli@${channel}`, "--force"];
+}
+function validatePublishedBundleManifest(args2) {
+  if (args2.published.schemaVersion !== 1) {
+    throw new Error(
+      `Unsupported standalone bundle manifest schema: ${args2.published.schemaVersion}`
+    );
+  }
+  if (args2.published.channel !== args2.expectedChannel) {
+    throw new Error(
+      `Standalone bundle manifest channel mismatch (expected ${args2.expectedChannel}, got ${args2.published.channel})`
+    );
+  }
+  if (args2.published.platform !== args2.expectedPlatform) {
+    throw new Error(
+      `Standalone bundle manifest platform mismatch (expected ${args2.expectedPlatform}, got ${args2.published.platform})`
+    );
+  }
+  if (!args2.published.fileName || !args2.published.url || !args2.published.sha256) {
+    throw new Error("Standalone bundle manifest is missing required fields");
+  }
+}
+async function runCommand(command2, spawn6 = resolveDefaultSpawn(), env = process.env) {
+  const proc = spawn6({
+    cmd: command2,
+    stdin: "ignore",
+    stdout: "inherit",
+    stderr: "inherit",
+    env
+  });
+  return proc.exited;
+}
+function hashFile(path7) {
+  const hash = createHash3("sha256");
+  hash.update(readFileSync8(path7));
+  return hash.digest("hex");
+}
+function fileSize(path7) {
+  return statSync2(path7).size;
+}
+async function downloadFile(url, destinationPath) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Download failed (${response.status}): ${url}`);
+  }
+  const bytes = await response.arrayBuffer();
+  mkdirSync6(dirname7(destinationPath), { recursive: true });
+  writeFileSync5(destinationPath, Buffer.from(bytes));
+}
+function assertCliDir(cliDir) {
+  const entrypoint = join10(cliDir, "index.js");
+  if (!existsSync9(entrypoint)) {
+    throw new Error(`Standalone CLI layout is invalid: missing ${entrypoint}`);
+  }
+}
+async function extractArchive(args2) {
+  mkdirSync6(args2.destDir, { recursive: true });
+  const spawn6 = args2.spawn ?? resolveDefaultSpawn();
+  const env = args2.env ?? process.env;
+  if (args2.archivePath.endsWith(".zip")) {
+    if (process.platform === "win32") {
+      const command2 = [
+        "powershell",
+        "-NoProfile",
+        "-Command",
+        `Expand-Archive -Path '${args2.archivePath.replace(/'/g, "''")}' -DestinationPath '${args2.destDir.replace(/'/g, "''")}' -Force`
+      ];
+      return runCommand(command2, spawn6, env);
+    }
+    return runCommand(["unzip", "-qo", args2.archivePath, "-d", args2.destDir], spawn6, env);
+  }
+  return runCommand(["tar", "--zstd", "-xf", args2.archivePath, "-C", args2.destDir], spawn6, env);
+}
+function findExtractedBundleRoot(extractDir) {
+  const matches = readdirSync3(extractDir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.startsWith("nolo-cli-")).map((entry) => join10(extractDir, entry.name));
+  if (matches.length === 1) {
+    return matches[0];
+  }
+  throw new Error(
+    `Could not locate extracted standalone CLI bundle under ${extractDir}`
+  );
+}
+function atomicReplaceDirectory(args2) {
+  assertCliDir(args2.sourceDir);
+  const parent = dirname7(args2.targetDir);
+  mkdirSync6(parent, { recursive: true });
+  const stagingDir = `${args2.targetDir}.staging-${process.pid}`;
+  const backupDir = `${args2.targetDir}.backup-${process.pid}`;
+  rmSync2(stagingDir, { recursive: true, force: true });
+  cpSync(args2.sourceDir, stagingDir, { recursive: true });
+  assertCliDir(stagingDir);
+  if (existsSync9(args2.targetDir)) {
+    rmSync2(backupDir, { recursive: true, force: true });
+    renameSync(args2.targetDir, backupDir);
+  }
+  try {
+    renameSync(stagingDir, args2.targetDir);
+  } catch (error) {
+    if (existsSync9(backupDir) && !existsSync9(args2.targetDir)) {
+      renameSync(backupDir, args2.targetDir);
+    }
+    throw error;
+  }
+  rmSync2(backupDir, { recursive: true, force: true });
+  rmSync2(stagingDir, { recursive: true, force: true });
+}
+function replaceFileWithFallback(args2) {
+  if (!existsSync9(args2.sourcePath)) {
+    return;
+  }
+  mkdirSync6(dirname7(args2.targetPath), { recursive: true });
+  const pendingPath = `${args2.targetPath}.pending-${process.pid}`;
+  cpSync(args2.sourcePath, pendingPath);
+  try {
+    rmSync2(args2.targetPath, { force: true });
+    renameSync(pendingPath, args2.targetPath);
+  } catch (error) {
+    rmSync2(pendingPath, { force: true });
+    args2.output?.write(
+      `[nolo] Warning: could not replace ${args2.targetPath} (${error instanceof Error ? error.message : String(error)}). Restart all nolo processes and run nolo update again.
+`
+    );
+  }
+}
+function replaceStandaloneBundleContents(args2) {
+  const nextCliDir = join10(args2.nextRoot, "lib", "nolo-cli");
+  const currentCliDir = join10(args2.currentRoot, "lib", "nolo-cli");
+  if (!existsSync9(nextCliDir)) {
+    throw new Error(`Downloaded bundle is missing ${nextCliDir}`);
+  }
+  atomicReplaceDirectory({
+    targetDir: currentCliDir,
+    sourceDir: nextCliDir
+  });
+  for (const relativePath of ["VERSION", "manifest.json"]) {
+    const source = join10(args2.nextRoot, relativePath);
+    if (existsSync9(source)) {
+      replaceFileWithFallback({
+        sourcePath: source,
+        targetPath: join10(args2.currentRoot, relativePath),
+        output: args2.output
+      });
+    }
+  }
+  const bunName = process.platform === "win32" ? "bun.exe" : "bun";
+  replaceFileWithFallback({
+    sourcePath: join10(args2.nextRoot, "bin", bunName),
+    targetPath: join10(args2.currentRoot, "bin", bunName),
+    output: args2.output
+  });
+  const launcherName = process.platform === "win32" ? "nolo.cmd" : "nolo";
+  replaceFileWithFallback({
+    sourcePath: join10(args2.nextRoot, "bin", launcherName),
+    targetPath: join10(args2.currentRoot, "bin", launcherName),
+    output: args2.output
+  });
+}
+async function runStandaloneBundleUpdate(args2) {
+  const output2 = args2.output ?? process.stdout;
+  const env = args2.env ?? process.env;
+  const platform2 = resolveCliBundlePlatform() ?? args2.install.manifest.platform ?? null;
+  if (!platform2) {
+    throw new Error(
+      `Standalone CLI self-update is not supported on ${process.platform}/${process.arch}`
+    );
+  }
+  const channel = resolveBundleUpdateChannel({
+    install: args2.install,
+    serverUrl: args2.serverUrl,
+    output: output2
+  });
+  const manifestUrl = buildBundleManifestUrl({
+    serverUrl: args2.serverUrl,
+    channel,
+    platform: platform2
+  });
+  output2.write(`Checking standalone bundle update: ${manifestUrl}
+`);
+  const response = await fetch(manifestUrl, { cache: "no-store" });
+  if (!response.ok) {
+    throw new Error(
+      `Standalone bundle manifest not found (${response.status}). Publish the CLI bundle for ${channel}/${platform2} first.`
+    );
+  }
+  const published = await response.json();
+  validatePublishedBundleManifest({
+    published,
+    expectedChannel: channel,
+    expectedPlatform: platform2
+  });
+  const currentVersion = args2.install.manifest.version;
+  if (published.version === currentVersion) {
+    output2.write(`Already on latest standalone bundle (${currentVersion}).
+`);
+    return 0;
+  }
+  const workDir = join10(tmpdir2(), `nolo-cli-update-${process.pid}`);
+  rmSync2(workDir, { recursive: true, force: true });
+  mkdirSync6(workDir, { recursive: true });
+  try {
+    const archivePath = join10(workDir, published.fileName);
+    output2.write(
+      `Updating standalone bundle ${currentVersion} -> ${published.version}
+`
+    );
+    output2.write(`Downloading ${published.url}
+`);
+    await downloadFile(published.url, archivePath);
+    const actualSize = fileSize(archivePath);
+    if (actualSize !== published.size) {
+      throw new Error(
+        `Downloaded bundle size mismatch (expected ${published.size} bytes, got ${actualSize} bytes)`
+      );
+    }
+    const actualSha256 = hashFile(archivePath);
+    if (actualSha256 !== published.sha256) {
+      throw new Error(
+        `Downloaded bundle checksum mismatch (expected ${published.sha256}, got ${actualSha256})`
+      );
+    }
+    const extractDir = join10(workDir, "extracted");
+    const exitCode2 = await extractArchive({
+      archivePath,
+      destDir: extractDir,
+      spawn: args2.spawn,
+      env
+    });
+    if (exitCode2 !== 0) {
+      throw new Error("Failed to extract standalone bundle archive");
+    }
+    const nextRoot = findExtractedBundleRoot(extractDir);
+    replaceStandaloneBundleContents({
+      currentRoot: args2.install.bundleRoot,
+      nextRoot,
+      output: output2
+    });
+    output2.write(`Standalone bundle updated to ${published.version}.
+`);
+    output2.write("Restart open nolo sessions to use the new version.\n");
+    return 0;
+  } finally {
+    rmSync2(workDir, { recursive: true, force: true });
+  }
+}
+
+// packages/cli/updateCommands.ts
+init_defaultServer();
+import { readFileSync as readFileSync9 } from "node:fs";
+import { dirname as dirname8, join as join11 } from "node:path";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
+init_processSpawn();
+var CLI_DIR2 = dirname8(fileURLToPath5(import.meta.url));
+var PACKAGE_JSON_PATH = join11(CLI_DIR2, "package.json");
 function readPackageInfo() {
-  const raw = readFileSync8(PACKAGE_JSON_PATH, "utf8");
+  const raw = readFileSync9(PACKAGE_JSON_PATH, "utf8");
   const parsed = JSON.parse(raw);
   return {
     name: parsed.name || "nolo-cli",
@@ -71889,28 +73100,42 @@ function readPackageInfo() {
 function buildCliVersionText(info) {
   return `${info.name} ${info.version}`;
 }
-function buildSelfUpdateCommand() {
-  return ["npm", "install", "-g", "nolo-cli@latest", "--force"];
+function resolveSelfUpdateServerUrl(env = process.env, override) {
+  if (override?.trim()) {
+    return override.trim().replace(/\/+$/, "");
+  }
+  const fromEnv = env.NOLO_SERVER || env.BASE_URL;
+  if (typeof fromEnv === "string" && fromEnv.trim()) {
+    return fromEnv.trim().replace(/\/+$/, "");
+  }
+  const profile = loadProfileConfig();
+  const profileUrl = profile?.profiles?.[profile.currentProfile]?.serverUrl;
+  if (profileUrl?.trim()) {
+    return profileUrl.trim().replace(/\/+$/, "");
+  }
+  return DEFAULT_NOLO_SERVER_URL;
 }
 function buildCliDoctorText(info) {
-  const updateCommand = buildSelfUpdateCommand().join(" ");
+  const updateCommand = info.installKind === "standalone-bundle" ? "nolo update" : buildNpmSelfUpdateCommand(info.updateChannel).join(" ");
   return [
     "Nolo CLI doctor",
     "---------------",
     `version  ${info.packageName} ${info.version}`,
+    `install  ${info.installKind}`,
+    `channel  ${info.updateChannel}`,
     `entry    ${info.entrypoint}`,
     `server   ${info.serverUrl}`,
     `profile  ${info.profileName}`,
     `update   nolo update`,
     "",
     "If direct `nolo` differs from repo-local `bun ./packages/cli/index.ts`,",
-    "the global npm install is older than this checkout.",
+    "the global install is older than this checkout.",
     "",
     `Manual update: ${updateCommand}`
   ].join("\n");
 }
 function isRunSelfUpdateOptions(value) {
-  return typeof value === "object" && value !== null && ("output" in value || "spawn" in value);
+  return typeof value === "object" && value !== null && ("output" in value || "spawn" in value || "entrypointPath" in value || "serverUrl" in value || "env" in value);
 }
 async function forwardSpawnOutput(stream, output2) {
   if (!stream) {
@@ -71933,7 +73158,20 @@ async function runSelfUpdate(outputOrOptions) {
   const options = outputOrOptions === void 0 ? {} : isRunSelfUpdateOptions(outputOrOptions) ? outputOrOptions : { output: outputOrOptions };
   const output2 = options.output ?? process.stdout;
   const spawn6 = options.spawn ?? resolveDefaultSpawn();
-  const command2 = buildSelfUpdateCommand();
+  const env = options.env ?? process.env;
+  const serverUrl = resolveSelfUpdateServerUrl(env, options.serverUrl);
+  const entrypointPath = options.entrypointPath ?? join11(CLI_DIR2, "index.js");
+  const bundleInstall = detectStandaloneBundleInstall(entrypointPath);
+  if (bundleInstall) {
+    return runStandaloneBundleUpdate({
+      install: bundleInstall,
+      serverUrl,
+      output: output2,
+      spawn: spawn6,
+      env
+    });
+  }
+  const command2 = buildNpmSelfUpdateCommand(getCliInstallChannel(serverUrl));
   output2.write(`Updating nolo with: ${command2.join(" ")}
 `);
   const useCustomSink = options.output !== void 0;
@@ -71942,7 +73180,7 @@ async function runSelfUpdate(outputOrOptions) {
     stdin: "inherit",
     stdout: useCustomSink ? "pipe" : "inherit",
     stderr: useCustomSink ? "pipe" : "inherit",
-    env: process.env
+    env
   });
   if (!useCustomSink) {
     return await proc.exited;
@@ -71960,24 +73198,43 @@ function getSystemInternalCommandEntries(renderHelpText2) {
   return [
     createEnvCommand(["doctor", "runtime"], "Diagnose local-first agent runtime selection", runDoctorRuntimeCommand),
     createArgsCommand(["login"], "Log in to Nolo", (args2) => Promise.resolve(runLoginCommand(args2))),
-    createArgsCommand(["logout"], "Log out of Nolo", async () => runLogoutCommand()),
-    createArgsCommand(["whoami"], "Show the current login state", async () => runWhoamiCommand()),
+    createContextCommand(
+      ["logout"],
+      "Log out of Nolo",
+      async (args2, ctx) => runLogoutCommand({ args: args2, env: ctx.env })
+    ),
+    createContextCommand(
+      ["whoami"],
+      "Show the current login state",
+      async (args2, ctx) => runWhoamiCommand({ args: args2, env: ctx.env })
+    ),
     createEntrypointEnvCommand(["connect"], "Send machine heartbeats or hold a connector websocket", runMachineConnectCommand),
     createDaemonShortcutCommand(["daemon"], "Run the connector daemon shortcut", runMachineConnectCommand),
     createEnvCommand(["machine", "status"], "List machines registered to the current profile", runMachineStatusCommand),
     createContextCommand(["doctor"], "Show CLI doctor information", async (_args, ctx) => {
+      const serverUrl = resolveSelfUpdateServerUrl(ctx.env);
       console.log(
         buildCliDoctorText({
           packageName: ctx.packageInfo.name,
           version: ctx.packageInfo.version,
           entrypoint: ctx.entrypointPath,
-          serverUrl: ctx.env.NOLO_SERVER || ctx.env.BASE_URL || DEFAULT_NOLO_SERVER_URL,
-          profileName: ctx.env.NOLO_PROFILE || "local"
+          serverUrl,
+          profileName: ctx.env.NOLO_PROFILE || "local",
+          installKind: detectStandaloneBundleInstall(ctx.entrypointPath) ? "standalone-bundle" : "npm-global",
+          updateChannel: getCliInstallChannel(serverUrl)
         })
       );
       return 0;
     }),
-    createArgsCommand(["update"], "Update the CLI", async () => runSelfUpdate()),
+    createContextCommand(
+      ["update"],
+      "Update the CLI",
+      async (_args, ctx) => runSelfUpdate({
+        entrypointPath: ctx.entrypointPath,
+        serverUrl: resolveSelfUpdateServerUrl(ctx.env),
+        env: ctx.env
+      })
+    ),
     createContextCommand(["version"], "Show CLI version", async (_args, ctx) => {
       console.log(buildCliVersionText(ctx.packageInfo));
       return 0;
@@ -72559,7 +73816,6 @@ function renderHelpText() {
     "  nolo space list --json",
     "  nolo agent pull agent-pub-01APPBUILDER00000001YAII3I",
     "  nolo agent read agent-pub-01APPBUILDER00000001YAII3I",
-    "  nolo agent usage qoder",
     '  nolo agent run frontend-implementer --msg "polish notifications"',
     "  nolo agent bind-current agent-user-1-agent-1",
     "  nolo agent runtime-doctor agent-user-1-agent-1",
@@ -72654,7 +73910,7 @@ function resolveTuiLaunchMode(args2) {
 // packages/cli/tui/readlineWorkspace.ts
 import { createInterface as createInterface2 } from "node:readline";
 import { stdin as defaultInput, stdout as defaultOutput } from "node:process";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 
 // packages/cli/client/compactDialog.ts
 import { ulid as ulid11 } from "ulid";
@@ -72802,23 +74058,410 @@ async function compactDialog(options) {
 // packages/cli/tui/readlineWorkspace.ts
 init_processSpawn();
 
-// packages/cli/tui/session.ts
-init_defaultServer();
+// packages/cli/tui/agentPicker.ts
+init_agentAliases();
+
+// packages/cli/tui/agentCatalog.ts
+init_cliEnvHelpers();
 var DEFAULT_TUI_AGENT_KEY = "agent-pub-01NOLOAPPBLD000000019KCKT0";
-var DEFAULT_TUI_SERVER_URL = DEFAULT_NOLO_SERVER_URL;
-var KNOWN_AGENTS = [
+var PLATFORM_AGENTS = [
   {
     name: "nolo",
-    key: "agent-pub-01NOLOAPPBLD000000019KCKT0",
+    key: DEFAULT_TUI_AGENT_KEY,
+    model: "-",
+    kind: "platform",
     description: "one assistant that routes work across your agents and data"
   },
   {
     name: "app-builder",
     key: "agent-pub-01APPBUILDER00000001YAII3I",
+    model: "-",
+    kind: "platform",
     description: "builds web apps, tools, charts, and product prototypes"
   }
 ];
-var KNOWN_AGENT_ALIASES = Object.fromEntries(KNOWN_AGENTS.map((agent) => [agent.name, agent]));
+function toUpdatedAt(value) {
+  if (value == null) return 0;
+  const parsed = new Date(value).getTime();
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+function listedAgentToCatalogEntry(agent) {
+  return {
+    name: agent.name,
+    key: agent.privateKey,
+    model: agent.model,
+    kind: "private",
+    updatedAt: toUpdatedAt(agent.updatedAt)
+  };
+}
+function mergeCatalogEntries(currentKey, platformAgents, privateAgents) {
+  const seen = /* @__PURE__ */ new Set();
+  const merged = [];
+  const push = (entry) => {
+    if (seen.has(entry.key)) return;
+    seen.add(entry.key);
+    merged.push(entry);
+  };
+  const current = [...platformAgents, ...privateAgents].find((entry) => entry.key === currentKey) ?? null;
+  if (current) push(current);
+  for (const entry of platformAgents) {
+    if (entry.key !== currentKey) push(entry);
+  }
+  const sortedPrivate = [...privateAgents].sort((a, b) => {
+    const tb = b.updatedAt ?? 0;
+    const ta = a.updatedAt ?? 0;
+    if (tb !== ta) return tb - ta;
+    return a.name.localeCompare(b.name);
+  });
+  for (const entry of sortedPrivate) {
+    if (entry.key !== currentKey) push(entry);
+  }
+  return merged;
+}
+async function loadAgentCatalog(args2) {
+  const env = args2.env ?? process.env;
+  const fetchImpl = args2.fetchImpl ?? fetch;
+  const fallbackFetchImpl = args2.fallbackFetchImpl;
+  const authToken = resolveAuthToken([], env);
+  const userId = authToken ? parseUserIdFromAuthToken(authToken) : null;
+  if (!authToken || !userId) {
+    return mergeCatalogEntries(args2.currentKey, PLATFORM_AGENTS, []);
+  }
+  const serverUrl = resolveServerUrl(env);
+  const serverUrls = resolveServerCandidates([], env, serverUrl);
+  let privateAgents = [];
+  try {
+    const remoteResult = await listRemoteAgentsAcrossServers({
+      authToken,
+      fallbackFetchImpl,
+      fetchImpl,
+      includeLegacy: false,
+      serverUrls,
+      userId
+    });
+    privateAgents = remoteResult.agents.map(listedAgentToCatalogEntry);
+  } catch {
+    try {
+      const db = await getReadableCliDb();
+      const cached = await listLocalCachedAgents({ db, userId });
+      privateAgents = cached.map(listedAgentToCatalogEntry);
+    } catch {
+      privateAgents = (await listRemoteAgents({
+        authToken,
+        fallbackFetchImpl,
+        fetchImpl,
+        includeLegacy: false,
+        serverUrl,
+        userId,
+        queryUserRecords,
+        readDbRecord
+      })).map(listedAgentToCatalogEntry);
+    }
+  }
+  return mergeCatalogEntries(args2.currentKey, PLATFORM_AGENTS, privateAgents);
+}
+function renderAgentCatalogList(entries, currentKey) {
+  const lines = ["Agents:"];
+  entries.forEach((entry, index) => {
+    const current = entry.key === currentKey ? " (current)" : "";
+    const kind = entry.kind === "platform" ? "platform" : "private";
+    const detail = entry.description ? ` \u2014 ${entry.description}` : "";
+    lines.push(
+      `  ${String(index + 1).padStart(2)}  ${entry.name.padEnd(18)} ${entry.model.padEnd(14)} ${kind}${detail}${current}`
+    );
+  });
+  lines.push("");
+  lines.push("Tip: run /agent in an interactive terminal to pick with \u2191\u2193.");
+  return lines.join("\n");
+}
+function findAgentCatalogEntry(entries, rawTarget) {
+  const target = rawTarget.trim();
+  if (!target) return null;
+  if (/^\d+$/.test(target)) {
+    const entry = entries[Number(target) - 1];
+    return entry ? { name: entry.name, key: entry.key } : null;
+  }
+  const lower = target.toLowerCase();
+  const byName = entries.find(
+    (entry) => entry.name.toLowerCase() === lower || entry.key.toLowerCase() === lower || entry.key.toLowerCase().endsWith(`-${lower}`)
+  );
+  if (byName) return { name: byName.name, key: byName.key };
+  if (target.startsWith("agent-") || target.startsWith("agent-pub-") || target.startsWith("cybot-")) {
+    return { name: target, key: target };
+  }
+  return null;
+}
+
+// packages/cli/tui/selectDialog.ts
+var CSI_ARROW_UP = "\x1B[A";
+var CSI_ARROW_DOWN = "\x1B[B";
+var CSI_ARROW_UP_APP = "\x1BOA";
+var CSI_ARROW_DOWN_APP = "\x1BOB";
+var DEFAULT_MAX_VISIBLE = 8;
+function computeVisibleWindow(args2) {
+  const maxVisible = Math.max(1, args2.maxVisible ?? DEFAULT_MAX_VISIBLE);
+  if (args2.total <= maxVisible) {
+    return { start: 0, end: args2.total, maxVisible };
+  }
+  let start = Math.max(0, args2.selectedIndex - Math.floor(maxVisible / 2));
+  if (start + maxVisible > args2.total) {
+    start = args2.total - maxVisible;
+  }
+  return { start, end: start + maxVisible, maxVisible };
+}
+function renderSelectDialog(args2) {
+  const total = args2.items.length;
+  const window2 = computeVisibleWindow({
+    selectedIndex: args2.selectedIndex,
+    total,
+    maxVisible: args2.maxVisible
+  });
+  const lines = [
+    args2.title ?? `Select agent (\u2191\u2193 Enter Esc)  ${args2.selectedIndex + 1}/${total}`
+  ];
+  if (window2.start > 0) {
+    lines.push(`  ... ${window2.start} more above`);
+  }
+  for (let index = window2.start; index < window2.end; index += 1) {
+    const item = args2.items[index];
+    const marker = index === args2.selectedIndex ? ">" : " ";
+    const detail = item.detail ? `  ${item.detail}` : "";
+    lines.push(`${marker} ${item.label}${detail}`);
+  }
+  if (window2.end < total) {
+    lines.push(`  ... ${total - window2.end} more below`);
+  }
+  return lines.join("\n");
+}
+function countRenderedLines(text) {
+  return text.split("\n").length;
+}
+function clearRenderedLines(output2, lineCount) {
+  if (!output2.isTTY || lineCount <= 0) return;
+  for (let index = 0; index < lineCount; index += 1) {
+    output2.write("\x1B[1A\x1B[2K");
+  }
+}
+function isArrowUp(sequence) {
+  return sequence === CSI_ARROW_UP || sequence === CSI_ARROW_UP_APP;
+}
+function isArrowDown(sequence) {
+  return sequence === CSI_ARROW_DOWN || sequence === CSI_ARROW_DOWN_APP;
+}
+function isSubmit(sequence) {
+  return sequence === "\r" || sequence === "\n";
+}
+function isCancel(sequence) {
+  return sequence === "" || sequence === "\x1B";
+}
+function createRawKeyReader(input2) {
+  let buffer = "";
+  const tryParseSequence = () => {
+    if (!buffer) return null;
+    if (isSubmit(buffer) || isCancel(buffer)) {
+      const sequence2 = buffer;
+      buffer = "";
+      return sequence2;
+    }
+    if (buffer.startsWith("\x1B")) {
+      for (const candidate of [
+        CSI_ARROW_UP,
+        CSI_ARROW_DOWN,
+        CSI_ARROW_UP_APP,
+        CSI_ARROW_DOWN_APP
+      ]) {
+        if (buffer.startsWith(candidate)) {
+          buffer = buffer.slice(candidate.length);
+          return candidate;
+        }
+      }
+      if (buffer.length >= 8) {
+        buffer = "";
+        return null;
+      }
+      return void 0;
+    }
+    const sequence = buffer;
+    buffer = "";
+    return sequence;
+  };
+  return () => new Promise((resolve6) => {
+    const finalize = (sequence) => {
+      cleanup();
+      resolve6(sequence ?? null);
+    };
+    const onReadable = () => {
+      while (true) {
+        const chunk = input2.read();
+        if (chunk == null) break;
+        buffer += typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+        const parsed = tryParseSequence();
+        if (parsed === void 0) return;
+        finalize(parsed);
+        return;
+      }
+    };
+    const cleanup = () => {
+      input2.off("readable", onReadable);
+    };
+    onReadable();
+    if (buffer) {
+      const parsed = tryParseSequence();
+      if (parsed !== void 0) {
+        finalize(parsed);
+        return;
+      }
+    }
+    input2.on("readable", onReadable);
+  });
+}
+function drainInputBuffer(input2) {
+  if (typeof input2.read !== "function") return;
+  while (input2.read() !== null) {
+  }
+}
+async function runSelectDialog(args2) {
+  const items = args2.items;
+  if (items.length === 0) {
+    return { kind: "cancelled" };
+  }
+  let selectedIndex = Math.min(
+    Math.max(args2.initialIndex ?? 0, 0),
+    items.length - 1
+  );
+  const output2 = args2.output ?? process.stdout;
+  const input2 = args2.input ?? process.stdin;
+  const readKey = args2.readKey ?? createRawKeyReader(input2);
+  const wasRaw = Boolean(input2.isTTY && input2.isRaw);
+  const wasPaused = typeof input2.isPaused === "function" ? input2.isPaused() : false;
+  let renderedLineCount = 0;
+  const paint = () => {
+    const frame = renderSelectDialog({
+      items,
+      selectedIndex,
+      title: args2.title,
+      maxVisible: args2.maxVisible
+    });
+    if (output2.isTTY && typeof output2.write === "function") {
+      clearRenderedLines(output2, renderedLineCount);
+      output2.write(`${frame}
+`);
+      renderedLineCount = countRenderedLines(frame);
+      return;
+    }
+    if (typeof output2.write === "function") {
+      output2.write(`${frame}
+`);
+    }
+    renderedLineCount = countRenderedLines(frame);
+  };
+  if (input2.isTTY) {
+    if (!wasRaw) input2.setRawMode(true);
+    if (!wasPaused) input2.pause();
+  }
+  paint();
+  try {
+    while (true) {
+      const sequence = await readKey();
+      if (sequence == null) {
+        return { kind: "cancelled" };
+      }
+      if (isCancel(sequence)) {
+        return { kind: "cancelled" };
+      }
+      if (isSubmit(sequence)) {
+        return { kind: "selected", index: selectedIndex, item: items[selectedIndex] };
+      }
+      if (isArrowUp(sequence)) {
+        selectedIndex = selectedIndex <= 0 ? items.length - 1 : selectedIndex - 1;
+        paint();
+        continue;
+      }
+      if (isArrowDown(sequence)) {
+        selectedIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
+        paint();
+        continue;
+      }
+    }
+  } finally {
+    if (input2.isTTY) {
+      drainInputBuffer(input2);
+      if (!wasRaw) input2.setRawMode(false);
+      if (!wasPaused) input2.resume();
+      clearRenderedLines(output2, renderedLineCount);
+      renderedLineCount = 0;
+    }
+  }
+}
+
+// packages/cli/tui/agentPicker.ts
+function toAgentPickerItems(entries) {
+  return entries.map((entry) => ({
+    label: entry.name,
+    detail: `${entry.model}  ${entry.kind}`,
+    entry
+  }));
+}
+function formatAgentSwitchMessage(args2) {
+  const dialog = args2.dialogId ? `Dialog kept: ${args2.dialogId}` : "Dialog kept: new";
+  return `Switched to ${args2.name}. ${dialog}`;
+}
+async function runAgentPicker(args2) {
+  const output2 = args2.output ?? process.stdout;
+  const input2 = args2.input ?? process.stdin;
+  const interactive = args2.interactive ?? Boolean(input2.isTTY && output2.isTTY);
+  const entries = await loadAgentCatalog({
+    env: args2.env,
+    currentKey: args2.currentKey,
+    fetchImpl: args2.fetchImpl,
+    fallbackFetchImpl: args2.fallbackFetchImpl
+  });
+  if (!interactive) {
+    return {
+      kind: "list",
+      output: renderAgentCatalogList(entries, args2.currentKey),
+      entries
+    };
+  }
+  const items = toAgentPickerItems(entries);
+  const initialIndex = Math.max(
+    entries.findIndex((entry) => entry.key === args2.currentKey),
+    0
+  );
+  const result = await runSelectDialog({
+    items,
+    initialIndex,
+    title: void 0,
+    input: input2,
+    output: output2,
+    readKey: args2.readKey
+  });
+  if (result.kind === "cancelled") {
+    return { kind: "cancelled", entries };
+  }
+  const selected = result.item.entry;
+  return {
+    kind: "selected",
+    name: selected.name,
+    key: selected.key,
+    entries
+  };
+}
+function resolveAgentSwitchTarget(rawTarget, catalogEntries = []) {
+  const resolvedKey = resolveCliAgentKeyInput(rawTarget);
+  if (resolvedKey !== rawTarget.trim()) {
+    const aliasEntry = catalogEntries.find((entry) => entry.key === resolvedKey);
+    return {
+      name: aliasEntry?.name ?? rawTarget.trim().toLowerCase(),
+      key: resolvedKey
+    };
+  }
+  return findAgentCatalogEntry(catalogEntries, rawTarget);
+}
+
+// packages/cli/tui/session.ts
+init_defaultServer();
+var DEFAULT_TUI_SERVER_URL = DEFAULT_NOLO_SERVER_URL;
 function shortenDialogId(dialogId) {
   return dialogId.length > 12 ? `${dialogId.slice(0, 6)}...${dialogId.slice(-4)}` : dialogId;
 }
@@ -72840,25 +74483,29 @@ function createInitialTuiState(env = process.env) {
     ),
     cliVersion: env.NOLO_CLI_VERSION?.trim() || void 0,
     attachedDocs: [],
-    runtimeMode: env.NOLO_RUNTIME_MODE === "local" || env.NOLO_RUNTIME_MODE === "server" ? env.NOLO_RUNTIME_MODE : "auto"
+    runtimeMode: env.NOLO_RUNTIME_MODE === "local" || env.NOLO_RUNTIME_MODE === "server" ? env.NOLO_RUNTIME_MODE : "auto",
+    thinkingDisplay: normalizeThinkingDisplayMode(
+      env.NOLO_CLI_THINKING ?? env.NOLO_THINKING,
+      "hide"
+    ),
+    toolDisplay: normalizeToolDisplayMode(env.NOLO_CLI_TOOLS ?? env.NOLO_TOOLS, "compact"),
+    renderDisplay: normalizeRenderDisplayMode(env.NOLO_CLI_RENDER ?? env.NOLO_RENDER, "rich")
   };
 }
 function renderStatusLine(state) {
-  const docs = state.attachedDocs.length > 0 ? String(state.attachedDocs.length) : "0";
-  return [
-    `agent ${state.agentName}`,
-    `dialog ${resolveDialogLabel(state)}`,
-    `docs ${docs}`,
-    `runtime ${state.runtimeMode}`,
-    `profile ${state.profileName}`
-  ].join(" | ");
+  const colorEnabled = resolveCliColorEnabled();
+  const agent = styleCliText(state.agentName, "cyan", colorEnabled);
+  const tokens = dimCliText(renderTokenStatus(state.turnTokens), colorEnabled);
+  const profile = dimCliText(`profile ${state.profileName}`, colorEnabled);
+  return [`agent ${agent}`, tokens, profile].join(
+    dimCliText(" | ", colorEnabled)
+  );
 }
 function renderWelcome(state) {
-  const docs = state.attachedDocs.length > 0 ? `${state.attachedDocs.length} attached` : "none";
   return [
     "",
     `Nolo workspace${state.cliVersion ? `  nolo ${state.cliVersion}` : ""}`,
-    `agent ${state.agentName} | dialog ${resolveDialogLabel(state)} | docs ${docs} | profile ${state.profileName}`,
+    `agent ${state.agentName} | ${renderTokenStatus(state.turnTokens)} | profile ${state.profileName}`,
     `server ${state.serverUrl}`,
     "",
     "Tell nolo what you want. Use /help for commands. Use /version if this install feels stale.",
@@ -72876,16 +74523,21 @@ function renderTuiHelp() {
     "  /compact              Compact current dialog and fork a new one",
     "  /context              Show workspace context and next actions",
     "  /runtime <mode>       Use auto, local, or server runtime",
-    "  /agent                Show the current agent",
-    "  /agents               List built-in agent shortcuts",
-    "  /switch <agent>       Switch the current agent",
+    "  /tools <mode>         Control tool trace: hide, compact, verbose",
+    "  /thinking <mode>      Control thinking output: hide, marker, show",
+    "  /render <mode>        Control assistant output: plain, rich",
+    "  /agent                Pick an agent interactively (\u2191\u2193, Enter)",
+    "  /agent list           List agents as text",
+    "  /agent <name>         Switch directly by name, alias, or key",
+    "  /agents               List platform agent shortcuts",
+    "  /switch <agent>       Switch the current agent (alias of /agent <name>)",
     "  /dialog               Show the current dialog",
     "  /doc                  List attached docs",
     "  /doc attach <doc>     Attach a doc to this workspace",
     "  /customize            Describe how you want to tune nolo",
     "  /login                Show login/profile hint",
     "  /profile              Show active profile",
-    "  /update               Update the global nolo install",
+    "  /update               Update the nolo CLI install",
     "  /version              Show version/update hint",
     "  /exit                 Leave the workspace",
     "",
@@ -72897,12 +74549,16 @@ function renderContextPanel(state) {
   return [
     "Workspace context",
     "-----------------",
-    `agent   ${state.agentName}`,
-    `dialog  ${resolveDialogLabel(state)}`,
-    `docs    ${docs}`,
-    `profile ${state.profileName}`,
-    `runtime ${state.runtimeMode}`,
-    `server  ${state.serverUrl}`,
+    `agent    ${state.agentName}`,
+    `tokens   ${renderTokenStatus(state.turnTokens)}`,
+    `dialog   ${resolveDialogLabel(state)}`,
+    `docs     ${docs}`,
+    `profile  ${state.profileName}`,
+    `runtime  ${state.runtimeMode}`,
+    `tools    ${state.toolDisplay}`,
+    `thinking ${state.thinkingDisplay}`,
+    `render   ${state.renderDisplay}`,
+    `server   ${state.serverUrl}`,
     "",
     "Next:",
     "  /agents              see specialist shortcuts",
@@ -72913,25 +74569,22 @@ function renderContextPanel(state) {
 function renderKnownAgents() {
   return [
     "Agents:",
-    ...KNOWN_AGENTS.map(
-      (agent, index) => `  ${index + 1}  ${agent.name.padEnd(11)} ${agent.description}`
+    ...PLATFORM_AGENTS.map(
+      (agent, index) => `  ${index + 1}  ${agent.name.padEnd(11)} ${agent.description ?? ""}`
     ),
     "",
-    "Tip: stay on nolo for the one-assistant feel; switch only when you want a specialist directly."
+    "Tip: run /agent for the full picker, or /agent list for your private agents too."
   ].join("\n");
 }
-function resolveSwitchTarget(rawTarget) {
-  const target = rawTarget.trim();
-  if (/^\d+$/.test(target)) {
-    const agent = KNOWN_AGENTS[Number(target) - 1];
-    return agent ? { name: agent.name, key: agent.key } : null;
-  }
-  const alias = KNOWN_AGENT_ALIASES[target.toLowerCase()];
-  if (alias) return alias;
-  if (target.startsWith("agent-") || target.startsWith("agent-pub-")) {
-    return { name: target, key: target };
-  }
-  return null;
+function applyAgentSwitch(state, target) {
+  return {
+    nextState: {
+      ...state,
+      agentName: target.name,
+      agentKey: target.key
+    },
+    output: `Switched to ${target.name}. ${state.dialogId ? `Dialog kept: ${state.dialogId}` : "Dialog kept: new"}`
+  };
 }
 var DIALOG_ID_PATTERN = /[0-9A-HJKMNP-TV-Z]{26}/i;
 var DIALOG_KEY_PATTERN = /dialog-[^\s"'<>]+-[0-9A-HJKMNP-TV-Z]{26}/i;
@@ -73109,6 +74762,66 @@ function handleTuiInput(input2, state) {
         output: `Runtime: ${argText}`
       };
     }
+    case "/tools": {
+      if (!argText) {
+        return {
+          nextState: state,
+          output: `Tool display: ${state.toolDisplay} (hide | compact | verbose)`
+        };
+      }
+      const normalizedArg = argText.trim().toLowerCase();
+      if (!["hide", "compact", "verbose", "on", "off"].includes(normalizedArg)) {
+        return {
+          nextState: state,
+          output: "Usage: /tools <hide|compact|verbose>"
+        };
+      }
+      const nextMode = normalizeToolDisplayMode(normalizedArg, state.toolDisplay);
+      return {
+        nextState: { ...state, toolDisplay: nextMode },
+        output: `Tool display: ${nextMode}`
+      };
+    }
+    case "/thinking": {
+      if (!argText) {
+        return {
+          nextState: state,
+          output: `Thinking display: ${state.thinkingDisplay} (hide | marker | show)`
+        };
+      }
+      const normalizedArg = argText.trim().toLowerCase();
+      if (!["hide", "marker", "show", "on", "off"].includes(normalizedArg)) {
+        return {
+          nextState: state,
+          output: "Usage: /thinking <hide|marker|show>"
+        };
+      }
+      const nextMode = normalizeThinkingDisplayMode(normalizedArg, state.thinkingDisplay);
+      return {
+        nextState: { ...state, thinkingDisplay: nextMode },
+        output: `Thinking display: ${nextMode}`
+      };
+    }
+    case "/render": {
+      if (!argText) {
+        return {
+          nextState: state,
+          output: `Render display: ${state.renderDisplay} (plain | rich)`
+        };
+      }
+      const normalizedArg = argText.trim().toLowerCase();
+      if (!["plain", "rich", "on", "off"].includes(normalizedArg)) {
+        return {
+          nextState: state,
+          output: "Usage: /render <plain|rich>"
+        };
+      }
+      const nextMode = normalizeRenderDisplayMode(normalizedArg, state.renderDisplay);
+      return {
+        nextState: { ...state, renderDisplay: nextMode },
+        output: `Render display: ${nextMode}`
+      };
+    }
     case "/exit":
     case "/quit":
       return { nextState: state, output: "Bye.", action: { type: "exit" } };
@@ -73118,7 +74831,8 @@ function handleTuiInput(input2, state) {
           ...state,
           dialogId: void 0,
           dialogLabel: "new",
-          attachedDocs: []
+          attachedDocs: [],
+          turnTokens: void 0
         },
         output: "Started a fresh dialog."
       };
@@ -73142,11 +74856,37 @@ ${renderTuiHelp()}`
         output: "Compacting current dialog...",
         action: { type: "compact", dialogId: state.dialogId }
       };
-    case "/agent":
-      return {
-        nextState: state,
-        output: `Current agent: ${state.agentName} (${state.agentKey})`
-      };
+    case "/agent": {
+      if (!argText) {
+        return {
+          nextState: state,
+          output: "",
+          action: { type: "pick-agent" }
+        };
+      }
+      if (argText === "list") {
+        return {
+          nextState: state,
+          output: "",
+          action: { type: "list-agents" }
+        };
+      }
+      if (argText === "current" || argText === "show") {
+        return {
+          nextState: state,
+          output: `Current agent: ${state.agentName} (${state.agentKey})`
+        };
+      }
+      const resolvedTarget = resolveAgentSwitchTarget(argText, PLATFORM_AGENTS);
+      if (!resolvedTarget) {
+        return {
+          nextState: state,
+          output: `I don't know agent "${argText}" yet.
+Use /agent, /agent list, /agent minimax-m3, or a full agent key.`
+        };
+      }
+      return applyAgentSwitch(state, resolvedTarget);
+    }
     case "/agents":
       return {
         nextState: state,
@@ -73156,25 +74896,18 @@ ${renderTuiHelp()}`
       if (!argText) {
         return {
           nextState: state,
-          output: "Usage: /switch <agent-key|alias>"
+          output: "Usage: /switch <agent-key|alias>  (or run /agent)"
         };
       }
-      const resolvedTarget = resolveSwitchTarget(argText);
+      const resolvedTarget = resolveAgentSwitchTarget(argText, PLATFORM_AGENTS);
       if (!resolvedTarget) {
         return {
           nextState: state,
           output: `I don't know agent shortcut "${argText}" yet.
-Use /switch nolo, /switch app-builder, or a full agent key like agent-pub-...`
+Use /agent, /switch nolo, /switch minimax-m3, or a full agent key.`
         };
       }
-      return {
-        nextState: {
-          ...state,
-          agentName: resolvedTarget.name,
-          agentKey: resolvedTarget.key
-        },
-        output: `Switched to ${resolvedTarget.name}.`
-      };
+      return applyAgentSwitch(state, resolvedTarget);
     }
     case "/dialog":
       return {
@@ -73245,8 +74978,14 @@ async function runAgentChat(scriptDir, state, message, env, output2, agentRunner
     message,
     continueDialogId: state.dialogId,
     runtimeMode: state.runtimeMode,
+    localRuntimeCwd: process.cwd(),
     scriptDir,
-    env,
+    env: {
+      ...env,
+      NOLO_CLI_THINKING: state.thinkingDisplay,
+      NOLO_CLI_TOOLS: state.toolDisplay,
+      NOLO_CLI_RENDER: state.renderDisplay
+    },
     output: output2
   });
   return result;
@@ -73257,7 +74996,7 @@ async function pipeReadableToOutput(stream, output2) {
 }
 function resolveDefaultCliEntrypoint(scriptDir) {
   if (process.argv[1]) return process.argv[1];
-  return join11(scriptDir, "..", "packages", "cli", "index.ts");
+  return join12(scriptDir, "..", "packages", "cli", "index.ts");
 }
 async function runCliCommandInChildProcess(args2, context) {
   const proc = spawnProcess({
@@ -73272,6 +75011,19 @@ async function runCliCommandInChildProcess(args2, context) {
   ]);
   return proc.exited;
 }
+function persistAgentSelection(state, env) {
+  try {
+    saveProfileAgentSelection({
+      agentKey: state.agentKey,
+      agentName: state.agentName
+    });
+  } catch {
+  }
+  if (env) {
+    env.NOLO_AGENT = state.agentKey;
+    env.NOLO_AGENT_NAME = state.agentName;
+  }
+}
 async function startTuiWorkspace(options) {
   let state = createInitialTuiState(options.env ?? process.env);
   const input2 = options.input ?? defaultInput;
@@ -73285,12 +75037,19 @@ async function startTuiWorkspace(options) {
   rl.prompt();
   try {
     for await (const line of rl) {
+      if (!line.trim()) {
+        continue;
+      }
       const result = handleTuiInput(line, state);
+      const previousAgentKey = state.agentKey;
       state = result.nextState;
       if (result.output) {
         output2.write(`${result.output}
 `);
       }
+      if (state.agentKey !== previousAgentKey && result.output?.startsWith("Switched to ")) {
+        persistAgentSelection(state, options.env ?? process.env);
+      }
       if (result.action?.type === "exit") {
         break;
       }
@@ -73321,12 +75080,70 @@ async function startTuiWorkspace(options) {
           if (exitCode2 === 0) {
             output2.write("Update finished. Restart nolo to use the new version.\n");
           } else {
-            output2.write("Update failed. Fix the npm error above, then run /update again or use nolo update.\n");
+            output2.write("Update failed. Check the error above, then run /update again or use nolo update.\n");
           }
         } catch (error) {
           output2.write(`${error instanceof Error ? error.message : String(error)}
 `);
-          output2.write("Update failed. Fix the npm error above, then run /update again or use nolo update.\n");
+          output2.write("Update failed. Check the error above, then run /update again or use nolo update.\n");
+        }
+      }
+      if (result.action?.type === "pick-agent") {
+        rl.pause();
+        try {
+          const pickResult = await runAgentPicker({
+            currentKey: state.agentKey,
+            env: options.env ?? process.env,
+            input: input2,
+            output: output2
+          });
+          if (pickResult.kind === "list") {
+            output2.write(`${pickResult.output}
+`);
+          } else if (pickResult.kind === "selected") {
+            state = {
+              ...state,
+              agentName: pickResult.name,
+              agentKey: pickResult.key
+            };
+            persistAgentSelection(state, options.env ?? process.env);
+            output2.write(
+              `${formatAgentSwitchMessage({
+                name: pickResult.name,
+                dialogId: state.dialogId
+              })}
+`
+            );
+          } else {
+            output2.write("Agent switch cancelled.\n");
+          }
+        } catch (error) {
+          output2.write(
+            `[nolo] Agent picker failed: ${error instanceof Error ? error.message : String(error)}
+`
+          );
+        } finally {
+          rl.resume();
+        }
+      }
+      if (result.action?.type === "list-agents") {
+        try {
+          const pickResult = await runAgentPicker({
+            currentKey: state.agentKey,
+            env: options.env ?? process.env,
+            input: input2,
+            output: output2,
+            interactive: false
+          });
+          if (pickResult.kind === "list") {
+            output2.write(`${pickResult.output}
+`);
+          }
+        } catch (error) {
+          output2.write(
+            `[nolo] Agent list failed: ${error instanceof Error ? error.message : String(error)}
+`
+          );
         }
       }
       if (result.action?.type === "cli-command") {
@@ -73357,11 +75174,14 @@ async function startTuiWorkspace(options) {
           output2,
           options.agentRunner
         );
-        if (runResult.dialogId) {
+        if (runResult.dialogId || runResult.turnTokens) {
           state = {
             ...state,
-            dialogId: runResult.dialogId,
-            dialogLabel: runResult.dialogId
+            ...runResult.dialogId ? {
+              dialogId: runResult.dialogId,
+              dialogLabel: runResult.dialogId
+            } : {},
+            ...runResult.turnTokens ? { turnTokens: runResult.turnTokens } : {}
           };
         }
       }
@@ -73377,12 +75197,12 @@ ${renderStatusLine(state)}
 }
 
 // packages/cli/index.ts
-var CLI_DIR3 = dirname8(fileURLToPath5(import.meta.url));
-var ROOT_DIR = join12(CLI_DIR3, "..", "..");
-var SCRIPT_DIR = join12(ROOT_DIR, "scripts");
+var CLI_DIR3 = dirname9(fileURLToPath6(import.meta.url));
+var ROOT_DIR = join13(CLI_DIR3, "..", "..");
+var SCRIPT_DIR = join13(ROOT_DIR, "scripts");
 var packageInfo = readPackageInfo();
 async function runScript(script, forwardedArgs, env) {
-  const scriptPath = join12(SCRIPT_DIR, script);
+  const scriptPath = join13(SCRIPT_DIR, script);
   const proc = spawnProcess({
     cmd: [process.execPath, scriptPath, ...forwardedArgs],
     stdin: "inherit",
@@ -73400,7 +75220,7 @@ var runtimeEnv = {
 var runtimeContext = createCliRuntimeContext({
   env: runtimeEnv,
   scriptDir: SCRIPT_DIR,
-  entrypointPath: fileURLToPath5(import.meta.url),
+  entrypointPath: fileURLToPath6(import.meta.url),
   packageInfo
 });
 if (args.length === 0) {