nolo-cli 0.1.45 → 0.1.46

package/cliCommandAdapters.ts

@@ -1,28 +0,0 @@
-import type { CliCommandHandler, CliRuntimeContext } from "./cliCommandTypes";
-
-export function withCliEnv<TDeps extends { env: NodeJS.ProcessEnv }>(
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CliCommandHandler {
-  return (args: string[], ctx: CliRuntimeContext) =>
-    command(args, { env: ctx.env } as TDeps);
-}
-
-export function withCliEnvAndScriptDir<TDeps extends { env: NodeJS.ProcessEnv; scriptDir: string }>(
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CliCommandHandler {
-  return (args: string[], ctx: CliRuntimeContext) =>
-    command(args, {
-      env: ctx.env,
-      scriptDir: ctx.scriptDir,
-    } as TDeps);
-}
-
-export function withCliEntrypointEnv<TDeps extends { env: NodeJS.ProcessEnv; cliEntrypointPath: string }>(
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CliCommandHandler {
-  return (args: string[], ctx: CliRuntimeContext) =>
-    command(args, {
-      env: ctx.env,
-      cliEntrypointPath: ctx.entrypointPath,
-    } as TDeps);
-}

package/cliCommandDispatch.ts

@@ -1,66 +0,0 @@
-import { fileURLToPath } from "node:url";
-import type { CliPackageInfo, CliRuntimeContext, CommandEntry } from "./cliCommandTypes";
-
-export async function runResolvedCommand(
-  command: CommandEntry,
-  originalArgs: string[],
-  ctx: CliRuntimeContext,
-  deps: {
-    runScript: (script: string, forwardedArgs: string[], env: NodeJS.ProcessEnv) => Promise<number>;
-  }
-) {
-  if (command.kind === "internal") {
-    if (!command.handler) {
-      throw new Error(`Internal command ${command.path.join(" ")} is missing a handler.`);
-    }
-    return command.handler(originalArgs.slice(command.path.length), ctx);
-  }
-
-  if (!command.script) {
-    throw new Error(`Script command ${command.path.join(" ")} is missing a script.`);
-  }
-
-  const forwardedArgs = [...(command.fixedArgs ?? []), ...originalArgs.slice(command.path.length)];
-  return deps.runScript(command.script, forwardedArgs, ctx.env);
-}
-
-function readOption(args: string[], flag: string) {
-  const index = args.indexOf(flag);
-  return index >= 0 ? args[index + 1] : undefined;
-}
-
-function buildDaemonEnv(args: string[], runtimeEnv: NodeJS.ProcessEnv) {
-  const serverUrl = readOption(args, "--server-url") || readOption(args, "--server");
-  const apiKey = readOption(args, "--machine-key") || readOption(args, "--token");
-  return {
-    ...runtimeEnv,
-    ...(serverUrl ? { NOLO_SERVER: serverUrl } : {}),
-    ...(apiKey ? { AUTH_TOKEN: apiKey } : {}),
-  };
-}
-
-export function looksLikeDaemonShortcut(args: string[]) {
-  return args.includes("--server-url") || args.includes("--machine-key");
-}
-
-export function createCliRuntimeContext(args: {
-  env: NodeJS.ProcessEnv;
-  scriptDir: string;
-  entrypointPath?: string;
-  packageInfo: CliPackageInfo;
-}): CliRuntimeContext {
-  return {
-    env: args.env,
-    scriptDir: args.scriptDir,
-    entrypointPath: args.entrypointPath ?? fileURLToPath(import.meta.url),
-    packageInfo: args.packageInfo,
-  };
-}
-
-export function withDaemonShortcutArgs(args: string[], runtimeEnv: NodeJS.ProcessEnv) {
-  if (!looksLikeDaemonShortcut(args)) return { commandArgs: args, envOverride: null as NodeJS.ProcessEnv | null };
-  return {
-    commandArgs: ["daemon", ...args],
-    envOverride: buildDaemonEnv(args, runtimeEnv),
-  };
-}

package/cliCommandFactories.ts

@@ -1,66 +0,0 @@
-import {
-  withCliEntrypointEnv,
-  withCliEnv,
-  withCliEnvAndScriptDir,
-} from "./cliCommandAdapters";
-import { withDaemonShortcutArgs } from "./cliCommandDispatch";
-import {
-  createInternalCommand,
-  type CliRuntimeContext,
-  type CliCommandHandler,
-  type CommandEntry,
-} from "./cliCommandTypes";
-
-export function createEnvCommand<TDeps extends { env: NodeJS.ProcessEnv }>(
-  path: string[],
-  description: string,
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, withCliEnv(command) as CliCommandHandler);
-}
-
-export function createEnvScriptDirCommand<TDeps extends { env: NodeJS.ProcessEnv; scriptDir: string }>(
-  path: string[],
-  description: string,
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, withCliEnvAndScriptDir(command) as CliCommandHandler);
-}
-
-export function createEntrypointEnvCommand<TDeps extends { env: NodeJS.ProcessEnv; cliEntrypointPath: string }>(
-  path: string[],
-  description: string,
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, withCliEntrypointEnv(command) as CliCommandHandler);
-}
-
-export function createArgsCommand(
-  path: string[],
-  description: string,
-  command: (args: string[]) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, (args) => command(args));
-}
-
-export function createContextCommand(
-  path: string[],
-  description: string,
-  command: (args: string[], ctx: CliRuntimeContext) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, command as CliCommandHandler);
-}
-
-export function createDaemonShortcutCommand<TDeps extends { env: NodeJS.ProcessEnv; cliEntrypointPath: string }>(
-  path: string[],
-  description: string,
-  command: (args: string[], deps: TDeps) => Promise<number>
-): CommandEntry {
-  return createInternalCommand(path, description, (args, ctx) => {
-    const normalized = withDaemonShortcutArgs(args, ctx.env);
-    return command(["--ws"], {
-      env: normalized.envOverride ?? ctx.env,
-      cliEntrypointPath: ctx.entrypointPath,
-    } as TDeps);
-  });
-}

