@naisys/common 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/agentConfigFile.js

@@ -1,119 +1,92 @@
 import { z } from "zod";
 import { TARGET_MEGAPIXELS } from "./constants.js";
 import { URL_SAFE_KEY_MESSAGE, URL_SAFE_KEY_REGEX } from "./urlSafeKey.js";
-export const commandProtectionValues = ["none", "manual", "semi-auto", "auto"];
+export const commandProtectionValues = [
+    "none",
+    "manual",
+    "semi-auto",
+    "auto",
+];
 // Zod schema for validation
 export const AgentConfigFileSchema = z.object({
-  username: z
-    .string()
-    .min(1, "Username is required")
-    .regex(URL_SAFE_KEY_REGEX, URL_SAFE_KEY_MESSAGE)
-    .describe(
-      "The name the agent identifies itself with when communicating with other agents",
-    ),
-  title: z
-    .string()
-    .describe(
-      "Displayed to other agents to give context about this agent's role in the system",
-    ),
-  agentPrompt: z
-    .string()
-    .min(1, "Agent prompt is required")
-    .describe(
-      "Gives the agent instructions and/or purpose when starting up. Supports ${agent.*} and ${env.*} template variables",
-    ),
-  spendLimitDollars: z
-    .number()
-    .min(0, "Must be non-negative")
-    .optional()
-    .describe(
-      "Spend limit in dollars for this agent. When set, this agent is exempt from the global spend limit. Defaults to the SPEND_LIMIT_DOLLARS variable",
-    ),
-  spendLimitHours: z
-    .number()
-    .min(0, "Must be non-negative")
-    .optional()
-    .describe(
-      "Rolling time window in hours for spend limit, defaults to the SPEND_LIMIT_HOURS variable. If neither are set then the spend limit is fixed and not rolling",
-    ),
-  tokenMax: z
-    .number()
-    .int("Must be a whole number")
-    .min(1, "Must be at least 1")
-    .describe(
-      "How many tokens this agent is allocated per session before it must end or compact the context",
-    ),
-  shellModel: z
-    .string()
-    .min(1, "Shell model is required")
-    .describe("Primary LLM used for shell interactions"),
-  imageModel: z.string().optional().describe("Model used for image generation"),
-  mailEnabled: z
-    .boolean()
-    .optional()
-    .describe(
-      "Show mail commands to the agent. Mail encourages verbose communication which can be distracting",
-    ),
-  chatEnabled: z
-    .boolean()
-    .optional()
-    .describe(
-      "Show chat commands to the agent. Chat encourages more concise communication",
-    ),
-  webEnabled: z
-    .boolean()
-    .optional()
-    .describe("Allow agent to browse the web with Lynx, a text based browser"),
-  completeSessionEnabled: z
-    .boolean()
-    .optional()
-    .describe(
-      "Allow the agent to end its session. Once ended, it can only be restarted explicitly or via mail if wakeOnMessage is enabled. Disable on root agents to prevent the system from going unresponsive",
-    ),
-  debugPauseSeconds: z
-    .number()
-    .int("Must be a whole number")
-    .min(0, "Must be non-negative")
-    .optional()
-    .describe(
-      "Seconds to wait at the debug prompt before auto-continuing, only applies when the agent's console is in focus. Unset waits indefinitely for manual input",
-    ),
-  wakeOnMessage: z
-    .boolean()
-    .optional()
-    .describe(
-      "When mail or chat is received, start the agent automatically, or wake it from its wait state",
-    ),
-  commandProtection: z
-    .enum(commandProtectionValues)
-    .optional()
-    .describe(
-      "None allows the LLM to run any command, Manual requires user confirmation for each command, and Auto uses a secondary LLM to try to validate a command is safe",
-    ),
-  initialCommands: z
-    .array(z.string())
-    .optional()
-    .describe(
-      "Shell commands to run at session start before the first LLM prompt, providing additional context to the agent",
-    ),
-  multipleCommandsEnabled: z
-    .boolean()
-    .optional()
-    .describe(
-      "Allow the LLM to run multiple commands per turn. Faster but the LLM may get ahead of itself and produce errors",
-    ),
-  workspacesEnabled: z
-    .boolean()
-    .optional()
-    .describe(
-      "Experimental: Allows the LLM to pin files to the end of the context. Each turn the agent sees the latest version without old versions taking up context space",
-    ),
-  controlDesktop: z
-    .boolean()
-    .optional()
-    .describe(
-      `Allow the agent to operate the desktop GUI. Requires a model with supportsComputerUse. Ideal screen resolution <= ${TARGET_MEGAPIXELS}MP to avoid downscaling`,
-    ),
+    username: z
+        .string()
+        .min(1, "Username is required")
+        .regex(URL_SAFE_KEY_REGEX, URL_SAFE_KEY_MESSAGE)
+        .describe("The name the agent identifies itself with when communicating with other agents"),
+    title: z
+        .string()
+        .describe("Displayed to other agents to give context about this agent's role in the system"),
+    agentPrompt: z
+        .string()
+        .min(1, "Agent prompt is required")
+        .describe("Gives the agent instructions and/or purpose when starting up. Supports ${agent.*} and ${env.*} template variables"),
+    spendLimitDollars: z
+        .number()
+        .min(0, "Must be non-negative")
+        .optional()
+        .describe("Spend limit in dollars for this agent. When set, this agent is exempt from the global spend limit. Defaults to the SPEND_LIMIT_DOLLARS variable"),
+    spendLimitHours: z
+        .number()
+        .min(0, "Must be non-negative")
+        .optional()
+        .describe("Rolling time window in hours for spend limit, defaults to the SPEND_LIMIT_HOURS variable. If neither are set then the spend limit is fixed and not rolling"),
+    tokenMax: z
+        .number()
+        .int("Must be a whole number")
+        .min(1, "Must be at least 1")
+        .describe("How many tokens this agent is allocated per session before it must end or compact the context"),
+    shellModel: z
+        .string()
+        .min(1, "Shell model is required")
+        .describe("Primary LLM used for shell interactions"),
+    imageModel: z.string().optional().describe("Model used for image generation"),
+    mailEnabled: z
+        .boolean()
+        .optional()
+        .describe("Show mail commands to the agent. Mail encourages verbose communication which can be distracting"),
+    chatEnabled: z
+        .boolean()
+        .optional()
+        .describe("Show chat commands to the agent. Chat encourages more concise communication"),
+    webEnabled: z
+        .boolean()
+        .optional()
+        .describe("Allow agent to browse the web with Lynx, a text based browser"),
+    completeSessionEnabled: z
+        .boolean()
+        .optional()
+        .describe("Allow the agent to end its session. Once ended, it can only be restarted explicitly or via mail if wakeOnMessage is enabled. Disable on root agents to prevent the system from going unresponsive"),
+    debugPauseSeconds: z
+        .number()
+        .int("Must be a whole number")
+        .min(0, "Must be non-negative")
+        .optional()
+        .describe("Seconds to wait at the debug prompt before auto-continuing, only applies when the agent's console is in focus. Unset waits indefinitely for manual input"),
+    wakeOnMessage: z
+        .boolean()
+        .optional()
+        .describe("When mail or chat is received, start the agent automatically, or wake it from its wait state"),
+    commandProtection: z
+        .enum(commandProtectionValues)
+        .optional()
+        .describe("None allows the LLM to run any command, Manual requires user confirmation for each command, and Auto uses a secondary LLM to try to validate a command is safe"),
+    initialCommands: z
+        .array(z.string())
+        .optional()
+        .describe("Shell commands to run at session start before the first LLM prompt, providing additional context to the agent"),
+    multipleCommandsEnabled: z
+        .boolean()
+        .optional()
+        .describe("Allow the LLM to run multiple commands per turn. Faster but the LLM may get ahead of itself and produce errors"),
+    workspacesEnabled: z
+        .boolean()
+        .optional()
+        .describe("Experimental: Allows the LLM to pin files to the end of the context. Each turn the agent sees the latest version without old versions taking up context space"),
+    controlDesktop: z
+        .boolean()
+        .optional()
+        .describe(`Allow the agent to operate the desktop GUI. Requires a model with supportsComputerUse. Ideal screen resolution <= ${TARGET_MEGAPIXELS}MP to avoid downscaling`),
 });
 /**
  * Thoughts on the admin user:
@@ -127,31 +100,30 @@ export const AgentConfigFileSchema = z.object({
  * 6. Having it as an official user means mail will be logged by the hub as well which is helpful for debugging and monitoring
  */
 export function buildDefaultAgentConfig(username) {
-  return {
-    username,
-    title: "Assistant",
+    return {
+        username,
+        title: "Assistant",
+        shellModel: "none",
+        agentPrompt: "You are ${agent.username} a ${agent.title} with the job of helping out the admin with what they want to do.",
+        tokenMax: 20000,
+        debugPauseSeconds: 5,
+        mailEnabled: true,
+        chatEnabled: true,
+        webEnabled: true,
+        wakeOnMessage: true,
+        completeSessionEnabled: true,
+        multipleCommandsEnabled: true,
+    };
+}
+export const adminAgentConfig = {
+    username: "admin", // Must be "admin" for special handling in hub and supervisor
+    title: "Admin",
     shellModel: "none",
-    agentPrompt:
-      "You are ${agent.username} a ${agent.title} with the job of helping out the admin with what they want to do.",
-    tokenMax: 20000,
-    debugPauseSeconds: 5,
+    agentPrompt: "Human admin for monitoring and control.",
+    tokenMax: 100_000,
     mailEnabled: true,
     chatEnabled: true,
-    webEnabled: true,
     wakeOnMessage: true,
-    completeSessionEnabled: true,
-    multipleCommandsEnabled: true,
-  };
-}
-export const adminAgentConfig = {
-  username: "admin", // Must be "admin" for special handling in hub and supervisor
-  title: "Admin",
-  shellModel: "none",
-  agentPrompt: "Human admin for monitoring and control.",
-  tokenMax: 100_000,
-  mailEnabled: true,
-  chatEnabled: true,
-  wakeOnMessage: true,
-  webEnabled: true,
-  spendLimitDollars: 1, // Required on all agents
+    webEnabled: true,
+    spendLimitDollars: 1, // Required on all agents
 };

