nolo-cli 0.1.7 → 0.1.9

package/client/agentRun.ts

@@ -1,167 +1,198 @@
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-
-type EnvLike = Record<string, string | undefined>;
-
-type OutputLike = {
-  write(chunk: string): unknown;
-};
-
-type RunAgentTurnOptions = {
-  agentName: string;
-  agentKey: string;
-  serverUrl: string;
-  message: string;
-  continueDialogId?: string;
-  scriptDir: string;
-  env: EnvLike;
-  output: OutputLike;
-  scriptPathExists?: (path: string) => boolean;
-  fetchImpl?: typeof fetch;
-};
-
-export type RunAgentTurnResult = {
-  exitCode: number;
-  dialogId?: string;
-};
-
-type ScriptBridgeDecision = {
-  hasAuthToken: boolean;
-  scriptPathExists: boolean;
-};
-
-export function shouldUseScriptBridge(decision: ScriptBridgeDecision) {
-  return !decision.hasAuthToken && decision.scriptPathExists;
-}
-
-function resolveAuthToken(env: EnvLike) {
-  return env.AUTH_TOKEN || env.AUTH || env.BENCHMARK_AUTH_TOKEN || "";
-}
-
-function shouldShowUsage(env: EnvLike) {
-  return env.NOLO_DEBUG === "1" || env.NOLO_SHOW_USAGE === "1";
-}
-
-function formatUsage(usage: any, dialogId: unknown) {
-  const parts: string[] = [];
-  if (typeof dialogId === "string" && dialogId) parts.push(`dialog=${dialogId}`);
-
-  const input = usage?.input_tokens ?? usage?.prompt_tokens ?? 0;
-  const output = usage?.output_tokens ?? usage?.completion_tokens ?? 0;
-  if (input || output) parts.push(`tokens=${input}+${output}`);
-
-  return parts.length ? `  (${parts.join("  ")})` : "";
-}
-
-async function runScriptBridge(options: RunAgentTurnOptions, scriptPath: string) {
-  options.output.write(`\n${options.agentName} -> working via local script...\n\n`);
-  const proc = Bun.spawn({
-    cmd: [
-      process.execPath,
-      scriptPath,
-      "--agent",
-      options.agentKey,
-      "--server",
-      options.serverUrl,
-      "--msg",
-      options.message,
-      "--no-default-test-root",
-      ...(options.continueDialogId
-        ? ["--continue", options.continueDialogId]
-        : []),
-    ],
-    stdin: "inherit",
-    stdout: "inherit",
-    stderr: "inherit",
-    env: {
-      ...process.env,
-      ...options.env,
-      ASSISTANT_LABEL: options.agentName,
-    },
-  });
-
-  const exitCode = await proc.exited;
-  if (exitCode !== 0) {
-    options.output.write(`\n[nolo] Agent run exited with code ${exitCode}.\n`);
-  }
-  return { exitCode };
-}
-
-async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string) {
-  options.output.write(`\n${options.agentName} -> working...\n`);
-
-  const fetchImpl = options.fetchImpl ?? fetch;
-  const res = await fetchImpl(`${options.serverUrl}/api/agent/run`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${authToken}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      agentKey: options.agentKey,
-      userInput: options.message,
-      runtimeContext: {
-        surface: "cli",
-        host: "terminal",
-        runtime: "bun",
-        entrypoint: "nolo-cli",
-        capabilities: ["text-io", "slash-commands"],
-      },
-      ...(options.continueDialogId
-        ? { continueDialogId: options.continueDialogId }
-        : {}),
-      stream: false,
-    }),
-  });
-
-  let data: any = {};
-  try {
-    data = await res.json();
-  } catch {
-    data = {};
-  }
-
-  if (!res.ok) {
-    options.output.write(`[nolo] Agent request failed: HTTP ${res.status}\n`);
-    if (data?.error || data?.message) {
-      options.output.write(`${data.error || data.message}\n`);
-    }
-    return { exitCode: 1 };
-  }
-
-  const content = String(data?.content ?? data?.message ?? "").trim();
-  if (content) {
-    options.output.write(`\n${options.agentName} > ${content}\n`);
-  } else {
-    options.output.write(`\n${options.agentName} > (no text response)\n`);
-  }
-
-  const usage = formatUsage(data?.usage, data?.dialogId);
-  if (usage && shouldShowUsage(options.env)) options.output.write(`${usage}\n`);
-  return {
-    exitCode: 0,
-    ...(typeof data?.dialogId === "string" && data.dialogId
-      ? { dialogId: data.dialogId }
-      : {}),
-  };
-}
-
-export async function runAgentTurn(options: RunAgentTurnOptions) {
-  const authToken = resolveAuthToken(options.env);
-  const scriptPath = join(options.scriptDir, "chatWithAgent.ts");
-  const scriptPathExists = (options.scriptPathExists ?? existsSync)(scriptPath);
-
-  if (shouldUseScriptBridge({ hasAuthToken: Boolean(authToken), scriptPathExists })) {
-    return runScriptBridge(options, scriptPath);
-  }
-
-  if (!authToken) {
-    options.output.write(
-      "[nolo] This install needs an auth token before it can talk to agents.\n" +
-        "Set AUTH_TOKEN, or use the repo-local CLI where the dev script bridge is available.\n"
-    );
-    return { exitCode: 1 };
-  }
-
-  return runHttpAgentTurn(options, authToken);
-}
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+
+type EnvLike = Record<string, string | undefined>;
+
+type OutputLike = {
+  write(chunk: string): unknown;
+};
+
+type RunAgentTurnOptions = {
+  agentName: string;
+  agentKey: string;
+  serverUrl: string;
+  message: string;
+  continueDialogId?: string;
+  scriptDir: string;
+  env: EnvLike;
+  output: OutputLike;
+  scriptPathExists?: (path: string) => boolean;
+  fetchImpl?: typeof fetch;
+};
+
+export type RunAgentTurnResult = {
+  exitCode: number;
+  dialogId?: string;
+};
+
+type ScriptBridgeDecision = {
+  hasAuthToken: boolean;
+  scriptPathExists: boolean;
+};
+
+export function shouldUseScriptBridge(decision: ScriptBridgeDecision) {
+  return !decision.hasAuthToken && decision.scriptPathExists;
+}
+
+function resolveAuthToken(env: EnvLike) {
+  return env.AUTH_TOKEN || env.AUTH || env.BENCHMARK_AUTH_TOKEN || "";
+}
+
+function shouldShowUsage(env: EnvLike) {
+  return env.NOLO_DEBUG === "1" || env.NOLO_SHOW_USAGE === "1";
+}
+
+function formatUsage(usage: any, dialogId: unknown) {
+  const parts: string[] = [];
+  if (typeof dialogId === "string" && dialogId) parts.push(`dialog=${dialogId}`);
+
+  const input = usage?.input_tokens ?? usage?.prompt_tokens ?? 0;
+  const output = usage?.output_tokens ?? usage?.completion_tokens ?? 0;
+  if (input || output) parts.push(`tokens=${input}+${output}`);
+
+  return parts.length ? `  (${parts.join("  ")})` : "";
+}
+
+function buildTransportErrorHint(serverUrl: string, error: unknown) {
+  const endpoint = `${serverUrl}/api/agent/run`;
+  const reason = error instanceof Error ? error.message : String(error);
+
+  let detail =
+    `[nolo] Could not reach ${endpoint}.\n` +
+    `Reason: ${reason}\n`;
+
+  try {
+    const parsed = new URL(serverUrl);
+    if (parsed.hostname === "127.0.0.1" || parsed.hostname === "localhost") {
+      detail +=
+        "If you meant local dev, start the local API first.\n" +
+        "Otherwise set NOLO_SERVER to a reachable server, or re-run `nolo login --server https://nolo.chat`.\n";
+      return detail;
+    }
+  } catch {
+    // Keep the generic hint below when serverUrl is not a valid absolute URL.
+  }
+
+  detail +=
+    "Check NOLO_SERVER / BASE_URL and make sure the configured server is reachable.\n";
+  return detail;
+}
+
+async function runScriptBridge(options: RunAgentTurnOptions, scriptPath: string) {
+  options.output.write(`\n${options.agentName} -> working via local script...\n\n`);
+  const proc = Bun.spawn({
+    cmd: [
+      process.execPath,
+      scriptPath,
+      "--agent",
+      options.agentKey,
+      "--server",
+      options.serverUrl,
+      "--msg",
+      options.message,
+      "--no-default-test-root",
+      ...(options.continueDialogId
+        ? ["--continue", options.continueDialogId]
+        : []),
+    ],
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit",
+    env: {
+      ...process.env,
+      ...options.env,
+      ASSISTANT_LABEL: options.agentName,
+    },
+  });
+
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) {
+    options.output.write(`\n[nolo] Agent run exited with code ${exitCode}.\n`);
+  }
+  return { exitCode };
+}
+
+async function runHttpAgentTurn(options: RunAgentTurnOptions, authToken: string) {
+  options.output.write(`\n${options.agentName} -> working...\n`);
+
+  const fetchImpl = options.fetchImpl ?? fetch;
+  let res: Response;
+  try {
+    res = await fetchImpl(`${options.serverUrl}/api/agent/run`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        agentKey: options.agentKey,
+        userInput: options.message,
+        runtimeContext: {
+          surface: "cli",
+          host: "terminal",
+          runtime: "bun",
+          entrypoint: "nolo-cli",
+          capabilities: ["text-io", "slash-commands"],
+        },
+        ...(options.continueDialogId
+          ? { continueDialogId: options.continueDialogId }
+          : {}),
+        stream: false,
+      }),
+    });
+  } catch (error) {
+    options.output.write(buildTransportErrorHint(options.serverUrl, error));
+    return { exitCode: 1 };
+  }
+
+  let data: any = {};
+  try {
+    data = await res.json();
+  } catch {
+    data = {};
+  }
+
+  if (!res.ok) {
+    options.output.write(`[nolo] Agent request failed: HTTP ${res.status}\n`);
+    if (data?.error || data?.message) {
+      options.output.write(`${data.error || data.message}\n`);
+    }
+    return { exitCode: 1 };
+  }
+
+  const content = String(data?.content ?? data?.message ?? "").trim();
+  if (content) {
+    options.output.write(`\n${options.agentName} > ${content}\n`);
+  } else {
+    options.output.write(`\n${options.agentName} > (no text response)\n`);
+  }
+
+  const usage = formatUsage(data?.usage, data?.dialogId);
+  if (usage && shouldShowUsage(options.env)) options.output.write(`${usage}\n`);
+  return {
+    exitCode: 0,
+    ...(typeof data?.dialogId === "string" && data.dialogId
+      ? { dialogId: data.dialogId }
+      : {}),
+  };
+}
+
+export async function runAgentTurn(options: RunAgentTurnOptions) {
+  const authToken = resolveAuthToken(options.env);
+  const scriptPath = join(options.scriptDir, "chatWithAgent.ts");
+  const scriptPathExists = (options.scriptPathExists ?? existsSync)(scriptPath);
+
+  if (shouldUseScriptBridge({ hasAuthToken: Boolean(authToken), scriptPathExists })) {
+    return runScriptBridge(options, scriptPath);
+  }
+
+  if (!authToken) {
+    options.output.write(
+      "[nolo] This install needs an auth token before it can talk to agents.\n" +
+        "Set AUTH_TOKEN, or use the repo-local CLI where the dev script bridge is available.\n"
+    );
+    return { exitCode: 1 };
+  }
+
+  return runHttpAgentTurn(options, authToken);
+}