package/cliCommandTypes.ts

@@ -1,49 +0,0 @@
-import type { readPackageInfo } from "./updateCommands";
-
-export type CliPackageInfo = ReturnType<typeof readPackageInfo>;
-
-export type CliRuntimeContext = {
-  env: NodeJS.ProcessEnv;
-  scriptDir: string;
-  entrypointPath: string;
-  packageInfo: CliPackageInfo;
-};
-
-export type CliCommandHandler = (args: string[], ctx: CliRuntimeContext) => Promise<number>;
-
-export type CommandEntry = {
-  path: string[];
-  description: string;
-  kind: "internal" | "script";
-  script?: string;
-  fixedArgs?: string[];
-  handler?: CliCommandHandler;
-};
-
-export function createScriptCommand(
-  path: string[],
-  script: string,
-  description: string,
-  fixedArgs?: string[]
-): CommandEntry {
-  return {
-    path,
-    kind: "script",
-    script,
-    description,
-    ...(fixedArgs ? { fixedArgs } : {}),
-  };
-}
-
-export function createInternalCommand(
-  path: string[],
-  description: string,
-  handler: CliCommandHandler
-): CommandEntry {
-  return {
-    path,
-    kind: "internal",
-    description,
-    handler,
-  };
-}

package/cliEnvHelpers.ts

