nolo-cli 0.1.32 → 0.1.34

package/cli/agentRecordCommands.ts

@@ -2,6 +2,7 @@ import { resolveCliAgentKeyInput } from "./agentAliases";
 import { getReadableCliDb, type AgentCommandDeps } from "./agentCommandSupport";
 import {
   buildUpdatedAgentRecord,
+  buildCreatedAgentRecord,
   normalizeAgentRecordForOutput,
   parseAgentUpdateArgs,
   resolveAgentRecordFromHybridStore,
@@ -17,7 +18,7 @@ export async function runAgentReadCommand(
   const output = deps.output ?? process.stdout;
   const agentInput = args[0]?.trim();
   if (!agentInput || agentInput === "--help" || agentInput === "-h") {
-    output.write("Usage: nolo agent read <agent> [--server <url>]\n");
+    output.write("Usage: nolo agent read <agent>\n");
     return agentInput ? 0 : 1;
   }
 
@@ -141,3 +142,85 @@ export async function runAgentUpdateCommand(
     return 1;
   }
 }
+
+export async function runAgentCreateCommand(
+  args: string[],
+  deps: AgentCommandDeps = {}
+) {
+  const env = deps.env ?? process.env;
+  const output = deps.output ?? process.stdout;
+  let parsed;
+  try {
+    parsed = parseAgentUpdateArgs(args);
+  } catch (error) {
+    output.write(`[nolo] agent create failed: ${error instanceof Error ? error.message : String(error)}\n`);
+    return 1;
+  }
+  if (!parsed) {
+    output.write(
+      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--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"
+    );
+    return args[0] ? 0 : 1;
+  }
+
+  const authToken = resolveAuthToken(args, env);
+  if (!authToken) {
+    output.write("[nolo] agent create requires an auth token. Run `nolo login` or set AUTH_TOKEN.\n");
+    return 1;
+  }
+
+  const userId = parseUserIdFromAuthToken(authToken);
+  if (!userId) {
+    output.write("[nolo] agent create could not read userId from AUTH_TOKEN.\n");
+    return 1;
+  }
+
+  const db = deps.db ?? await getReadableCliDb(output);
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  const fallbackFetchImpl = deps.fallbackFetchImpl;
+
+  try {
+    const built = await buildCreatedAgentRecord({
+      cliArgs: args,
+      parsed,
+      env,
+      db,
+      fetchImpl,
+      fallbackFetchImpl,
+      authToken,
+    });
+
+    await writeAgentRecord({
+      agentKey: built.agentKey,
+      authToken,
+      fallbackFetchImpl,
+      fetchImpl,
+      serverUrl: built.serverUrl,
+      userId,
+      record: built.nextRecord,
+    });
+    await db.put(built.agentKey, {
+      ...built.nextRecord,
+      dbKey: built.agentKey,
+      key: built.nextRecord?.key || built.agentKey,
+      serverOrigin: built.serverUrl,
+    });
+
+    output.write(JSON.stringify({
+      ok: true,
+      agentKey: built.agentKey,
+      baseUrl: built.serverUrl,
+      updates: built.updates,
+      record: built.nextRecord,
+    }, null, 2));
+    output.write("\n");
+    return 0;
+  } catch (error) {
+    output.write(
+      `[nolo] agent create failed: ${
+        error instanceof Error ? error.message : String(error)
+      }\n`
+    );
+    return 1;
+  }
+}

package/cli/agentRecordHelpers.ts

@@ -1,14 +1,8 @@
 import { readFileSync } from "node:fs";
-import {
-  buildPrivateAgentKey,
-  buildCurrentUserPlatformAgentCandidateKeys,
-  resolveCliAgentKeyInput,
-  resolvePlatformAgentAliasSpec,
-} from "./agentAliases";
+import { resolveCliAgentKeyInput } from "./agentAliases";
 import type { CliKvDb } from "./client/hybridRecordStore";
 import { buildLocalAgentLookupKeys, shouldReadAgentKeyRemotely } from "./client/localAgentRecords";
 import {
-  hasExplicitServerOverride,
   parseUserIdFromAuthToken,
   readOption,
   resolveAuthToken,
@@ -16,7 +10,6 @@ import {
   resolveServerUrl,
   type EnvLike,
 } from "./cliEnvHelpers";
-import { parseSpaceIdFromInput, readSpaceRecordWithFallback } from "./spaceMutationHelpers";
 
 const PROVIDER_COPY_FIELDS = [
   "apiSource",
@@ -155,13 +148,10 @@ export async function queryUserRecords(args: {
   fetchImpl: typeof fetch;
   serverUrl: string;
   userId: string;
-  type: "agent" | "cybot" | "dialog";
-  limit?: number;
+  type: "agent" | "cybot";
 }) {
   const res = await fetchWithTransportFallback(
-    `${args.serverUrl}/api/v1/db/query/${encodeURIComponent(args.userId)}${
-      typeof args.limit === "number" && Number.isFinite(args.limit) ? `?limit=${args.limit}` : ""
-    }`,
+    `${args.serverUrl}/api/v1/db/query/${encodeURIComponent(args.userId)}`,
     {
       method: "POST",
       headers: {
@@ -191,26 +181,6 @@ export async function writeAgentRecord(args: {
   serverUrl: string;
   userId: string;
   record: Record<string, any>;
-}) {
-  return writeDbRecord({
-    authToken: args.authToken,
-    dbKey: args.agentKey,
-    fallbackFetchImpl: args.fallbackFetchImpl,
-    fetchImpl: args.fetchImpl,
-    record: args.record,
-    serverUrl: args.serverUrl,
-    userId: args.userId,
-  });
-}
-
-export async function writeDbRecord(args: {
-  authToken: string;
-  dbKey: string;
-  fallbackFetchImpl?: typeof fetch;
-  fetchImpl: typeof fetch;
-  serverUrl: string;
-  userId: string;
-  record: Record<string, any>;
 }) {
   const res = await fetchWithTransportFallback(`${args.serverUrl}/api/v1/db/write/`, {
     method: "POST",
@@ -219,11 +189,11 @@ export async function writeDbRecord(args: {
       "Content-Type": "application/json",
     },
     body: JSON.stringify({
-      customKey: args.dbKey,
+      customKey: args.agentKey,
       userId: args.userId,
       data: {
         ...args.record,
-        dbKey: args.dbKey,
+        dbKey: args.agentKey,
       },
     }),
   }, args);
@@ -233,40 +203,6 @@ export async function writeDbRecord(args: {
   }
 }
 
-export async function deleteDbRecord(args: {
-  authToken: string;
-  dbKey: string;
-  fallbackFetchImpl?: typeof fetch;
-  fetchImpl: typeof fetch;
-  serverUrl: string;
-  userId: string;
-}) {
-  const res = await fetchWithTransportFallback(
-    `${args.serverUrl}/api/v1/db/delete/${encodeURIComponent(args.dbKey)}?userId=${encodeURIComponent(args.userId)}`,
-    {
-      method: "DELETE",
-      headers: {
-        Authorization: `Bearer ${args.authToken}`,
-      },
-    },
-    args
-  );
-  const text = await res.text();
-  let data: any = {};
-  if (text) {
-    try {
-      data = JSON.parse(text);
-    } catch {
-      data = {};
-    }
-  }
-  if (res.status === 404) return "missing" as const;
-  if (!res.ok && res.status !== 204) {
-    throw new Error(`delete failed: HTTP ${res.status} ${JSON.stringify(data)}`);
-  }
-  return "deleted" as const;
-}
-
 export async function resolveAgentRecordFromHybridStore(args: {
   agentInput: string;
   cliArgs?: string[];
@@ -276,102 +212,36 @@ export async function resolveAgentRecordFromHybridStore(args: {
   fallbackFetchImpl?: typeof fetch;
 }) {
   const agentKey = resolveCliAgentKeyInput(args.agentInput);
-  const authToken = resolveAuthToken(args.cliArgs ?? [], args.env);
-  const currentUserId = parseUserIdFromAuthToken(authToken);
-  const cliArgs = args.cliArgs ?? [];
-  const defaultServerUrl = resolveServerUrl(cliArgs, args.env);
-  const serverCandidates = resolveServerCandidates(cliArgs, args.env, defaultServerUrl);
-  const preferRemote = hasExplicitServerOverride(cliArgs);
-  const aliasSpec = resolvePlatformAgentAliasSpec(args.agentInput);
-  const rawSpaceInput = readOption(cliArgs, "--space");
-  const preferredLookupKeys = buildCurrentUserPlatformAgentCandidateKeys(
-    args.agentInput,
-    currentUserId
-  );
-  const collectSpaceAttachedCandidateKeys = (spaceRecord: any) => {
-    const contents = spaceRecord?.contents;
-    if (!contents || typeof contents !== "object") return [];
-
-    const currentUserPrivateKey =
-      currentUserId ? buildPrivateAgentKey(currentUserId, aliasSpec!.agentId) : null;
-    const canonicalMatches: string[] = [];
-    const otherMatches: string[] = [];
-    const currentUserMatches: string[] = [];
-
-    for (const [entryKey, value] of Object.entries(contents)) {
-      if (!value || typeof value !== "object") continue;
-      const contentKey =
-        typeof (value as any).contentKey === "string" && (value as any).contentKey.trim()
-          ? (value as any).contentKey.trim()
-          : entryKey.trim();
-      if (!contentKey || !contentKey.endsWith(`-${aliasSpec!.agentId}`)) continue;
-      if (contentKey === aliasSpec!.canonicalKey) {
-        canonicalMatches.push(contentKey);
-        continue;
-      }
-      if (currentUserPrivateKey && contentKey === currentUserPrivateKey) {
-        currentUserMatches.push(contentKey);
-        continue;
-      }
-      otherMatches.push(contentKey);
-    }
-
-    return Array.from(
-      new Set([
-        ...canonicalMatches.sort(),
-        ...otherMatches.sort(),
-        ...currentUserMatches.sort(),
-      ])
-    );
-  };
-  const resolveSpaceAttachedCandidateKeys = async () => {
-    if (!aliasSpec || !rawSpaceInput || !authToken) return [];
+  const authToken = args.cliArgs
+    ? resolveAuthToken(args.cliArgs, args.env)
+    : resolveAuthToken(args.env);
+  const defaultServerUrl = args.cliArgs
+    ? resolveServerUrl(args.cliArgs, args.env)
+    : resolveServerUrl(args.env);
+
+  for (const key of buildLocalAgentLookupKeys({
+    agentRef: agentKey,
+    userId: parseUserIdFromAuthToken(authToken) || "local",
+  })) {
     try {
-      const spaceId = parseSpaceIdFromInput(rawSpaceInput);
-      let localSpaceRecord: any = null;
-      try {
-        localSpaceRecord = await args.db.get(`space-${spaceId}`);
-      } catch {
-        localSpaceRecord = null;
-      }
-
-      const localMatches = collectSpaceAttachedCandidateKeys(localSpaceRecord);
-      if (localMatches.length > 0) return localMatches;
-
-      const spaceRecord = await readSpaceRecordWithFallback({
-        authToken,
-        db: {
-          ...args.db,
-          get: async () => {
-            throw new Error("force remote refresh for shared space alias resolution");
-          },
-        },
-        fallbackFetchImpl: args.fallbackFetchImpl,
-        fetchImpl: args.fetchImpl,
-        serverCandidates,
-        spaceId,
-      });
-      if (spaceRecord && typeof args.db.put === "function") {
-        await args.db.put(`space-${spaceId}`, spaceRecord);
+      const record = await args.db.get(key);
+      if (record && typeof record === "object") {
+        return {
+          agentKey: key,
+          record,
+          source: record?.serverOrigin ? "remote-cache" : "local-cache",
+        } as const;
       }
-      return collectSpaceAttachedCandidateKeys(spaceRecord);
     } catch {
-      return [];
+      // local miss
     }
-  };
-  const spaceAttachedLookupKeys = await resolveSpaceAttachedCandidateKeys();
-  const lookupKeys =
-    spaceAttachedLookupKeys.length > 0
-      ? Array.from(new Set([...spaceAttachedLookupKeys, ...preferredLookupKeys]))
-      : preferredLookupKeys.length > 0
-        ? preferredLookupKeys
-      : buildLocalAgentLookupKeys({
-          agentRef: agentKey,
-          userId: currentUserId || "local",
-        });
 
-  const readRemoteRecord = async (key: string) => {
-    for (const serverUrl of serverCandidates) {
+    if (!shouldReadAgentKeyRemotely(key)) continue;
+    for (const serverUrl of (
+      args.cliArgs
+        ? resolveServerCandidates(args.cliArgs, args.env, defaultServerUrl)
+        : resolveServerCandidates(args.env, defaultServerUrl)
+    )) {
       try {
         const remoteRecord = await readAgentRecord({
           agentKey: key,
@@ -391,31 +261,6 @@ export async function resolveAgentRecordFromHybridStore(args: {
         // try next
       }
     }
-    return null;
-  };
-
-  for (const key of lookupKeys) {
-    if (preferRemote && shouldReadAgentKeyRemotely(key)) {
-      const remoteFirst = await readRemoteRecord(key);
-      if (remoteFirst) return remoteFirst;
-    }
-
-    try {
-      const record = await args.db.get(key);
-      if (record && typeof record === "object") {
-        return {
-          agentKey: key,
-          record,
-          source: record?.serverOrigin ? "remote-cache" : "local-cache",
-        } as const;
-      }
-    } catch {
-      // local miss
-    }
-
-    if (!shouldReadAgentKeyRemotely(key)) continue;
-    const remoteFallback = await readRemoteRecord(key);
-    if (remoteFallback) return remoteFallback;
   }
 
   return null;
@@ -454,6 +299,8 @@ export function parseAgentUpdateArgs(args: string[]) {
   const tools = readOption(args, "--tools");
   const copyProviderFrom = readOption(args, "--copy-provider-from");
   const name = readOption(args, "--name");
+  const customProviderUrl = readOption(args, "--custom-provider-url");
+  const apiKey = readOption(args, "--api-key");
 
   const promptSources = [prompt, promptFile, promptDoc].filter(Boolean);
   if (promptSources.length > 1) {
@@ -468,6 +315,8 @@ export function parseAgentUpdateArgs(args: string[]) {
   if (promptFile) updates.prompt = readFileSync(promptFile, "utf8");
   if (tools) updates.tools = parseJsonishValue(tools);
   if (name) updates.name = name;
+  if (customProviderUrl) updates.customProviderUrl = customProviderUrl;
+  if (apiKey) updates.apiKey = apiKey;
 
   for (const entry of readRepeatedOption(args, "--field")) {
     const index = entry.indexOf("=");
@@ -486,6 +335,71 @@ export function parseAgentUpdateArgs(args: string[]) {
   return { agentInput, updates, promptDoc, copyProviderFrom };
 }
 
+export async function buildCreatedAgentRecord(args: {
+  cliArgs?: string[];
+  parsed: NonNullable<ReturnType<typeof parseAgentUpdateArgs>>;
+  env: EnvLike;
+  db: CliKvDb;
+  fetchImpl: typeof fetch;
+  fallbackFetchImpl?: typeof fetch;
+  authToken: string;
+}) {
+  const agentKey = resolveCliAgentKeyInput(args.parsed.agentInput);
+  const serverUrl = args.cliArgs ? resolveServerUrl(args.cliArgs, args.env) : resolveServerUrl(args.env);
+
+  if (args.parsed.copyProviderFrom) {
+    const providerSource = await resolveAgentRecordFromHybridStore({
+      agentInput: args.parsed.copyProviderFrom,
+      cliArgs: args.cliArgs,
+      env: args.env,
+      db: args.db,
+      fetchImpl: args.fetchImpl,
+      fallbackFetchImpl: args.fallbackFetchImpl,
+    });
+    if (!providerSource) {
+      throw new Error(`provider source agent not found: ${args.parsed.copyProviderFrom}`);
+    }
+    for (const field of PROVIDER_COPY_FIELDS) {
+      if (field in providerSource.record) {
+        args.parsed.updates[field] = providerSource.record[field];
+      }
+    }
+  }
+
+  if (args.parsed.promptDoc) {
+    const promptDoc = await readDbRecord({
+      dbKey: args.parsed.promptDoc,
+      authToken: args.authToken,
+      fallbackFetchImpl: args.fallbackFetchImpl,
+      fetchImpl: args.fetchImpl,
+      serverUrl,
+    });
+    const promptBody = typeof promptDoc?.content === "string" ? promptDoc.content : "";
+    if (!promptBody.trim()) {
+      throw new Error(`prompt doc is empty or unreadable: ${args.parsed.promptDoc}`);
+    }
+    args.parsed.updates.prompt = promptBody;
+  }
+
+  const userId = parseUserIdFromAuthToken(args.authToken);
+
+  const nextRecord = {
+    ...args.parsed.updates,
+    dbKey: agentKey,
+    key: agentKey,
+    createdAt: Date.now(),
+    updatedAt: Date.now(),
+    userId,
+  };
+
+  return {
+    agentKey,
+    serverUrl,
+    nextRecord,
+    updates: args.parsed.updates,
+  };
+}
+
 export async function buildUpdatedAgentRecord(args: {
   cliArgs?: string[];
   parsed: NonNullable<ReturnType<typeof parseAgentUpdateArgs>>;
@@ -504,7 +418,9 @@ export async function buildUpdatedAgentRecord(args: {
     fallbackFetchImpl: args.fallbackFetchImpl,
   });
   const agentKey = cached?.agentKey ?? resolveCliAgentKeyInput(args.parsed.agentInput);
-  const serverUrl = cached?.record?.serverOrigin ?? resolveServerUrl(args.cliArgs ?? [], args.env);
+  const serverUrl = cached?.record?.serverOrigin ?? (
+    args.cliArgs ? resolveServerUrl(args.cliArgs, args.env) : resolveServerUrl(args.env)
+  );
   const currentRecord = await readAgentRecord({
     agentKey,
     authToken: args.authToken,