package/dist/agentStatus.js

@@ -1,11 +1,15 @@
 export function determineAgentStatus(opts) {
-  // Priority: disabled > offline > suspended > active > available
-  if (!opts.isEnabled) return "disabled";
-  const isOffline = opts.assignedHostIds?.length
-    ? !opts.assignedHostIds.some(opts.isHostOnline)
-    : !opts.hasNonRestrictedOnlineHost;
-  if (isOffline) return "offline";
-  if (opts.isSuspended) return "suspended";
-  if (opts.isActive) return "active";
-  return "available";
+    // Priority: disabled > offline > suspended > active > available
+    if (!opts.isEnabled)
+        return "disabled";
+    const isOffline = opts.assignedHostIds?.length
+        ? !opts.assignedHostIds.some(opts.isHostOnline)
+        : !opts.hasNonRestrictedOnlineHost;
+    if (isOffline)
+        return "offline";
+    if (opts.isSuspended)
+        return "suspended";
+    if (opts.isActive)
+        return "active";
+    return "available";
 }

package/dist/authCache.js

@@ -1,40 +1,41 @@
 export class AuthCache {
-  cache = new Map();
-  ttlMs;
-  negativeTtlMs;
-  maxSize;
-  constructor(options = {}) {
-    this.ttlMs = options.ttlMs ?? 60_000;
-    this.negativeTtlMs = options.negativeTtlMs ?? 10_000;
-    this.maxSize = options.maxSize ?? 1_000;
-  }
-  /** Returns the cached user, `null` for a negative hit, or `undefined` on cache miss. */
-  get(key) {
-    const entry = this.cache.get(key);
-    if (!entry) return undefined;
-    if (Date.now() > entry.expiresAt) {
-      this.cache.delete(key);
-      return undefined;
+    cache = new Map();
+    ttlMs;
+    negativeTtlMs;
+    maxSize;
+    constructor(options = {}) {
+        this.ttlMs = options.ttlMs ?? 60_000;
+        this.negativeTtlMs = options.negativeTtlMs ?? 10_000;
+        this.maxSize = options.maxSize ?? 1_000;
     }
-    return entry.user;
-  }
-  /** Cache a lookup result. Pass `null` to cache a negative (invalid token) result. */
-  set(key, user) {
-    if (this.cache.size >= this.maxSize) {
-      const firstKey = this.cache.keys().next().value;
-      this.cache.delete(firstKey);
+    /** Returns the cached user, `null` for a negative hit, or `undefined` on cache miss. */
+    get(key) {
+        const entry = this.cache.get(key);
+        if (!entry)
+            return undefined;
+        if (Date.now() > entry.expiresAt) {
+            this.cache.delete(key);
+            return undefined;
+        }
+        return entry.user;
+    }
+    /** Cache a lookup result. Pass `null` to cache a negative (invalid token) result. */
+    set(key, user) {
+        if (this.cache.size >= this.maxSize) {
+            const firstKey = this.cache.keys().next().value;
+            this.cache.delete(firstKey);
+        }
+        this.cache.set(key, {
+            user,
+            expiresAt: Date.now() + (user ? this.ttlMs : this.negativeTtlMs),
+        });
+    }
+    /** Remove a specific key from the cache (e.g. on logout). */
+    invalidate(key) {
+        this.cache.delete(key);
+    }
+    /** Clear the entire cache. */
+    clear() {
+        this.cache.clear();
     }
-    this.cache.set(key, {
-      user,
-      expiresAt: Date.now() + (user ? this.ttlMs : this.negativeTtlMs),
-    });
-  }
-  /** Remove a specific key from the cache (e.g. on logout). */
-  invalidate(key) {
-    this.cache.delete(key);
-  }
-  /** Clear the entire cache. */
-  clear() {
-    this.cache.clear();
-  }
 }