package/client/compactDialog.ts

@@ -0,0 +1,222 @@
+// packages/cli/client/compactDialog.ts
+// HTTP-only compact helper for CLI TUI (no Redux store available).
+
+import { ulid } from "ulid";
+
+const DB_PATH = "/api/v1/db";
+
+/**
+ * Extract userId from a JWT-style auth token without verifying the signature.
+ * Mirrors the logic of `parseToken` in `auth/token.ts` without the crypto imports.
+ * @internal - exported for testing only
+ */
+export function parseTokenUserId(token: string): string | null {
+  try {
+    const parts = token.split(".");
+    if (parts.length < 2) return null;
+    const payloadBase64 = parts[1];
+    const payload = JSON.parse(
+      Buffer.from(payloadBase64, "base64").toString("utf8")
+    );
+    return typeof payload?.userId === "string" ? payload.userId : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Extract the custom ID (ULID) from a dialog key like `dialog-{userId}-{id}`.
+ * Mirrors `extractCustomId` from `core/prefix` without importing it.
+ */
+function extractCustomId(key: string): string {
+  const parts = key.split("-");
+  return parts.slice(2).join("-");
+}
+
+async function readDialogRecord(
+  fetchImpl: typeof fetch,
+  serverUrl: string,
+  authToken: string,
+  dialogKey: string
+): Promise<Record<string, unknown>> {
+  const res = await fetchImpl(`${serverUrl}${DB_PATH}/read/${dialogKey}`, {
+    headers: { Authorization: `Bearer ${authToken}` },
+  });
+  if (!res.ok) {
+    throw new Error(`Failed to read dialog "${dialogKey}": HTTP ${res.status}`);
+  }
+  const data = await res.json();
+  return data as Record<string, unknown>;
+}
+
+/**
+ * Fields carried forward from the source dialog into the fork.
+ * Conversation summary/compression state is intentionally excluded so the new
+ * dialog starts clean: summary, summarizedBeforeId, proactiveSummary,
+ * proactiveSummaryBeforeId, compressionCount, summaryPending must NOT be
+ * inherited — they describe the old conversation, not the fork.
+ */
+const FORKED_CARRY_FIELDS = [
+  "cybots",
+  "type",
+  "title",
+  "spaceId",
+  "category",
+  "referenceKeys",
+  "triggerType",
+  "schedule",
+  "taskPrompt",
+  "executionMode",
+] as const;
+
+function buildForkedDialogRecord(
+  current: Record<string, unknown>,
+  userId: string
+): Record<string, unknown> & { dbKey: string; id: string } {
+  const newId = ulid();
+  const dbKey = `dialog-${userId}-${newId}`;
+  const now = new Date().toISOString();
+
+  // Explicitly pick only the allowed fields — never spread `current` wholesale.
+  const carried: Record<string, unknown> = {};
+  for (const field of FORKED_CARRY_FIELDS) {
+    if (current[field] !== undefined) {
+      carried[field] = current[field];
+    }
+  }
+
+  return {
+    ...carried,
+    id: newId,
+    dbKey,
+    inheritedFromDialogKey: current.dbKey,
+    inheritedFromDialogTitle: current.title,
+    createdAt: now,
+    updatedAt: now,
+    // reset per-dialog stats
+    inputTokens: 0,
+    outputTokens: 0,
+    totalCost: 0,
+  };
+}
+
+async function writeDialogRecord(
+  fetchImpl: typeof fetch,
+  serverUrl: string,
+  authToken: string,
+  record: Record<string, unknown> & { dbKey: string }
+): Promise<void> {
+  const res = await fetchImpl(`${serverUrl}${DB_PATH}/write/`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${authToken}`,
+    },
+    body: JSON.stringify({ data: record, customKey: record.dbKey }),
+  });
+  if (!res.ok) {
+    throw new Error(
+      `Failed to write forked dialog "${record.dbKey}": HTTP ${res.status}`
+    );
+  }
+}
+
+/**
+ * Best-effort: register the forked dialog in the space sidebar.
+ * Failure here is non-fatal since the dialog is already stored.
+ */
+async function addDialogToSpaceIfNeeded(
+  fetchImpl: typeof fetch,
+  serverUrl: string,
+  authToken: string,
+  record: Record<string, unknown> & { dbKey: string }
+): Promise<void> {
+  const rawSpaceId = record.spaceId;
+  if (!rawSpaceId || typeof rawSpaceId !== "string") return;
+
+  const normalizedSpaceId = rawSpaceId.startsWith("space-")
+    ? rawSpaceId.slice("space-".length)
+    : rawSpaceId;
+  const spaceKey = `space-${normalizedSpaceId}`;
+  const now = Date.now();
+
+  const contentEntry = {
+    title: typeof record.title === "string" ? record.title : record.id,
+    type: "dialog",
+    contentKey: record.dbKey,
+    pinned: false,
+    createdAt: now,
+    updatedAt: now,
+  };
+
+  try {
+    const res = await fetchImpl(`${serverUrl}${DB_PATH}/patch/${spaceKey}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${authToken}`,
+      },
+      body: JSON.stringify({ contents: { [record.dbKey]: contentEntry } }),
+    });
+    if (!res.ok) {
+      console.warn(
+        `[nolo] compact: addDialogToSpace failed for ${spaceKey}: HTTP ${res.status}`
+      );
+    }
+  } catch (error) {
+    console.warn(`[nolo] compact: addDialogToSpace error: ${error}`);
+  }
+}
+
+export type CompactDialogResult = {
+  dialogId: string;
+  dialogKey: string;
+  spaceId?: string;
+};
+
+/**
+ * Compact the current dialog by forking it:
+ * 1. Read the current dialog config from the server.
+ * 2. Build a new dialog record that inherits from the old one.
+ * 3. Write the new record to the server.
+ * 4. Register the new dialog in the space sidebar (best-effort).
+ *
+ * Returns the new dialog's ID so the TUI can switch to it.
+ */
+export async function compactDialog(options: {
+  serverUrl: string;
+  authToken: string;
+  dialogId: string;
+  fetchImpl?: typeof fetch;
+}): Promise<CompactDialogResult> {
+  const fetchImpl = options.fetchImpl ?? fetch;
+
+  const userId = parseTokenUserId(options.authToken);
+  if (!userId) {
+    throw new Error(
+      "[nolo] compact: cannot compact — invalid or missing auth token"
+    );
+  }
+
+  const dialogKey = `dialog-${userId}-${options.dialogId}`;
+  const current = await readDialogRecord(
+    fetchImpl,
+    options.serverUrl,
+    options.authToken,
+    dialogKey
+  );
+  const next = buildForkedDialogRecord(current, userId);
+  await writeDialogRecord(fetchImpl, options.serverUrl, options.authToken, next);
+  await addDialogToSpaceIfNeeded(
+    fetchImpl,
+    options.serverUrl,
+    options.authToken,
+    next
+  );
+
+  return {
+    dialogId: extractCustomId(next.dbKey),
+    dialogKey: next.dbKey,
+    spaceId: typeof next.spaceId === "string" ? next.spaceId : undefined,
+  };
+}

package/commandRegistry.ts

@@ -19,6 +19,7 @@ export const COMMANDS: CommandEntry[] = [
 
   { path: ["dialog", "read"], script: "readDialog.ts", description: "Read a dialog" },
   { path: ["space", "read"], script: "readSpace.ts", description: "Read a space" },
+  { path: ["space", "delete"], script: "deleteSpaces.ts", description: "Delete spaces by safe filters" },
   { path: ["space", "category"], script: "upsertSpaceCategory.ts", description: "Create or update a space category" },
   { path: ["space", "content-category"], script: "setSpaceContentCategory.ts", description: "Move content into a space category" },
 
@@ -28,6 +29,9 @@ export const COMMANDS: CommandEntry[] = [
   { path: ["agent", "list"], script: "listMyAgents.ts", description: "List owned agents" },
   { path: ["agent", "read"], script: "readAgent.ts", description: "Read a single agent" },
   { path: ["agent", "update"], script: "updateAgent.ts", description: "Update agent fields" },
+  { path: ["agent", "bind-current"], script: "", description: "Bind an agent to this machine" },
+  { path: ["agent", "smoke-current"], script: "", description: "Smoke test a bound agent through this machine" },
+  { path: ["agent", "runtime-doctor"], script: "", description: "Diagnose current machine runtime compatibility" },
   { path: ["agent", "unpublish"], script: "unpublishAgent.ts", description: "Remove an agent's public record" },
   { path: ["agent", "chat"], script: "chatWithAgent.ts", description: "Chat with an agent" },
   { path: ["agent", "dialogs"], script: "queryAgentDialogs.ts", description: "Inspect recent dialogs for an agent" },
@@ -70,13 +74,23 @@ export function renderHelpText() {
     "  nolo chat",
     "  nolo login",
     "  nolo whoami",
+    "  nolo connect",
+    "  nolo connect --watch",
+    "  nolo connect --ws",
+    "  nolo connect --daemon",
+    "  nolo daemon --server-url https://api.nolo.chat --api-key sk_machine_xxx",
+    "  nolo machine status",
     "  nolo doctor",
     "  nolo update",
     '  nolo doc create --title "Trip Notes" --body "hello"',
     '  nolo skill-doc create --title "Agent Query Skill" --description "Inspect recent agent dialogs"',
     "  nolo agent list --json",
     "  nolo agent read agent-pub-01APPBUILDER00000001YAII3I",
+    "  nolo agent bind-current agent-user-1-agent-1",
+    "  nolo agent runtime-doctor agent-user-1-agent-1",
+    '  nolo agent smoke-current agent-user-1-agent-1 --msg "ping"',
     '  nolo chat --agent agent-pub-01APPBUILDER00000001YAII3I --msg "你好"',
+    "  nolo space delete --name-prefix rn_owner_verify_0504 --yes",
     "  nolo table data --table 01ABCXYZ --action query",
     "  nolo llama status",
   ];