nolo-cli 0.31.0-alpha.1 → 0.31.0-alpha.2

package/{agentRunCommand-LH4RA6FA.js → agentRunCommand-QDNDC76O.js}

@@ -7,7 +7,7 @@ import {
   prependSubjectDialogMarker,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-H6COXALE.js";
+} from "./chunk-EB5AQGXR.js";
 import {
   parseAgentRunArgs
 } from "./chunk-AOS5IN2I.js";

package/{chunk-H6COXALE.js → chunk-EB5AQGXR.js}

@@ -4458,6 +4458,9 @@ var touchMemoryItemsInDb = async (db, items, now = (/* @__PURE__ */ new Date()).
   await batch.write();
 };
 
+// packages/ai/memory/constants.ts
+var EXPLICIT_REMEMBER_PREFIX_REGEX = /^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u;
+
 // packages/ai/memory/overlay.ts
 var KIND_TITLES = {
   episodic: "Episodic",
@@ -4486,42 +4489,31 @@ var KIND_PRIORITY = {
   procedural: 1,
   episodic: 2
 };
+var FACET_DISPLAY = {
+  unfinished: { label: "\u8FD8\u6CA1\u5B9A\u4E0B", strip: "\u8FD8\u6CA1\u51B3\u5B9A" },
+  tension: { label: "\u5728\u6743\u8861", strip: "\u5728\u6743\u8861" },
+  preference: { label: "\u66F4\u5728\u610F", strip: "\u66F4\u5728\u610F" },
+  style: { label: "\u66F4\u504F\u597D", strip: "\u66F4\u559C\u6B22" },
+  goal: { label: "\u60F3\u63A8\u8FDB", strip: "\u60F3\u63A8\u8FDB" }
+};
+var formatFacetContent = (facet, normalized, prefix) => {
+  const { label, strip } = FACET_DISPLAY[facet];
+  const stripped = normalized.startsWith(strip) ? normalized.slice(strip.length).trim() : normalized;
+  return `${prefix}${label} ${stripped}`;
+};
 var normalizeDisplayContent = (item) => {
-  const normalized = item.content.trim().replace(/^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u, "").replace(/[。！？!?]+$/u, "").trim();
-  const stripPrefix = (prefix) => normalized.startsWith(prefix) ? normalized.slice(prefix.length).trim() : normalized;
+  const normalized = item.content.trim().replace(EXPLICIT_REMEMBER_PREFIX_REGEX, "").replace(/[。！？!?]+$/u, "").trim();
   if (item.kind === "semantic") {
-    if (item.tags?.includes("understanding-memory")) {
-      switch (item.facet) {
-        case "unfinished":
-          return `\u7528\u6237\u4ECD\u672A\u5B9A\u4E0B\uFF1A${stripPrefix("\u8FD8\u6CA1\u51B3\u5B9A")}`;
-        case "tension":
-          return `\u7528\u6237\u5F53\u524D\u5728\u6743\u8861\uFF1A${stripPrefix("\u5728\u6743\u8861")}`;
-        case "preference":
-          return `\u7528\u6237\u5F53\u524D\u66F4\u5728\u610F\uFF1A${stripPrefix("\u66F4\u5728\u610F")}`;
-        case "style":
-          return `\u7528\u6237\u4E92\u52A8\u504F\u597D\uFF1A${stripPrefix("\u66F4\u559C\u6B22")}`;
-        case "goal":
-          return `\u7528\u6237\u5F53\u524D\u76EE\u6807\uFF1A${stripPrefix("\u60F3\u63A8\u8FDB")}`;
-      }
+    if (item.tags?.includes("understanding-memory") && item.facet) {
+      return formatFacetContent(item.facet, normalized, "\u7528\u6237\u5F53\u524D");
     }
     return `\u7528\u6237\u957F\u671F\u504F\u597D/\u4E8B\u5B9E\uFF1A${normalized}`;
   }
   if (item.kind === "episodic" && (item.patternKey === "explicit-remember" || item.patternKey === "agent-remember")) {
     return `\u7528\u6237\u660E\u786E\u8981\u6C42\u4F60\u8BB0\u4F4F\uFF1A${normalized}`;
   }
-  if (item.kind === "episodic" && item.tags?.includes("understanding-memory")) {
-    switch (item.facet) {
-      case "unfinished":
-        return `\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237\u8FD8\u6CA1\u5B9A\u4E0B ${stripPrefix("\u8FD8\u6CA1\u51B3\u5B9A")}`;
-      case "tension":
-        return `\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237\u8FD8\u5728\u6743\u8861 ${stripPrefix("\u5728\u6743\u8861")}`;
-      case "preference":
-        return `\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237\u66F4\u5728\u610F ${stripPrefix("\u66F4\u5728\u610F")}`;
-      case "style":
-        return `\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237\u66F4\u504F\u597D ${stripPrefix("\u66F4\u559C\u6B22")}`;
-      case "goal":
-        return `\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237\u60F3\u63A8\u8FDB ${stripPrefix("\u60F3\u63A8\u8FDB")}`;
-    }
+  if (item.kind === "episodic" && item.tags?.includes("understanding-memory") && item.facet) {
+    return formatFacetContent(item.facet, normalized, "\u6700\u8FD1\u4E00\u6B21\u5BF9\u8BDD\u663E\u793A\uFF1A\u7528\u6237");
   }
   return normalized;
 };
@@ -4537,27 +4529,16 @@ var buildMemoryOverlay = (items, options) => {
   for (const item of items) {
     byKind[item.kind].push(item);
   }
-  const cappedByKind = Object.entries(byKind).filter(([, list]) => list.length > 0).map(([kind, list]) => [kind, list.slice(0, perKindLimit)]);
   const remainingBudget = maxTokens - OVERLAY_HEADER_TOKENS;
   if (remainingBudget <= 0) {
     return OVERLAY_HEADER_LINES.join("\n");
   }
-  const allLines = [];
-  for (const [kind, list] of cappedByKind) {
-    for (const item of list) {
+  const allLines = Object.entries(byKind).filter(([, list]) => list.length > 0).flatMap(
+    ([kind, list]) => list.slice(0, perKindLimit).map((item) => {
       const lineText = `- ${normalizeDisplayContent(item)}`;
-      allLines.push({
-        kind,
-        lineText,
-        lineTokens: estimateTokens(lineText)
-      });
-    }
-  }
-  allLines.sort((a, b) => {
-    const pa = KIND_PRIORITY[a.kind] ?? 99;
-    const pb = KIND_PRIORITY[b.kind] ?? 99;
-    return pa - pb;
-  });
+      return { kind, lineText, lineTokens: estimateTokens(lineText) };
+    })
+  ).sort((a, b) => (KIND_PRIORITY[a.kind] ?? 99) - (KIND_PRIORITY[b.kind] ?? 99));
   let usedTokens = 0;
   const keptByKind = {};
   for (const candidate of allLines) {
@@ -4683,7 +4664,7 @@ var rankMemoryCandidates = (items, query, context) => {
 // packages/ai/memory/runtime.ts
 var COLD_STORAGE_CONFIDENCE = 0.3;
 var MEMORY_OVERLAY_TOKEN_BUDGET = 800;
-var normalizeSelectedContent = (text) => text.trim().replace(/^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u, "").replace(/[。！？!?]+$/u, "").trim();
+var normalizeSelectedContent = (text) => text.trim().replace(EXPLICIT_REMEMBER_PREFIX_REGEX, "").replace(/[。！？!?]+$/u, "").trim();
 var STACK_TERMS = [
   "typescript",
   "javascript",
@@ -4831,6 +4812,74 @@ var resolveMemoryRuntime = async (input) => {
   };
 };
 
+// packages/cli/memoryRecall.ts
+var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceId) => {
+  try {
+    const response = await fetch(`${serverUrl}/api/memory/query`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${authToken}`
+      },
+      body: JSON.stringify({
+        agentKey,
+        userInput,
+        ...spaceId ? { spaceId } : {}
+      }),
+      signal: AbortSignal.timeout(5e3)
+    });
+    if (!response.ok) {
+      console.warn(
+        "[cli-memory] remote query returned non-ok status:",
+        response.status,
+        "\u2014 falling back to local"
+      );
+      return null;
+    }
+    const payload = await response.json().catch(() => null);
+    const block = typeof payload?.promptBlock === "string" ? payload.promptBlock.trim() : "";
+    return block || null;
+  } catch (error) {
+    console.warn("[cli-memory] remote query failed, falling back to local:", error);
+    return null;
+  }
+};
+var queryLocalMemory = async (env, agentKey, userInput, spaceId) => {
+  const localDb = await getDefaultCliLocalRuntimeDb({ env });
+  const machineId = resolveMachineId();
+  const resolution = await resolveMemoryRuntime({
+    db: localDb,
+    userId: machineId,
+    agentKey,
+    userInput,
+    ...spaceId ? { spaceId } : {}
+  });
+  return resolution.promptBlock;
+};
+var resolveCliMemory = async (input) => {
+  if (input.authToken && input.serverUrl) {
+    const remoteBlock = await queryRemoteMemory(
+      input.serverUrl,
+      input.authToken,
+      input.agentKey,
+      input.userInput,
+      input.spaceId
+    );
+    if (remoteBlock) return remoteBlock;
+  }
+  try {
+    return await queryLocalMemory(
+      input.env,
+      input.agentKey,
+      input.userInput,
+      input.spaceId
+    );
+  } catch (error) {
+    console.warn("[cli-memory] local recall failed, omitting memory layer:", error);
+    return null;
+  }
+};
+
 // packages/ai/tools/agent/quotaCircuitBreaker.ts
 var QUOTA_ERROR_PATTERNS = [
   /429/,
@@ -5154,46 +5203,15 @@ async function runAgentRunCommand(args, deps) {
     skillContentBlocks.push(...buildSkillContextBlocks(skillReferences));
     scopedLayers.push(buildSkillDiscoveryContextLayer(cliCwd));
     if (!deps.memoryRecallDisabled) {
-      const memoryServerUrl = resolveServerUrl(env);
-      const memoryAuthToken = resolveAuthToken(args, env);
-      const memoryAgentKey = effectiveAgentKey;
-      const memorySpaceId = parsed.spaceId ?? void 0;
       try {
-        const resolvedRuntimeMode = parsed.runtimeMode ?? (env.NOLO_RUNTIME_MODE === "local" || env.NOLO_RUNTIME_MODE === "server" || env.NOLO_RUNTIME_MODE === "auto" ? env.NOLO_RUNTIME_MODE : "auto");
-        const usesExplicitServerRuntime = resolvedRuntimeMode === "server";
-        if (usesExplicitServerRuntime && memoryAuthToken && memoryServerUrl) {
-          const memoryResponse = await fetch(`${memoryServerUrl}/api/memory/query`, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              Authorization: `Bearer ${memoryAuthToken}`
-            },
-            body: JSON.stringify({
-              agentKey: memoryAgentKey,
-              userInput: effectiveMessage,
-              ...memorySpaceId ? { spaceId: memorySpaceId } : {}
-            }),
-            signal: AbortSignal.timeout(5e3)
-          });
-          if (memoryResponse.ok) {
-            const memoryPayload = await memoryResponse.json().catch(() => null);
-            const block = typeof memoryPayload?.promptBlock === "string" ? memoryPayload.promptBlock.trim() : "";
-            memoryPromptBlock = block || null;
-          } else {
-            console.warn("[cli-memory] memory query returned non-ok status:", memoryResponse.status);
-          }
-        } else {
-          const localDb = await getDefaultCliLocalRuntimeDb({ env });
-          const machineId = resolveMachineId();
-          const resolution = await resolveMemoryRuntime({
-            db: localDb,
-            userId: machineId,
-            agentKey: memoryAgentKey,
-            userInput: effectiveMessage,
-            ...memorySpaceId ? { spaceId: memorySpaceId } : {}
-          });
-          memoryPromptBlock = resolution.promptBlock;
-        }
+        memoryPromptBlock = await resolveCliMemory({
+          serverUrl: resolveServerUrl(env),
+          authToken: resolveAuthToken(args, env),
+          agentKey: effectiveAgentKey,
+          userInput: effectiveMessage,
+          ...parsed.spaceId ? { spaceId: parsed.spaceId } : {},
+          env
+        });
       } catch (memoryError) {
         console.warn("[cli-memory] memory recall failed, omitting memory layer:", memoryError);
       }

package/index.js

@@ -126,7 +126,7 @@ function createDaemonShortcutCommand(path, description, command2) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args2, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-LH4RA6FA.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-QDNDC76O.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -796,7 +796,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-S4A6UYVJ.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-35GFHS37.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-SRZ4QQUP.js");
   return startTuiWorkspace({
     ...args2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.31.0-alpha.1",
+  "version": "0.31.0-alpha.2",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-S4A6UYVJ.js → readlineWorkspace-35GFHS37.js}

@@ -57,7 +57,7 @@ import {
   visibleWidth,
   wrapTextToLines,
   wrapTranscriptLine
-} from "./chunk-H6COXALE.js";
+} from "./chunk-EB5AQGXR.js";
 import "./chunk-AOS5IN2I.js";
 import "./chunk-6HYVJV7B.js";
 import {