@@ -1,116 +0,0 @@
-import { DEFAULT_NOLO_SERVER_URL } from "./defaultServer";
-import { NOLO_CLUSTER_SERVERS } from "./database/config";
-
-export type EnvLike = Record<string, string | undefined>;
-
-export function resolveServerUrlFromEnv(env: EnvLike) {
-  return (env.NOLO_SERVER || env.BASE_URL || DEFAULT_NOLO_SERVER_URL).replace(/\/+$/, "");
-}
-
-type ResolverInput = string[] | EnvLike;
-
-function isCliArgs(value: ResolverInput): value is string[] {
-  return Array.isArray(value);
-}
-
-function buildServerCandidates(values: Array<string | null | undefined>) {
-  return [...new Set(
-    values
-      .filter((value): value is string => typeof value === "string" && value.trim().length > 0)
-      .map((value) => value.replace(/\/+$/, ""))
-  )];
-}
-
-export function resolveServerUrl(env: EnvLike): string;
-export function resolveServerUrl(args: string[], env: EnvLike): string;
-export function resolveServerUrl(input: ResolverInput, env?: EnvLike) {
-  if (isCliArgs(input)) {
-    const explicit =
-      readOption(input, "--server-url") ||
-      readOption(input, "--server");
-    return explicit?.replace(/\/+$/, "") || resolveServerUrlFromEnv(env ?? {});
-  }
-  return resolveServerUrlFromEnv(input);
-}
-
-export function resolveServerCandidates(env: EnvLike, preferred?: string | null): string[];
-export function resolveServerCandidates(
-  args: string[],
-  env: EnvLike,
-  preferred?: string | null,
-): string[];
-export function resolveServerCandidates(
-  input: ResolverInput,
-  envOrPreferred?: EnvLike | string | null,
-  preferred?: string | null,
-) {
-  if (isCliArgs(input)) {
-    const env = (envOrPreferred ?? {}) as EnvLike;
-    const explicitServer = resolveServerUrl(input, env);
-    return buildServerCandidates([
-      explicitServer,
-      preferred?.trim(),
-      env.NOLO_SERVER,
-      env.BASE_URL,
-      env.NOLO_SERVER_URL,
-      DEFAULT_NOLO_SERVER_URL,
-      ...NOLO_CLUSTER_SERVERS,
-    ]);
-  }
-
-  const env = input;
-  return buildServerCandidates([
-    typeof envOrPreferred === "string" ? envOrPreferred.trim() : undefined,
-    env.NOLO_SERVER,
-    env.BASE_URL,
-    env.NOLO_SERVER_URL,
-    DEFAULT_NOLO_SERVER_URL,
-    ...NOLO_CLUSTER_SERVERS,
-  ]);
-}
-
-export function resolveAuthTokenFromEnv(env: EnvLike, extraEnvKeys: string[] = []) {
-  for (const key of ["AUTH_TOKEN", "AUTH", ...extraEnvKeys]) {
-    const value = env[key];
-    if (typeof value === "string" && value.trim()) return value;
-  }
-  return "";
-}
-
-export function resolveAuthToken(env: EnvLike, extraEnvKeys?: string[]): string;
-export function resolveAuthToken(args: string[], env: EnvLike, extraEnvKeys?: string[]): string;
-export function resolveAuthToken(
-  input: ResolverInput,
-  envOrExtraEnvKeys?: EnvLike | string[],
-  extraEnvKeys: string[] = [],
-) {
-  if (isCliArgs(input)) {
-    const env = (envOrExtraEnvKeys ?? {}) as EnvLike;
-    return (
-      readOption(input, "--token") ||
-      readOption(input, "--machine-key") ||
-      resolveAuthTokenFromEnv(env, extraEnvKeys)
-    );
-  }
-  return resolveAuthTokenFromEnv(input, (envOrExtraEnvKeys as string[] | undefined) ?? []);
-}
-
-export function parseUserIdFromAuthToken(token: string) {
-  const parts = token.trim().split(".").filter(Boolean);
-  const payloadCandidates = parts.length >= 3 ? [parts[1], parts[0]] : [parts[0]];
-  for (const payload of payloadCandidates) {
-    if (!payload) continue;
-    try {
-      const parsed = JSON.parse(Buffer.from(payload, "base64").toString("utf8"));
-      if (typeof parsed?.userId === "string") return parsed.userId;
-    } catch {
-      // Try the next token shape.
-    }
-  }
-  return "";
-}
-
-export function readOption(args: string[], flag: string) {
-  const index = args.indexOf(flag);
-  return index >= 0 ? args[index + 1] : undefined;
-}

package/cliSpaceHelpers.ts

@@ -1,39 +0,0 @@
-export function normalizeSpaceIdInput(rawInput: string) {
-  const raw = rawInput.trim();
-  if (!raw) return "";
-
-  if (raw.startsWith("http://") || raw.startsWith("https://")) {
-    const url = new URL(raw);
-    const match = url.pathname.match(/^\/space\/([^/?#]+)/);
-    if (match?.[1]) return decodeURIComponent(match[1]);
-  }
-
-  return raw.startsWith("space-") ? raw.slice("space-".length) : raw;
-}
-
-export function buildSpaceLookup(rawInput: string) {
-  const spaceId = normalizeSpaceIdInput(rawInput);
-  return {
-    spaceId,
-    spaceKey: spaceId.startsWith("space-") ? spaceId : `space-${spaceId}`,
-  };
-}
-
-export function getSpaceContentKeys(spaceRecord: any): Set<string> {
-  const keys = new Set<string>();
-  const contents = spaceRecord?.contents;
-  if (!contents || typeof contents !== "object") return keys;
-
-  for (const [entryKey, value] of Object.entries(contents)) {
-    if (typeof entryKey === "string" && entryKey.trim()) {
-      keys.add(entryKey.trim());
-    }
-    if (value && typeof value === "object") {
-      const contentKey = (value as any).contentKey;
-      if (typeof contentKey === "string" && contentKey.trim()) {
-        keys.add(contentKey.trim());
-      }
-    }
-  }
-  return keys;
-}

package/client/agentConfigResolver.test.ts

@@ -1,69 +0,0 @@
-import { describe, expect, test } from "bun:test";
-
-import { resolveAgentRuntimeConfigFromRecord } from "./agentConfigResolver";
-
-describe("agent config resolver", () => {
-  test("keeps complete runtime-relevant agent config while normalizing tools", () => {
-    const rawRecord = {
-      dbKey: "agent-user-1-frontend",
-      key: "agent-user-1-frontend",
-      name: "Frontend implementer",
-      prompt: "Fix UI carefully.",
-      model: "gpt-5.4",
-      provider: "openai",
-      apiSource: "platform",
-      cliProvider: "codex",
-      customProviderUrl: "https://provider.example/v1",
-      toolNames: ["legacyTool", "readFile"],
-      tools: ["readFile", "editFile"],
-      runtimeBinding: { machineId: "machine-1" },
-      delegation: { target: "local" },
-      temperature: 0.2,
-      top_p: 0.9,
-      max_tokens: 4096,
-      reasoning_effort: "medium",
-    };
-
-    expect(resolveAgentRuntimeConfigFromRecord("agent-user-1-frontend", rawRecord)).toEqual({
-      key: "agent-user-1-frontend",
-      name: "Frontend implementer",
-      prompt: "Fix UI carefully.",
-      model: "gpt-5.4",
-      provider: "openai",
-      apiSource: "platform",
-      cliProvider: "codex",
-      customProviderUrl: "https://provider.example/v1",
-      toolNames: ["legacyTool", "readFile", "editFile"],
-      runtimeBinding: { machineId: "machine-1" },
-      delegation: { target: "local" },
-      temperature: 0.2,
-      top_p: 0.9,
-      max_tokens: 4096,
-      reasoning_effort: "medium",
-      rawRecord,
-    });
-  });
-
-  test("falls back provider to apiSource and tools to tools", () => {
-    expect(resolveAgentRuntimeConfigFromRecord("agent-user-1-cli", {
-      apiSource: "cli",
-      tools: ["execShell"],
-    })).toMatchObject({
-      key: "agent-user-1-cli",
-      provider: "cli",
-      apiSource: "cli",
-      toolNames: ["execShell"],
-    });
-  });
-
-  test("returns a minimal config for sparse records", () => {
-    expect(resolveAgentRuntimeConfigFromRecord("agent-user-1-empty", {
-      dbKey: "agent-user-1-empty",
-    })).toEqual({
-      key: "agent-user-1-empty",
-      rawRecord: {
-        dbKey: "agent-user-1-empty",
-      },
-    });
-  });
-});

package/client/agentConfigResolver.ts

@@ -1 +0,0 @@
-export { resolveAgentRuntimeConfigFromRecord } from "../agentRuntimeLocal";