nolo-cli 0.1.32 → 0.1.33

package/commandRegistry.ts

@@ -55,8 +55,8 @@ export function renderHelpText() {
     "  nolo doctor",
     "  nolo doctor runtime",
     "  nolo update",
-    '  nolo doc create --title "Trip Notes" --body "hello" --space 01SPACEID --dry-run',
-    '  nolo skill-doc create --title "Agent Query Skill" --description "Inspect recent agent dialogs" --space 01SPACEID',
+    '  nolo doc create --title "Trip Notes" --body "hello" --sync local,us --dry-run',
+    '  nolo skill-doc create --title "Agent Query Skill" --description "Inspect recent agent dialogs" --sync local,main,us',
     "  nolo agent list --json",
     "  nolo space list --json",
     "  nolo agent pull agent-pub-01APPBUILDER00000001YAII3I",
@@ -64,7 +64,6 @@ export function renderHelpText() {
     '  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",
-    '  nolo agent smoke-bound agent-user-1-agent-1 --msg "ping"',
     '  nolo agent smoke-current agent-user-1-agent-1 --msg "ping"',
     '  nolo chat --agent agent-pub-01APPBUILDER00000001YAII3I --msg "你好"',
     "  nolo space read 01KKY77TT0DA9NY7TNW3R7255N --content-key page-user-id --brief",

package/connectorRunArtifact.ts

@@ -24,46 +24,22 @@ function normalizePath(value: string) {
   return resolve(value.trim());
 }
 
-function resolveExistingCandidate(
-  value: string | undefined,
-  checked: string[],
-  label: string
-) {
-  const trimmed = value?.trim();
-  if (!trimmed) return null;
-  const normalized = normalizePath(trimmed);
-  if (existsSync(normalized)) return normalized;
-  checked.push(`${label}=${normalized}`);
-  return null;
-}
-
 export function resolveConnectorRunCwd(args: {
   env?: EnvLike;
   policy: MachineRunPermissionPolicy;
   fallbackCwd?: string;
 }) {
-  const checked: string[] = [];
-  const candidates: Array<[string | undefined, string]> = [
-    [args.env?.NOLO_CONNECTOR_WORKDIR, "NOLO_CONNECTOR_WORKDIR"],
-    [args.env?.NOLO_AGENT_WORKDIR, "NOLO_AGENT_WORKDIR"],
-    [args.env?.NOLO_LOCAL_WORKTREE, "NOLO_LOCAL_WORKTREE"],
-    [args.policy.writableRoots[0], "writableRoots[0]"],
-    [args.fallbackCwd, "fallbackCwd"],
-    [process.env.PWD, "PWD"],
-    [process.cwd(), "process.cwd()"],
-  ];
-
-  for (const [value, label] of candidates) {
-    const resolved = resolveExistingCandidate(value, checked, label);
-    if (resolved) return resolved;
-  }
-
-  if (checked.length > 0) {
-    throw new Error(
-      `Connector run cwd does not exist. Checked: ${checked.join(", ")}`
-    );
+  const explicit =
+    args.env?.NOLO_CONNECTOR_WORKDIR ||
+    args.env?.NOLO_AGENT_WORKDIR ||
+    args.env?.NOLO_LOCAL_WORKTREE ||
+    "";
+  const candidate = explicit || args.policy.writableRoots[0] || args.fallbackCwd || process.cwd();
+  const cwd = normalizePath(candidate);
+  if (!existsSync(cwd)) {
+    throw new Error(`Connector run cwd does not exist: ${cwd}`);
   }
-  throw new Error("Connector run cwd could not be resolved.");
+  return cwd;
 }
 
 async function runGit(

package/connectorWebSocketTarget.ts

@@ -49,18 +49,14 @@ function parseRetryAfterMs(response: Response, bodyRetryAfterMs?: unknown) {
 export async function resolveConnectorWebSocketTarget(input: {
   serverUrl: string;
   machineId: string;
-  connectorSurface?: string;
   headers: Record<string, string>;
   fetchImpl?: typeof fetch;
 }) {
   const directWsUrl = new URL(input.serverUrl);
   directWsUrl.protocol = directWsUrl.protocol === "https:" ? "wss:" : "ws:";
   directWsUrl.pathname = "/api/connector/ws";
-  directWsUrl.search = "";
-  directWsUrl.searchParams.set("machineId", input.machineId);
-  if (input.connectorSurface?.trim()) {
-    directWsUrl.searchParams.set("connectorSurface", input.connectorSurface.trim().toLowerCase());
-  }
+  directWsUrl.search = "";
+  directWsUrl.searchParams.set("machineId", input.machineId);
 
   const probeUrl = new URL(input.serverUrl);
   probeUrl.pathname = "/api/connector/ws";
@@ -103,7 +99,7 @@ export async function resolveConnectorWebSocketTarget(input: {
   }
 
   const json = await response.json().catch(() => null);
-  return typeof json?.wsUrl === "string" && json.wsUrl
-    ? json.wsUrl
-    : directWsUrl.toString();
-}
+  return typeof json?.wsUrl === "string" && json.wsUrl
+    ? json.wsUrl
+    : directWsUrl.toString();
+}

package/database/server/db.ts

@@ -1,17 +1,37 @@
 // 文件路径: packages/database/server/db.ts
 
+import { Level } from "level";
+import path from "path";
+import fs from "fs";
 import { ensureDbOpen } from "./ensureDbOpen";
 import { resolveServerDbPath } from "./dbPath";
-import type { LegacyServerDb } from "./legacyServerDb";
-import type { AuthorityStore } from "./authorityStoreTypes";
-import { getOrCreateServerStoreRuntime } from "./serverStoreFactory";
 
 const DB_PATH = resolveServerDbPath();
 
+// 确保目录存在
+if (!fs.existsSync(path.dirname(DB_PATH))) {
+  fs.mkdirSync(path.dirname(DB_PATH), { recursive: true });
+}
+
 console.log("数据库配置:");
 console.log("- 当前工作目录:", process.cwd());
 console.log("- 数据库路径:", DB_PATH);
 
+// 安全 JSON 编码：解码失败时返回 null 而非抛异常，防止损坏记录导致进程崩溃
+const safeJsonEncoding = {
+  name: "safe-json",
+  format: "utf8" as const,
+  encode: (data: any) => JSON.stringify(data),
+  decode: (data: string) => {
+    try {
+      return JSON.parse(data);
+    } catch {
+      console.warn("[LevelDB] Corrupted value:", data?.substring?.(0, 60));
+      return null;
+    }
+  },
+};
+
 export function isServerDbLockError(error: unknown): boolean {
   const queue: unknown[] = [error];
   const seen = new Set<unknown>();
@@ -35,11 +55,13 @@ export function isServerDbLockError(error: unknown): boolean {
   return false;
 }
 
-const {
-  authorityStore,
-  serverDb,
-}: { authorityStore: AuthorityStore; serverDb: LegacyServerDb } =
-  getOrCreateServerStoreRuntime(DB_PATH);
+// 单例实例：挂在 globalThis 上，--hot 模式下模块重新求值时复用同一实例，避免 LevelDB 锁冲突
+if (!(globalThis as any).__serverDb) {
+  (globalThis as any).__serverDb = new Level<string, any>(DB_PATH, {
+    valueEncoding: safeJsonEncoding,
+  });
+}
+const serverDb: Level<string, any> = (globalThis as any).__serverDb;
 
 console.log("- LevelDB实际路径:", serverDb.location);
 
@@ -48,9 +70,6 @@ export default serverDb;
 
 // 具名导出：需要的时候可以引用
 export { serverDb };
-export function getServerAuthorityStore() {
-  return authorityStore;
-}
 
 /**
  * 确保数据库处于 open 状态。
@@ -58,11 +77,11 @@ export function getServerAuthorityStore() {
  * - 其他状态：尝试 open，一旦失败抛错
  */
 export async function ensureServerDbOpen() {
-  const status = authorityStore.status;
+  const status = (serverDb as any).status;
   if (status === "open") return;
 
   try {
-    await ensureDbOpen(authorityStore);
+    await ensureDbOpen(serverDb);
     if (status !== "opening") {
       console.log("✅ LevelDB 已打开");
     }
@@ -87,11 +106,11 @@ export async function openServerDb() {
  * 优雅关机时关闭 DB
  */
 export async function closeServerDb() {
-  const status = authorityStore.status;
+  const status = (serverDb as any).status;
   if (status !== "open") return;
 
   try {
-    await authorityStore.close();
+    await serverDb.close();
     console.log("✅ LevelDB 已关闭");
   } catch (err) {
     console.error("❌ 关闭 LevelDB 失败:", err);

package/internalCommandEntries.ts

@@ -1,20 +1,12 @@
 import { getAgentInternalCommandEntries } from "./agentInternalCommandEntries";
 import type { CommandEntry } from "./cliCommandTypes";
-import { getDialogInternalCommandEntries } from "./dialogInternalCommandEntries";
-import { getDocInternalCommandEntries } from "./docInternalCommandEntries";
-import { getRuntimeInternalCommandEntries } from "./runtimeInternalCommandEntries";
-import { getSpaceInternalCommandEntries } from "./spaceInternalCommandEntries";
 import { getSystemInternalCommandEntries } from "./systemInternalCommandEntries";
 import { getWorkflowInternalCommandEntries } from "./workflowInternalCommandEntries";
 
 export function getInternalCommandEntries(renderHelpText: () => string): CommandEntry[] {
   return [
     ...getAgentInternalCommandEntries(),
-    ...getDialogInternalCommandEntries(),
-    ...getDocInternalCommandEntries(),
-    ...getSpaceInternalCommandEntries(),
     ...getWorkflowInternalCommandEntries(),
-    ...getRuntimeInternalCommandEntries(),
     ...getSystemInternalCommandEntries(renderHelpText),
   ];
 }

package/localRuntimeDb.ts

@@ -20,46 +20,9 @@ export function buildCliLocalRuntimeDbEnv(env: EnvLike = process.env) {
   };
 }
 
-export function isCliLocalRuntimeDbLockError(error: unknown): boolean {
-  const queue: unknown[] = [error];
-  const seen = new Set<unknown>();
-
-  while (queue.length > 0) {
-    const current = queue.shift();
-    if (!current || seen.has(current)) continue;
-    seen.add(current);
-
-    const text = `${(current as any)?.code ?? ""} ${(current as any)?.message ?? current}`;
-    if (/LEVEL_LOCKED|Resource temporarily unavailable|\/LOCK|LOCK:|db locked|locked/i.test(text)) {
-      return true;
-    }
-
-    if ((current as any)?.cause) queue.push((current as any).cause);
-    if (Array.isArray((current as any)?.errors)) queue.push(...(current as any).errors);
-  }
-
-  return false;
-}
-
-export function formatCliLocalRuntimeDbOpenError(dbPath: string, error: unknown) {
-  if (!isCliLocalRuntimeDbLockError(error)) {
-    return error instanceof Error ? error : new Error(String(error));
-  }
-  return new Error(
-    `CLI local runtime DB is locked at ${dbPath}. Another nolo local runtime is already using it. ` +
-      "Stop the other local runtime, rerun without --local, or set NOLO_SERVER_DB_PATH to a different cache path.",
-    { cause: error instanceof Error ? error : undefined }
-  );
-}
-
 export async function getDefaultCliLocalRuntimeDb(): Promise<CliLocalRuntimeDb> {
-  const dbPath = buildCliLocalRuntimeDbEnv(process.env).NOLO_SERVER_DB_PATH;
-  process.env.NOLO_SERVER_DB_PATH = dbPath;
+  process.env.NOLO_SERVER_DB_PATH = buildCliLocalRuntimeDbEnv(process.env).NOLO_SERVER_DB_PATH;
   const { default: serverDb, ensureServerDbOpen } = await import("./database/server/db");
-  try {
-    await ensureServerDbOpen();
-  } catch (error) {
-    throw formatCliLocalRuntimeDbOpenError(dbPath, error);
-  }
+  await ensureServerDbOpen();
   return serverDb as CliLocalRuntimeDb;
 }