nolo-cli 0.3.1 → 0.4.2

package/index.js

@@ -12431,6 +12431,149 @@ var init_cliLocalToolBudget = __esm({
   }
 });
 
+// packages/core/builtinAgents.ts
+var BUILTIN_NOLO_AGENT_KEY, BUILTIN_APP_BUILDER_AGENT_KEY, BUILTIN_ECOMMERCE_AGENT_KEY, BUILTIN_AGENT_CREATOR_AGENT_KEY, BUILTIN_FEEDBACK_AGENT_KEY, BUILTIN_CHROME_OPERATOR_AGENT_KEY, PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID, PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY, PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID, PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY, PUBLIC_KIMI_K27_CODING_AGENT_ID, PUBLIC_KIMI_K27_CODING_AGENT_KEY, PUBLIC_GLM_52_AGENT_ID, PUBLIC_GLM_52_AGENT_KEY, PUBLIC_KIMI_K26_IMAGE_AGENT_ID, PUBLIC_KIMI_K26_IMAGE_AGENT_KEY, BUILTIN_PLATFORM_AGENT_KEYS, BUILTIN_PLATFORM_AGENT_KEY_SET;
+var init_builtinAgents = __esm({
+  "packages/core/builtinAgents.ts"() {
+    "use strict";
+    BUILTIN_NOLO_AGENT_KEY = "agent-pub-01NOLOAPPBLD000000019KCKT0";
+    BUILTIN_APP_BUILDER_AGENT_KEY = "agent-pub-01APPBUILDER00000001YAII3I";
+    BUILTIN_ECOMMERCE_AGENT_KEY = "agent-pub-01ECOMMERCEAG00000001PYQ2J";
+    BUILTIN_AGENT_CREATOR_AGENT_KEY = "agent-pub-01NOLOAGENTCRT000000000001";
+    BUILTIN_FEEDBACK_AGENT_KEY = "agent-pub-01NOLOFEEDBACKA000000000R2";
+    BUILTIN_CHROME_OPERATOR_AGENT_KEY = "agent-pub-01CHROMEOPR000000000001";
+    PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID = "01DSV4FLASHPB00000000JFPFD";
+    PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY = `agent-pub-${PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID}`;
+    PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID = "01DSV4PROPUB00000001A9OLZN";
+    PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY = `agent-pub-${PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID}`;
+    PUBLIC_KIMI_K27_CODING_AGENT_ID = "01KIMIK27CODEOL000000001";
+    PUBLIC_KIMI_K27_CODING_AGENT_KEY = `agent-pub-${PUBLIC_KIMI_K27_CODING_AGENT_ID}`;
+    PUBLIC_GLM_52_AGENT_ID = "01GLM52CHAT00000000001U721";
+    PUBLIC_GLM_52_AGENT_KEY = `agent-pub-${PUBLIC_GLM_52_AGENT_ID}`;
+    PUBLIC_KIMI_K26_IMAGE_AGENT_ID = "01KIMIK26OLLAMA0000000001";
+    PUBLIC_KIMI_K26_IMAGE_AGENT_KEY = `agent-pub-${PUBLIC_KIMI_K26_IMAGE_AGENT_ID}`;
+    BUILTIN_PLATFORM_AGENT_KEYS = [
+      BUILTIN_NOLO_AGENT_KEY,
+      BUILTIN_APP_BUILDER_AGENT_KEY,
+      BUILTIN_ECOMMERCE_AGENT_KEY,
+      BUILTIN_AGENT_CREATOR_AGENT_KEY,
+      BUILTIN_FEEDBACK_AGENT_KEY,
+      BUILTIN_CHROME_OPERATOR_AGENT_KEY
+    ];
+    BUILTIN_PLATFORM_AGENT_KEY_SET = new Set(BUILTIN_PLATFORM_AGENT_KEYS);
+  }
+});
+
+// packages/agent-runtime/builtinPlatformAgentConfigs.ts
+function resolveBuiltinPlatformAgentConfig(agentRef) {
+  return BUILTIN_PLATFORM_AGENT_CONFIGS[agentRef] ?? null;
+}
+var BUILTIN_PLATFORM_AGENT_CONFIGS;
+var init_builtinPlatformAgentConfigs = __esm({
+  "packages/agent-runtime/builtinPlatformAgentConfigs.ts"() {
+    "use strict";
+    init_builtinAgents();
+    BUILTIN_PLATFORM_AGENT_CONFIGS = {
+      [PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY]: {
+        key: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
+        name: "DeepSeek V4 Flash",
+        provider: "nolo",
+        model: "deepseek-v4-flash",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
+          isPublic: true,
+          provider: "nolo",
+          model: "deepseek-v4-flash",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      },
+      [PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY]: {
+        key: PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
+        name: "DeepSeek V4 Pro",
+        provider: "deepseek",
+        model: "deepseek-v4-pro",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
+          isPublic: true,
+          provider: "deepseek",
+          model: "deepseek-v4-pro",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      },
+      [PUBLIC_GLM_52_AGENT_KEY]: {
+        key: PUBLIC_GLM_52_AGENT_KEY,
+        name: "GLM 5.2",
+        provider: "nolo",
+        model: "glm-5.2",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: PUBLIC_GLM_52_AGENT_KEY,
+          isPublic: true,
+          provider: "nolo",
+          model: "glm-5.2",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      },
+      [PUBLIC_KIMI_K26_IMAGE_AGENT_KEY]: {
+        key: PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
+        name: "Kimi K2.6",
+        provider: "ollama-cloud",
+        model: "kimi-k2.6",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
+          isPublic: true,
+          provider: "ollama-cloud",
+          model: "kimi-k2.6",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      },
+      [PUBLIC_KIMI_K27_CODING_AGENT_KEY]: {
+        key: PUBLIC_KIMI_K27_CODING_AGENT_KEY,
+        name: "Kimi K2.7 Coding",
+        provider: "ollama-cloud",
+        model: "kimi-k2.7-code",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: PUBLIC_KIMI_K27_CODING_AGENT_KEY,
+          isPublic: true,
+          provider: "ollama-cloud",
+          model: "kimi-k2.7-code",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      },
+      [BUILTIN_NOLO_AGENT_KEY]: {
+        key: BUILTIN_NOLO_AGENT_KEY,
+        name: "Nolo",
+        provider: "nolo",
+        model: "deepseek-v4-flash",
+        apiSource: "platform",
+        useServerProxy: true,
+        rawRecord: {
+          dbKey: BUILTIN_NOLO_AGENT_KEY,
+          isPublic: true,
+          provider: "nolo",
+          model: "deepseek-v4-flash",
+          apiSource: "platform",
+          useServerProxy: true
+        }
+      }
+    };
+  }
+});
+
 // packages/cli/client/localDialogRecords.ts
 function buildLocalDialogWritePlan(args2) {
   return buildAgentRuntimeDialogWritePlan({
@@ -12490,7 +12633,9 @@ async function readAgentFromStore(args2) {
     return resolveAgentRuntimeConfigFromRecord(key, record);
   }
   const normalizedRef = normalizeAgentHandle(args2.agentRef);
-  if (!normalizedRef) return null;
+  if (!normalizedRef) {
+    return resolveBuiltinPlatformAgentConfig(args2.agentRef);
+  }
   try {
     const iterator = args2.store.iterator({
       gte: "agent-",
@@ -12504,7 +12649,7 @@ async function readAgentFromStore(args2) {
     }
   } catch {
   }
-  return null;
+  return resolveBuiltinPlatformAgentConfig(args2.agentRef);
 }
 async function readDialogMessages(args2) {
   const messages = [];
@@ -12520,6 +12665,7 @@ var init_cliLocalAgentRecordReader = __esm({
   "packages/cli/client/cliLocalAgentRecordReader.ts"() {
     "use strict";
     init_agent_runtime();
+    init_builtinPlatformAgentConfigs();
     init_localAgentRecords();
     init_agentHandle();
     init_keys2();
@@ -12693,7 +12839,7 @@ function resolveLocalUserId(env) {
 function isBuiltinNoloAgentRef(ref) {
   if (typeof ref !== "string") return false;
   const normalized = ref.trim();
-  return normalized === BUILTIN_NOLO_AGENT_KEY || normalized === BUILTIN_NOLO_AGENT_ID || normalized.endsWith(`-${BUILTIN_NOLO_AGENT_ID}`);
+  return normalized === BUILTIN_NOLO_AGENT_KEY2 || normalized === BUILTIN_NOLO_AGENT_ID || normalized.endsWith(`-${BUILTIN_NOLO_AGENT_ID}`);
 }
 function isBuiltinNoloAgentConfig(agentConfig) {
   const key = agentConfig?.key || agentConfig?.rawRecord?.dbKey || agentConfig?.rawRecord?.agentKey;
@@ -12734,7 +12880,7 @@ function extractLastUserText2(messages) {
 function localTurnHasSubjectRefs(input2) {
   return Array.isArray(input2.runtimeContext?.subjectRefs) && input2.runtimeContext.subjectRefs.length > 0;
 }
-var BUILTIN_NOLO_AGENT_KEY, BUILTIN_NOLO_AGENT_ID;
+var BUILTIN_NOLO_AGENT_KEY2, BUILTIN_NOLO_AGENT_ID;
 var init_cliAgentConfigHelpers = __esm({
   "packages/cli/client/cliAgentConfigHelpers.ts"() {
     "use strict";
@@ -12743,7 +12889,7 @@ var init_cliAgentConfigHelpers = __esm({
     init_agentAliases();
     init_cliEnvHelpers();
     init_localRuntimeHelpers();
-    BUILTIN_NOLO_AGENT_KEY = NOLO_DEFAULT_AGENT_KEY;
+    BUILTIN_NOLO_AGENT_KEY2 = NOLO_DEFAULT_AGENT_KEY;
     BUILTIN_NOLO_AGENT_ID = NOLO_DEFAULT_AGENT_ID;
   }
 });
@@ -31926,39 +32072,6 @@ var init_readRequestManager = __esm({
   }
 });
 
-// packages/core/builtinAgents.ts
-var BUILTIN_NOLO_AGENT_KEY2, BUILTIN_APP_BUILDER_AGENT_KEY, BUILTIN_ECOMMERCE_AGENT_KEY, BUILTIN_AGENT_CREATOR_AGENT_KEY, BUILTIN_FEEDBACK_AGENT_KEY, BUILTIN_CHROME_OPERATOR_AGENT_KEY, PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID, PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY, PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID, PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY, PUBLIC_KIMI_K27_CODING_AGENT_ID, PUBLIC_KIMI_K27_CODING_AGENT_KEY, PUBLIC_GLM_52_AGENT_ID, PUBLIC_GLM_52_AGENT_KEY, PUBLIC_KIMI_K26_IMAGE_AGENT_ID, PUBLIC_KIMI_K26_IMAGE_AGENT_KEY, BUILTIN_PLATFORM_AGENT_KEYS, BUILTIN_PLATFORM_AGENT_KEY_SET;
-var init_builtinAgents = __esm({
-  "packages/core/builtinAgents.ts"() {
-    "use strict";
-    BUILTIN_NOLO_AGENT_KEY2 = "agent-pub-01NOLOAPPBLD000000019KCKT0";
-    BUILTIN_APP_BUILDER_AGENT_KEY = "agent-pub-01APPBUILDER00000001YAII3I";
-    BUILTIN_ECOMMERCE_AGENT_KEY = "agent-pub-01ECOMMERCEAG00000001PYQ2J";
-    BUILTIN_AGENT_CREATOR_AGENT_KEY = "agent-pub-01NOLOAGENTCRT000000000001";
-    BUILTIN_FEEDBACK_AGENT_KEY = "agent-pub-01NOLOFEEDBACKA000000000R2";
-    BUILTIN_CHROME_OPERATOR_AGENT_KEY = "agent-pub-01CHROMEOPR000000000001";
-    PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID = "01DSV4FLASHPB00000000JFPFD";
-    PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY = `agent-pub-${PUBLIC_DEEPSEEK_V4_FLASH_AGENT_ID}`;
-    PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID = "01DSV4PROPUB00000001A9OLZN";
-    PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY = `agent-pub-${PUBLIC_DEEPSEEK_V4_PRO_AGENT_ID}`;
-    PUBLIC_KIMI_K27_CODING_AGENT_ID = "01KIMIK27CODEOL000000001";
-    PUBLIC_KIMI_K27_CODING_AGENT_KEY = `agent-pub-${PUBLIC_KIMI_K27_CODING_AGENT_ID}`;
-    PUBLIC_GLM_52_AGENT_ID = "01GLM52CHAT00000000001U721";
-    PUBLIC_GLM_52_AGENT_KEY = `agent-pub-${PUBLIC_GLM_52_AGENT_ID}`;
-    PUBLIC_KIMI_K26_IMAGE_AGENT_ID = "01KIMIK26OLLAMA0000000001";
-    PUBLIC_KIMI_K26_IMAGE_AGENT_KEY = `agent-pub-${PUBLIC_KIMI_K26_IMAGE_AGENT_ID}`;
-    BUILTIN_PLATFORM_AGENT_KEYS = [
-      BUILTIN_NOLO_AGENT_KEY2,
-      BUILTIN_APP_BUILDER_AGENT_KEY,
-      BUILTIN_ECOMMERCE_AGENT_KEY,
-      BUILTIN_AGENT_CREATOR_AGENT_KEY,
-      BUILTIN_FEEDBACK_AGENT_KEY,
-      BUILTIN_CHROME_OPERATOR_AGENT_KEY
-    ];
-    BUILTIN_PLATFORM_AGENT_KEY_SET = new Set(BUILTIN_PLATFORM_AGENT_KEYS);
-  }
-});
-
 // packages/database/actions/agentReadResolution.ts
 var BUILTIN_PLATFORM_AGENT_KEYS2, BUILTIN_PLATFORM_AGENT_KEY_SET2, normalizeServer2, isBuiltinPlatformAgentKey, resolveAgentReadServers;
 var init_agentReadResolution = __esm({
@@ -33709,80 +33822,83 @@ var init_colors = __esm({
       }
     };
     catppuccin = {
+      // 保留 catppuccin 的柔和圆角 + 弹性缓动；色值换成 Ghostty "GitHub Light/Dark Default"
+      // 官方 palette，获得通透高对比的观感。合成后名字/位次不变，DEFAULT_THEME_NAME 不动。
+      // Reviewer 改进：dark textTertiary/quaternary 提亮达 WCAG AA；light warning 改琥珀色；
+      // light backgroundElevated 拉开与画布的层级，大圆角浮层不再粘连。
       meta: { radiusBoost: 2, motionEase: "cubic-bezier(0.22, 1, 0.36, 1)" },
       light: {
-        // Catppuccin Latte — 白底冷调
-        primary: "#1E66F5",
-        primaryLight: "#7287FD",
-        primaryDark: "#0D52D4",
-        primaryGradient: "linear-gradient(135deg, #1E66F5, #7287FD)",
-        primaryGhost: "rgba(30, 102, 245, 0.08)",
-        primaryHover: "rgba(30, 102, 245, 0.10)",
-        borderAccent: "#89B4FA",
-        success: "#40A02B",
-        warning: "#DF8E1D",
-        info: "#04A5E5",
-        error: "#D20F39",
-        background: "#FCFDFE",
-        backgroundSecondary: "#F1F4F9",
-        backgroundTertiary: "#E6E9F1",
-        backgroundGhost: "rgba(252, 253, 254, 0.94)",
-        backgroundHover: "#DCE0EA",
-        backgroundSelected: "#CCD2DF",
-        backgroundElevated: "#EBEFF6",
-        // 雾灰下沉面板：与 #FCFDFE 画布/字段拉开对比，修复 surface 层级倒挂
-        text: "#4C4F69",
-        textSecondary: "#5C5F77",
-        textTertiary: "#6C6F85",
-        textQuaternary: "#9799A4",
-        textLight: "#BCC0CF",
-        placeholder: "#8C8FA1",
-        border: "#DCDFE8",
-        borderHover: "#C6C9D5",
-        borderLight: "#EFF2F7",
-        messageBackground: "#FFFFFF",
-        codeBackground: "#EEF1F6",
-        shadowLight: "rgba(76, 79, 105, 0.05)",
-        shadowMedium: "rgba(76, 79, 105, 0.09)",
-        shadowHeavy: "rgba(76, 79, 105, 0.14)",
+        // Ghostty GitHub Light Default — 纯白 canvas + blue-500 accent
+        primary: "#0969DA",
+        primaryLight: "#218BFF",
+        primaryDark: "#0550AE",
+        primaryGradient: "linear-gradient(135deg, #0969DA, #218BFF)",
+        primaryGhost: "rgba(9,105,218,0.08)",
+        primaryHover: "rgba(9,105,218,0.10)",
+        borderAccent: "#54AEFF",
+        success: "#116329",
+        warning: "#9A6700",
+        info: "#0969DA",
+        error: "#CF222E",
+        background: "#FFFFFF",
+        backgroundSecondary: "#F6F8FA",
+        backgroundTertiary: "#E8ECF0",
+        backgroundGhost: "rgba(255,255,255,0.94)",
+        backgroundHover: "#E8ECF0",
+        backgroundSelected: "#D0D7DE",
+        backgroundElevated: "#F6F8FA",
+        text: "#1F2328",
+        textSecondary: "#57606A",
+        textTertiary: "#6E7781",
+        textQuaternary: "#8C959F",
+        textLight: "#D0D7DE",
+        placeholder: "#6E7781",
+        border: "#D0D7DE",
+        borderHover: "#B1BAC4",
+        borderLight: "#D8DEE4",
+        messageBackground: "#F6F8FA",
+        codeBackground: "#F6F8FA",
+        shadowLight: "rgba(0,0,0,0.04)",
+        shadowMedium: "rgba(0,0,0,0.08)",
+        shadowHeavy: "rgba(0,0,0,0.14)",
         textOnPrimary: "#FFFFFF"
       },
       dark: {
-        // Catppuccin Mocha — 层级修正
-        primary: "#89B4FA",
-        primaryLight: "#B4BEFE",
-        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: "#94E2D5",
-        error: "#F38BA8",
-        background: "#1E1E2E",
-        backgroundSecondary: "#181825",
-        backgroundTertiary: "#313244",
-        backgroundGhost: "rgba(24, 24, 37, 0.94)",
-        backgroundHover: "#45475A",
-        backgroundSelected: "#585B70",
-        backgroundElevated: "#313244",
-        text: "#CDD6F4",
-        textSecondary: "#BAC2DE",
-        textTertiary: "#A6ADC8",
-        textQuaternary: "#6C7086",
-        textLight: "#585B70",
-        placeholder: "#6C7086",
-        border: "#313244",
-        borderHover: "#585B70",
-        borderLight: "#181825",
-        messageBackground: "#181825",
-        codeBackground: "#11111B",
-        shadowLight: "rgba(17, 17, 27, 0.22)",
-        shadowMedium: "rgba(17, 17, 27, 0.34)",
-        shadowHeavy: "rgba(17, 17, 27, 0.46)",
-        textHeading: "#F5E0DC",
-        textOnPrimary: "#1E1E2E"
+        // Ghostty GitHub Dark Default — #0D1117 canvas + sky blue #58A6FF accent
+        primary: "#58A6FF",
+        primaryLight: "#79C0FF",
+        primaryDark: "#1F6FEB",
+        primaryGradient: "linear-gradient(135deg, #58A6FF, #79C0FF)",
+        primaryGhost: "rgba(88,166,255,0.10)",
+        primaryHover: "rgba(88,166,255,0.12)",
+        borderAccent: "#1F6FEB",
+        success: "#3FB950",
+        warning: "#D29922",
+        info: "#58A6FF",
+        error: "#FF7B72",
+        background: "#0D1117",
+        backgroundSecondary: "#161B22",
+        backgroundTertiary: "#21262D",
+        backgroundGhost: "rgba(13,17,23,0.94)",
+        backgroundHover: "#1C2128",
+        backgroundSelected: "#1F6FEB",
+        backgroundElevated: "#161B22",
+        text: "#E6EDF3",
+        textSecondary: "#B1BAC4",
+        textTertiary: "#8B949E",
+        textQuaternary: "#6E7681",
+        textLight: "#30363D",
+        placeholder: "#6E7681",
+        border: "#30363D",
+        borderHover: "#424A53",
+        borderLight: "#21262D",
+        messageBackground: "#161B22",
+        codeBackground: "#161B22",
+        shadowLight: "rgba(13,17,23,0.18)",
+        shadowMedium: "rgba(13,17,23,0.30)",
+        shadowHeavy: "rgba(13,17,23,0.44)",
+        textHeading: "#E6EDF3",
+        textOnPrimary: "#0D1117"
       }
     };
   }
@@ -34070,7 +34186,7 @@ var init_init = __esm({
     nolotusId = "0e95801d90";
     ADMIN_IDS = /* @__PURE__ */ new Set([nolotusId]);
     isSystemAdmin = (userId) => userId != null && ADMIN_IDS.has(userId);
-    noloAgentId = BUILTIN_NOLO_AGENT_KEY2;
+    noloAgentId = BUILTIN_NOLO_AGENT_KEY;
   }
 });
 
@@ -91914,23 +92030,23 @@ var init_theme = __esm({
       },
       catppuccin: {
         light: {
-          accent: { hex: "1E66F5", ansiFallback: "\x1B[34m" },
-          chrome: { hex: "9CCFD8", ansiFallback: "\x1B[90m" },
-          success: { hex: "40A02B", ansiFallback: "\x1B[32m" },
-          warning: { hex: "DF8E1D", ansiFallback: "\x1B[33m" },
-          info: { hex: "04A5E5", ansiFallback: "\x1B[36m" },
-          danger: { hex: "D20F39", ansiFallback: "\x1B[31m" },
-          muted: { hex: "7C7F93", ansiFallback: "\x1B[90m" }
+          accent: { hex: "0969DA", ansiFallback: "\x1B[34m" },
+          chrome: { hex: "57606A", ansiFallback: "\x1B[90m" },
+          success: { hex: "116329", ansiFallback: "\x1B[32m" },
+          warning: { hex: "9A6700", ansiFallback: "\x1B[33m" },
+          info: { hex: "0969DA", ansiFallback: "\x1B[36m" },
+          danger: { hex: "CF222E", ansiFallback: "\x1B[31m" },
+          muted: { hex: "6E7781", ansiFallback: "\x1B[90m" }
         },
         dark: {
-          accent: { hex: "89B4FA", ansiFallback: "\x1B[34m" },
-          // mocha blue
-          chrome: { hex: "6C7086", ansiFallback: "\x1B[90m" },
-          success: { hex: "A6E3A1", ansiFallback: "\x1B[32m" },
-          warning: { hex: "F9E2AF", ansiFallback: "\x1B[33m" },
-          info: { hex: "94E2D5", ansiFallback: "\x1B[36m" },
-          danger: { hex: "F38BA8", ansiFallback: "\x1B[31m" },
-          muted: { hex: "A6ADC8", ansiFallback: "\x1B[90m" }
+          accent: { hex: "58A6FF", ansiFallback: "\x1B[34m" },
+          // GitHub sky blue
+          chrome: { hex: "6E7681", ansiFallback: "\x1B[90m" },
+          success: { hex: "3FB950", ansiFallback: "\x1B[32m" },
+          warning: { hex: "D29922", ansiFallback: "\x1B[33m" },
+          info: { hex: "58A6FF", ansiFallback: "\x1B[36m" },
+          danger: { hex: "FF7B72", ansiFallback: "\x1B[31m" },
+          muted: { hex: "B1BAC4", ansiFallback: "\x1B[90m" }
         }
       },
       wave: {
@@ -92016,12 +92132,12 @@ var init_theme = __esm({
         }
       }
     };
-    activeThemeName = "trail";
+    activeThemeName = "catppuccin";
     activeBrightness = null;
     activeDensity = "spacious";
     SURFACE_HEX = {
       trail: { light: "E4E8EC", dark: "313244" },
-      catppuccin: { light: "E6E9EF", dark: "313244" },
+      catppuccin: { light: "E8ECF0", dark: "161B22" },
       wave: { light: "E5E1D6", dark: "2A2A37" },
       iris: { light: "E9E8F2", dark: "2A2740" },
       rose: { light: "F2EAE4", dark: "26233A" },
@@ -93479,7 +93595,7 @@ function formatSearchTreeBlockForCli(items, colorEnabled) {
 `;
   const treeLines = lines.map((l) => {
     const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const queryText = themeText(l.queryText, "info", true);
+    const queryText = themeText(l.queryText, "muted", true);
     return `${connector}${queryText}`;
   }).join("\n");
   return `${headerLine}${treeLines}
@@ -93502,7 +93618,7 @@ function formatReadTreeBlockForCli(items, colorEnabled) {
 `;
   const treeLines = lines.map((l) => {
     const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const pathText = themeText(l.pathWithRange, "info", true);
+    const pathText = themeText(l.pathWithRange, "muted", true);
     return `${connector}${pathText}`;
   }).join("\n");
   return `${headerLine}${treeLines}
@@ -93525,7 +93641,7 @@ function formatRunTreeBlockForCli(items, colorEnabled) {
 `;
   const treeLines = lines.map((l) => {
     const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const commandText = themeText(l.commandText, "info", true);
+    const commandText = themeText(l.commandText, "muted", true);
     return `${connector}${commandText}`;
   }).join("\n");
   return `${headerLine}${treeLines}
@@ -93548,7 +93664,7 @@ function formatFetchTreeBlockForCli(items, colorEnabled) {
 `;
   const treeLines = lines.map((l) => {
     const connector = themeText(`  ${l.connector}`, "chrome", true);
-    const urlText = themeText(l.urlText, "info", true);
+    const urlText = themeText(l.urlText, "muted", true);
     return `${connector}${urlText}`;
   }).join("\n");
   return `${headerLine}${treeLines}
@@ -107178,6 +107294,57 @@ var init_dialogHost = __esm({
   }
 });
 
+// packages/ai/agent/utils/sortUtils.ts
+function sortAgentsFavoriteOwnedPublic(items) {
+  const map = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const existing = map.get(item.key);
+    if (!existing) {
+      map.set(item.key, { ...item });
+      continue;
+    }
+    map.set(item.key, {
+      ...existing,
+      ...item,
+      key: existing.key,
+      favoritedAt: Math.max(existing.favoritedAt ?? 0, item.favoritedAt ?? 0) || void 0,
+      isOwned: Boolean(existing.isOwned || item.isOwned),
+      isPublic: Boolean(existing.isPublic || item.isPublic),
+      updatedAt: Math.max(existing.updatedAt ?? 0, item.updatedAt ?? 0),
+      order: existing.order ?? item.order
+    });
+  }
+  const arr = Array.from(map.values());
+  arr.sort((a, b) => {
+    const aFav = a.favoritedAt != null && a.favoritedAt > 0;
+    const bFav = b.favoritedAt != null && b.favoritedAt > 0;
+    if (aFav !== bFav) return aFav ? -1 : 1;
+    if (aFav && bFav) {
+      const diff = (b.favoritedAt ?? 0) - (a.favoritedAt ?? 0);
+      if (diff !== 0) return diff;
+    }
+    const aOwned = Boolean(a.isOwned);
+    const bOwned = Boolean(b.isOwned);
+    if (aOwned !== bOwned) return aOwned ? -1 : 1;
+    const aPublic = Boolean(a.isPublic);
+    const bPublic = Boolean(b.isPublic);
+    if (aPublic !== bPublic) return aPublic ? -1 : 1;
+    const tsDiff = (b.updatedAt ?? 0) - (a.updatedAt ?? 0);
+    if (tsDiff !== 0) return tsDiff;
+    const aOrder = a.order ?? Number.POSITIVE_INFINITY;
+    const bOrder = b.order ?? Number.POSITIVE_INFINITY;
+    if (aOrder !== bOrder) return aOrder - bOrder;
+    return a.key.localeCompare(b.key);
+  });
+  return arr;
+}
+var init_sortUtils = __esm({
+  "packages/ai/agent/utils/sortUtils.ts"() {
+    "use strict";
+    init_optionalNumber();
+  }
+});
+
 // packages/cli/tui/agentCatalog.ts
 function formatAgentSourceLabel(entry) {
   if (entry.kind === "platform" || entry.apiSource === "platform") return "\u5E73\u53F0";
@@ -107224,15 +107391,17 @@ function mergeCatalogEntries(currentKey, platformAgents, privateAgents, favorite
   for (const entry of platformAgents) {
     if (entry.key !== currentKey) push(entry);
   }
-  const sortedPrivate = [...privateAgents].sort((a, b) => {
-    const fa = favoritedAtByKey[a.key] ?? 0;
-    const fb = favoritedAtByKey[b.key] ?? 0;
-    if (fa !== fb) return fb - fa;
-    const tb = b.updatedAt ?? 0;
-    const ta = a.updatedAt ?? 0;
-    if (tb !== ta) return tb - ta;
-    return a.name.localeCompare(b.name);
-  });
+  const sortablePrivate = privateAgents.map((entry) => ({
+    key: entry.key,
+    favoritedAt: favoritedAtByKey[entry.key],
+    isOwned: true,
+    updatedAt: entry.updatedAt ?? 0
+  }));
+  const sortedKeys = sortAgentsFavoriteOwnedPublic(sortablePrivate);
+  const sortedKeyOrder = new Map(sortedKeys.map((item, i) => [item.key, i]));
+  const sortedPrivate = [...privateAgents].sort(
+    (a, b) => (sortedKeyOrder.get(a.key) ?? 0) - (sortedKeyOrder.get(b.key) ?? 0)
+  );
   for (const entry of sortedPrivate) {
     if (entry.key !== currentKey) push(entry);
   }
@@ -107361,6 +107530,7 @@ var init_agentCatalog = __esm({
     init_agentCommandSupport();
     init_agentRecordHelpers();
     init_cliEnvHelpers();
+    init_sortUtils();
     DEFAULT_TUI_AGENT_KEY = "agent-pub-01NOLOAPPBLD000000019KCKT0";
     PLATFORM_AGENTS = [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.3.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {