nolo-cli 0.32.0 → 0.33.0-alpha.11

package/chunk-RQFO3CAF.js

@@ -0,0 +1,300 @@
+import {
+  getCredentialsDir
+} from "./chunk-QTZD6HBK.js";
+import {
+  asNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  asOptionalPositiveFiniteNumber
+} from "./chunk-U6VC4MU4.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
+
+// packages/agent-runtime/fileCredentialBroker.ts
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  unlinkSync,
+  writeFileSync
+} from "node:fs";
+import { join } from "node:path";
+
+// packages/agent-runtime/credentialBroker.ts
+function assertCredentialRef(ref) {
+  const trimmed = asTrimmedString(ref);
+  if (!trimmed) {
+    throw new Error("invalid_ref");
+  }
+  if (trimmed.includes("..") || trimmed.includes("/") || trimmed.includes("\\")) {
+    throw new Error("invalid_ref");
+  }
+  return trimmed;
+}
+
+// packages/agent-runtime/fileCredentialBroker.ts
+function getApiKeyCredentialsDir(homeDir) {
+  return join(getCredentialsDir(homeDir), "keys");
+}
+function credentialRefToFileName(ref) {
+  const safe = assertCredentialRef(ref).replace(/[^a-zA-Z0-9._-]+/g, "_");
+  if (!safe || safe === "." || safe === "..") {
+    throw new Error(`Credential ref is not filesystem-safe: ${ref}`);
+  }
+  return `${safe}.json`;
+}
+function getApiKeyCredentialPath(ref, homeDir) {
+  return join(getApiKeyCredentialsDir(homeDir), credentialRefToFileName(ref));
+}
+function ensurePrivateDir(dir) {
+  mkdirSync(dir, { recursive: true, mode: 448 });
+  try {
+    chmodSync(dir, 448);
+  } catch {
+  }
+}
+function writePrivateFile(path, body) {
+  writeFileSync(path, body, { encoding: "utf8", mode: 384 });
+  try {
+    chmodSync(path, 384);
+  } catch {
+  }
+}
+function readApiKeyCredential(ref, homeDir) {
+  const path = getApiKeyCredentialPath(ref, homeDir);
+  if (!existsSync(path)) return null;
+  try {
+    const raw = readFileSync(path, "utf8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed?.secret !== "string" || !parsed.secret) return null;
+    return parsed.secret;
+  } catch {
+    return null;
+  }
+}
+function writeApiKeyCredential(ref, secret, homeDir, now = Date.now()) {
+  const trimmedSecret = secret.trim();
+  if (!trimmedSecret) {
+    throw new Error("Cannot store an empty credential secret.");
+  }
+  assertCredentialRef(ref);
+  const dir = getApiKeyCredentialsDir(homeDir);
+  ensurePrivateDir(dir);
+  const path = getApiKeyCredentialPath(ref, homeDir);
+  const payload = {
+    secret: trimmedSecret,
+    updatedAt: now
+  };
+  writePrivateFile(path, `${JSON.stringify(payload, null, 2)}
+`);
+}
+function removeApiKeyCredential(ref, homeDir) {
+  assertCredentialRef(ref);
+  const path = getApiKeyCredentialPath(ref, homeDir);
+  if (!existsSync(path)) return;
+  unlinkSync(path);
+}
+function hasApiKeyCredential(ref, homeDir) {
+  return readApiKeyCredential(ref, homeDir) !== null;
+}
+function createFileCredentialBroker(options = {}) {
+  const homeDir = options.homeDir;
+  const now = options.now ?? Date.now;
+  return {
+    get(ref) {
+      return readApiKeyCredential(ref, homeDir);
+    },
+    put(ref, secret) {
+      writeApiKeyCredential(ref, secret, homeDir, now());
+    },
+    delete(ref) {
+      removeApiKeyCredential(ref, homeDir);
+    },
+    has(ref) {
+      return hasApiKeyCredential(ref, homeDir);
+    }
+  };
+}
+
+// packages/agent-runtime/migrateAgentSecrets.ts
+function buildAgentApiKeyCredentialRef(agentKey) {
+  const key = asTrimmedString(agentKey);
+  if (!key) throw new Error("agentKey is required to build a credential ref.");
+  return `api-key:${key}`;
+}
+function readRawApiKey(agent) {
+  return asTrimmedString(agent.apiKey);
+}
+function resolveTargetRef(agent) {
+  const fromCredential = asTrimmedString(agent.credentialRef);
+  if (fromCredential) return fromCredential;
+  const fromApiKeyRef = asTrimmedString(agent.apiKeyRef);
+  if (fromApiKeyRef.startsWith("api-key:")) return fromApiKeyRef;
+  return buildAgentApiKeyCredentialRef(agent.key);
+}
+async function brokerHas(broker, ref) {
+  return Boolean(await broker.has(ref));
+}
+async function brokerPut(broker, ref, secret) {
+  await broker.put(ref, secret);
+}
+async function migrateAgentSecrets(args) {
+  const { agent, broker } = args;
+  const raw = readRawApiKey(agent);
+  const migration = asTrimmedString(agent.credentialMigration);
+  if (migration === "done" && !raw) {
+    const ref = typeof agent.credentialRef === "string" && agent.credentialRef.trim() || (typeof agent.apiKeyRef === "string" && agent.apiKeyRef.startsWith("api-key:") ? agent.apiKeyRef.trim() : "") || void 0;
+    return {
+      updates: {},
+      status: "already-done",
+      ...ref ? { credentialRef: ref } : {},
+      phase: "complete"
+    };
+  }
+  if (!raw && migration !== "pending") {
+    return { updates: {}, status: "noop", phase: "none" };
+  }
+  const targetRef = resolveTargetRef(agent);
+  if (raw) {
+    await brokerPut(broker, targetRef, raw);
+    const stored2 = await brokerHas(broker, targetRef);
+    if (!stored2) {
+      return {
+        updates: {
+          credentialRef: targetRef,
+          credentialMigration: "pending"
+        },
+        status: "resumed-pending",
+        credentialRef: targetRef,
+        phase: "put"
+      };
+    }
+    return {
+      updates: {
+        apiKey: null,
+        credentialRef: targetRef,
+        // Keep apiKeyRef for resolution if not already an OAuth provider name.
+        // Prefer explicit credentialRef; set apiKeyRef only when empty so OAuth agents stay intact.
+        ...!(typeof agent.apiKeyRef === "string" && agent.apiKeyRef.trim()) ? { apiKeyRef: targetRef } : {},
+        credentialMigration: "done"
+      },
+      status: migration === "pending" ? "resumed-pending" : "migrated",
+      credentialRef: targetRef,
+      phase: "strip"
+    };
+  }
+  const stored = await brokerHas(broker, targetRef);
+  if (stored) {
+    return {
+      updates: {
+        credentialRef: targetRef,
+        credentialMigration: "done",
+        ...!(typeof agent.apiKeyRef === "string" && agent.apiKeyRef.trim()) ? { apiKeyRef: targetRef } : {}
+      },
+      status: "resumed-pending",
+      credentialRef: targetRef,
+      phase: "complete"
+    };
+  }
+  return {
+    updates: {
+      credentialRef: targetRef,
+      credentialMigration: "pending"
+    },
+    status: "awaiting-secret",
+    credentialRef: targetRef,
+    phase: "put"
+  };
+}
+function applyAgentSecretMigrationUpdates(record, updates) {
+  const next = { ...record };
+  if ("apiKey" in updates) {
+    if (updates.apiKey === null || updates.apiKey === "") {
+      delete next.apiKey;
+    } else if (typeof updates.apiKey === "string") {
+      next.apiKey = updates.apiKey;
+    }
+  }
+  if (updates.apiKeyRef !== void 0) next.apiKeyRef = updates.apiKeyRef;
+  if (updates.credentialRef !== void 0) next.credentialRef = updates.credentialRef;
+  if (updates.credentialMigration !== void 0) {
+    next.credentialMigration = updates.credentialMigration;
+  }
+  return next;
+}
+
+// packages/agent-runtime/runtimeToolPolicy.ts
+function unique(values) {
+  return [...new Set(values)];
+}
+function normalizeAgentRuntimeToolPolicy(value) {
+  if (!isRecord(value)) return void 0;
+  return {
+    version: 1,
+    ...asNonEmptyStringArray(value.agentTools).length ? { agentTools: unique(asNonEmptyStringArray(value.agentTools)) } : {},
+    ...asNonEmptyStringArray(value.runtimeTools).length ? { runtimeTools: unique(asNonEmptyStringArray(value.runtimeTools)) } : {},
+    ...isRecord(value.workspace) ? { workspace: { ...value.workspace } } : {},
+    ...isRecord(value.shell) ? { shell: { ...value.shell } } : {},
+    ...isRecord(value.isolation) ? { isolation: { ...value.isolation } } : {},
+    ...isRecord(value.git) ? { git: { ...value.git } } : {},
+    ...isRecord(value.budget) ? { budget: { ...value.budget } } : {},
+    ...isRecord(value.audit) ? { audit: { ...value.audit } } : {}
+  };
+}
+function runtimeBindingRecord(runtimeBinding) {
+  return isRecord(runtimeBinding) ? runtimeBinding : void 0;
+}
+function runtimeToolNamesFromPolicy(policy) {
+  return asNonEmptyStringArray(policy?.runtimeTools);
+}
+function readPositiveNumber(value) {
+  return asOptionalPositiveFiniteNumber(Number(value));
+}
+function resolveRequestedRuntimeToolNames(args) {
+  const runtimeBinding = runtimeBindingRecord(args.agentConfig.runtimeBinding);
+  const bindingPolicy = normalizeAgentRuntimeToolPolicy(
+    runtimeBinding?.runtimeToolPolicy
+  );
+  const bindingSnapshotPolicy = normalizeAgentRuntimeToolPolicy(
+    runtimeBinding?.runtimeToolPolicySnapshot
+  );
+  return unique([
+    ...asNonEmptyStringArray(args.agentConfig.toolNames),
+    ...runtimeToolNamesFromPolicy(
+      normalizeAgentRuntimeToolPolicy(args.agentConfig.runtimeToolPolicy)
+    ),
+    ...runtimeToolNamesFromPolicy(bindingPolicy),
+    ...runtimeToolNamesFromPolicy(bindingSnapshotPolicy)
+  ]);
+}
+function resolveCurrentRunRuntimeToolPolicy(agentConfig) {
+  const runtimeBinding = runtimeBindingRecord(agentConfig?.runtimeBinding);
+  return normalizeAgentRuntimeToolPolicy(
+    runtimeBinding?.runtimeToolPolicySnapshot ?? agentConfig?.runtimeToolPolicy ?? runtimeBinding?.runtimeToolPolicy
+  );
+}
+function resolveLocalRuntimeEnvFromPolicy(runtimeEnv, policy) {
+  return { ...runtimeEnv };
+}
+function resolveLocalWorkspaceExecutorOptionsFromPolicy(policy) {
+  const maxOutputBytes = readPositiveNumber(policy?.shell?.maxOutputBytes);
+  return {
+    ...maxOutputBytes ? { commandOutputLimit: Math.floor(maxOutputBytes) } : {}
+  };
+}
+
+export {
+  createFileCredentialBroker,
+  migrateAgentSecrets,
+  applyAgentSecretMigrationUpdates,
+  normalizeAgentRuntimeToolPolicy,
+  resolveRequestedRuntimeToolNames,
+  resolveCurrentRunRuntimeToolPolicy,
+  resolveLocalRuntimeEnvFromPolicy,
+  resolveLocalWorkspaceExecutorOptionsFromPolicy
+};

package/chunk-RY57GLGW.js

@@ -0,0 +1,188 @@
+// packages/core/chat/internalTurnEvent.ts
+function normalizeRunCompletionShape(record) {
+  const runId = String(record.runId ?? record.id ?? "");
+  const agentKey = String(record.agentKey ?? record.agent ?? "");
+  const status = String(record.status ?? "done");
+  const counters = record.activity?.counters;
+  return {
+    runId,
+    agentKey,
+    ...typeof record.agentName === "string" ? { agentName: record.agentName } : {},
+    status,
+    ...typeof record.exitCode === "number" ? { exitCode: record.exitCode } : {},
+    ...typeof record.parentDialogId === "string" ? { parentDialogId: record.parentDialogId } : {},
+    ...typeof record.dialogId === "string" ? { dialogId: record.dialogId } : {},
+    ...typeof record.ephemeral === "boolean" ? { ephemeral: record.ephemeral } : {},
+    ...record.startedAt !== void 0 ? { startedAt: record.startedAt } : {},
+    ...record.endedAt !== void 0 ? { endedAt: record.endedAt } : {},
+    ...typeof record.note === "string" ? { note: record.note } : {},
+    ...typeof record.error === "string" ? { error: record.error } : {},
+    ...typeof record.ack === "boolean" ? { ack: record.ack } : {},
+    ...counters ? {
+      activity: {
+        counters: {
+          toolCalls: typeof counters.toolCalls === "number" ? counters.toolCalls : 0,
+          llmCalls: typeof counters.llmCalls === "number" ? counters.llmCalls : 0,
+          fileEdits: typeof counters.fileEdits === "number" ? counters.fileEdits : 0
+        }
+      }
+    } : {}
+  };
+}
+function createTurnRequest(input) {
+  if (typeof input === "string") {
+    return {
+      event: { kind: "user", text: input },
+      text: input
+    };
+  }
+  if ("event" in input && typeof input.event === "object" && typeof input.text === "string") {
+    return input;
+  }
+  const event = input;
+  return {
+    event,
+    text: event.text
+  };
+}
+
+// packages/core/chat/chatQueueMachine.ts
+var initialChatQueueState = {
+  running: false,
+  queue: [],
+  drainPaused: false,
+  lastDrainError: null
+};
+function reduceChatQueue(state, event) {
+  switch (event.type) {
+    case "turn-start":
+      if (state.running && state.lastDrainError === null) return state;
+      return {
+        ...state,
+        running: true,
+        lastDrainError: null
+      };
+    case "turn-end":
+      return {
+        ...state,
+        running: false,
+        queue: event.aborted ? [] : state.queue,
+        lastDrainError: !event.ok && !event.aborted ? "previous turn failed" : state.lastDrainError
+      };
+    case "enqueue": {
+      const req = createTurnRequest(event.text);
+      if (!req.text.trim() && req.event.kind === "user") {
+        return state;
+      }
+      return {
+        ...state,
+        queue: [...state.queue, req]
+      };
+    }
+    case "dequeue":
+      if (state.queue.length === 0) return state;
+      return {
+        ...state,
+        queue: state.queue.slice(1)
+      };
+    case "clear":
+      if (state.queue.length === 0 && state.lastDrainError === null) return state;
+      return {
+        ...state,
+        queue: [],
+        lastDrainError: null
+      };
+    case "pause-drain":
+      if (state.drainPaused) return state;
+      return {
+        ...state,
+        drainPaused: true
+      };
+    case "resume-drain":
+      if (!state.drainPaused) return state;
+      return {
+        ...state,
+        drainPaused: false
+      };
+    case "drain-error":
+      return {
+        ...state,
+        lastDrainError: event.message || null
+      };
+    default:
+      return state;
+  }
+}
+function shouldDrainAfterTurnEnd(state, cleanTurnEnd) {
+  return cleanTurnEnd && !state.running && !state.drainPaused && state.queue.length > 0;
+}
+function applyChatQueueEvent(state, event) {
+  const prevQueueLen = state.queue.length;
+  const prevRunning = state.running;
+  const prevPaused = state.drainPaused;
+  const next = reduceChatQueue(state, event);
+  const outgoing = [];
+  if (next.queue.length !== prevQueueLen) {
+    outgoing.push({ type: "queue-changed", length: next.queue.length });
+  }
+  if (next.running !== prevRunning) {
+    outgoing.push({ type: "running-changed", running: next.running });
+  }
+  if (next.drainPaused !== prevPaused) {
+    outgoing.push({ type: "drain-paused-changed", paused: next.drainPaused });
+  }
+  if (event.type === "turn-end" && !event.aborted && event.ok) {
+    if (shouldDrainAfterTurnEnd(next, true)) {
+      const head = next.queue[0];
+      outgoing.push({ type: "drain-ready", text: head.text, request: head });
+    }
+  }
+  return { state: next, outgoing };
+}
+
+// packages/core/chat/chatQueueRuntime.ts
+function createChatQueueRuntime(initialState = initialChatQueueState) {
+  let state = initialState;
+  const listeners = /* @__PURE__ */ new Set();
+  const dispatch = (events) => {
+    for (const e of events) {
+      for (const l of listeners) l(e);
+    }
+  };
+  return {
+    getState: () => state,
+    send(event) {
+      const result = applyChatQueueEvent(state, event);
+      state = result.state;
+      dispatch(result.outgoing);
+      return state;
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    on(type, listener) {
+      const wrapped = (e) => {
+        if (e.type === type) {
+          listener(e);
+        }
+      };
+      listeners.add(wrapped);
+      return () => {
+        listeners.delete(wrapped);
+      };
+    },
+    dispose() {
+      listeners.clear();
+      state = initialChatQueueState;
+    }
+  };
+}
+
+export {
+  normalizeRunCompletionShape,
+  createTurnRequest,
+  createChatQueueRuntime
+};

package/{chunk-YHGHADBQ.js → chunk-SCUETSRP.js}

@@ -1,15 +1,15 @@
 import {
   trimTrailingSlash
-} from "./chunk-UDA3ZYLW.js";
+} from "./chunk-7YYHKBJP.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";