agent-relay-server 0.15.1 → 0.17.0

package/src/config-store.ts

@@ -12,6 +12,7 @@ import type {
   SpawnPolicy,
   SpawnProvider,
   StewardConfig,
+  WorkspaceConfig,
 } from "./types";
 
 const CONFIG_HISTORY_LIMIT = 50;
@@ -21,6 +22,8 @@ const STEWARD_NAMESPACE = "steward";
 const STEWARD_KEY = "default";
 const INSIGHTS_NAMESPACE = "insights";
 const INSIGHTS_KEY = "default";
+const WORKSPACE_NAMESPACE = "workspace";
+const WORKSPACE_KEY = "default";
 const VALID_PROVIDERS = ["claude", "codex"] as const;
 const VALID_PROFILE_PROVIDERS = ["any", "claude", "codex"] as const;
 const VALID_PROFILE_BASES = ["host", "minimal", "isolated"] as const;
@@ -472,24 +475,46 @@ function validateInsightsConfig(value: unknown): InsightsConfig {
   };
 }
 
+// Global workspace provisioning config for isolated worktrees (#159 follow-up).
+// Defaults seed the two untracked paths an isolated agent almost always needs:
+// the agent guide and the rig config, both gitignored so a fresh worktree lacks them.
+const WORKSPACE_CONFIG_DEFAULTS: WorkspaceConfig = {
+  symlinkPaths: ["AGENTS.md", ".claude-rig"],
+};
+
+function validateWorkspaceConfig(value: unknown): WorkspaceConfig {
+  if (!isRecord(value)) throw new ValidationError("workspace config value must be an object");
+  const symlinkPaths = cleanStringArray(value.symlinkPaths, "symlinkPaths");
+  // Reject absolute paths and parent-traversal up front: symlink sources must stay
+  // inside the main checkout. The orchestrator re-checks containment at link time,
+  // but failing here gives the operator immediate feedback in the dashboard.
+  for (const entry of symlinkPaths) {
+    if (entry.startsWith("/") || entry.split(/[\\/]/).includes("..")) {
+      throw new ValidationError(`symlinkPaths entry must be a relative path within the repo: ${entry}`);
+    }
+  }
+  return { symlinkPaths };
+}
+
 function normalizeValue(namespace: string, key: string, value: unknown): unknown {
   if (value === undefined) throw new ValidationError("value required");
   if (namespace === SPAWN_POLICY_NAMESPACE) return validateSpawnPolicy(key, value);
   if (namespace === AGENT_PROFILE_NAMESPACE) return validateAgentProfile(key, value);
   if (namespace === STEWARD_NAMESPACE) return validateStewardConfig(value);
   if (namespace === INSIGHTS_NAMESPACE) return validateInsightsConfig(value);
+  if (namespace === WORKSPACE_NAMESPACE) return validateWorkspaceConfig(value);
   if (JSON.stringify(value) === undefined) throw new ValidationError("value must be valid JSON");
   return value;
 }
 
 export function getConfig<T = unknown>(namespace: string, key: string): ConfigEntry<T> | null {
-  const row = getDb().prepare("SELECT * FROM config WHERE namespace = ? AND key = ?").get(namespace, key) as ConfigRow | undefined;
+  const row = getDb().query("SELECT * FROM config WHERE namespace = ? AND key = ?").get(namespace, key) as ConfigRow | undefined;
   return row ? rowToConfigEntry<T>(row) : null;
 }
 
 export function listConfig<T = unknown>(namespace: string): ConfigEntry<T>[] {
   const rows = getDb()
-    .prepare("SELECT * FROM config WHERE namespace = ? ORDER BY key ASC")
+    .query("SELECT * FROM config WHERE namespace = ? ORDER BY key ASC")
     .all(namespace) as ConfigRow[];
   return rows.map(rowToConfigEntry<T>);
 }
@@ -502,12 +527,12 @@ export function setConfig<T = unknown>(namespace: string, key: string, value: T,
 
   getDb().transaction(() => {
     if (existing) {
-      getDb().prepare(`
+      getDb().query(`
         INSERT INTO config_history (namespace, key, value, version, changed_at, changed_by)
         VALUES (?, ?, ?, ?, ?, ?)
       `).run(existing.namespace, existing.key, JSON.stringify(existing.value), existing.version, now, updatedBy ?? null);
     }
-    getDb().prepare(`
+    getDb().query(`
       INSERT INTO config (namespace, key, value, version, updated_at, updated_by)
       VALUES (?, ?, ?, ?, ?, ?)
       ON CONFLICT(namespace, key) DO UPDATE SET
@@ -527,11 +552,11 @@ export function deleteConfig(namespace: string, key: string, updatedBy?: string)
   if (!existing) return false;
   const now = new Date().toISOString();
   getDb().transaction(() => {
-    getDb().prepare(`
+    getDb().query(`
       INSERT INTO config_history (namespace, key, value, version, changed_at, changed_by)
       VALUES (?, ?, ?, ?, ?, ?)
     `).run(existing.namespace, existing.key, JSON.stringify(existing.value), existing.version, now, updatedBy ?? null);
-    getDb().prepare("DELETE FROM config WHERE namespace = ? AND key = ?").run(namespace, key);
+    getDb().query("DELETE FROM config WHERE namespace = ? AND key = ?").run(namespace, key);
     pruneConfigHistory(namespace, key);
   })();
   return true;
@@ -540,13 +565,13 @@ export function deleteConfig(namespace: string, key: string, updatedBy?: string)
 export function getConfigHistory<T = unknown>(namespace: string, key: string, limit = CONFIG_HISTORY_LIMIT): ConfigHistoryEntry<T>[] {
   const safeLimit = Math.min(Math.max(limit, 1), 500);
   const rows = getDb()
-    .prepare("SELECT * FROM config_history WHERE namespace = ? AND key = ? ORDER BY version DESC, id DESC LIMIT ?")
+    .query("SELECT * FROM config_history WHERE namespace = ? AND key = ? ORDER BY version DESC, id DESC LIMIT ?")
     .all(namespace, key, safeLimit) as ConfigHistoryRow[];
   return rows.map(rowToConfigHistoryEntry<T>);
 }
 
 function pruneConfigHistory(namespace: string, key: string): void {
-  getDb().prepare(`
+  getDb().query(`
     DELETE FROM config_history
     WHERE namespace = ? AND key = ? AND id NOT IN (
       SELECT id FROM config_history
@@ -614,6 +639,40 @@ export function setInsightsConfig(value: unknown, updatedBy?: string): ConfigEnt
   return setConfig(INSIGHTS_NAMESPACE, INSIGHTS_KEY, value as InsightsConfig, updatedBy);
 }
 
+/** Global workspace config, merged over defaults (always returns a usable value). */
+export function getWorkspaceConfig(): WorkspaceConfig {
+  const entry = getConfig<Partial<WorkspaceConfig>>(WORKSPACE_NAMESPACE, WORKSPACE_KEY);
+  if (!entry) return { ...WORKSPACE_CONFIG_DEFAULTS };
+  return validateWorkspaceConfig({ ...WORKSPACE_CONFIG_DEFAULTS, ...entry.value });
+}
+
+export function getWorkspaceConfigEntry(): ConfigEntry<WorkspaceConfig> {
+  const entry = getConfig<WorkspaceConfig>(WORKSPACE_NAMESPACE, WORKSPACE_KEY);
+  return entry ?? {
+    namespace: WORKSPACE_NAMESPACE,
+    key: WORKSPACE_KEY,
+    value: { ...WORKSPACE_CONFIG_DEFAULTS },
+    version: 0,
+    updatedAt: "default",
+    updatedBy: "system",
+  };
+}
+
+export function setWorkspaceConfig(value: unknown, updatedBy?: string): ConfigEntry<WorkspaceConfig> {
+  return setConfig(WORKSPACE_NAMESPACE, WORKSPACE_KEY, value as WorkspaceConfig, updatedBy);
+}
+
+/**
+ * Spawn-param fragment carrying the global workspace symlink list to the orchestrator.
+ * Spread into every spawn command's params next to `agentProfile` so any isolated
+ * worktree — direct spawn, managed policy, restart, automation — provisions the same
+ * untracked paths. Returns `{}` when nothing is configured (keeps params lean).
+ */
+export function workspaceSpawnParams(): { workspaceSymlinks?: string[] } {
+  const { symlinkPaths } = getWorkspaceConfig();
+  return symlinkPaths.length ? { workspaceSymlinks: symlinkPaths } : {};
+}
+
 function builtInProfileEntry(profile: AgentProfile): ConfigEntry<AgentProfile> {
   return {
     namespace: AGENT_PROFILE_NAMESPACE,
@@ -649,13 +708,13 @@ export function deleteAgentProfile(name: string, updatedBy?: string): boolean {
 }
 
 export function getManagedAgentState(policyName: string): ManagedAgentState | null {
-  const row = getDb().prepare("SELECT * FROM managed_agent_state WHERE policy_name = ?").get(policyName) as ManagedAgentStateRow | undefined;
+  const row = getDb().query("SELECT * FROM managed_agent_state WHERE policy_name = ?").get(policyName) as ManagedAgentStateRow | undefined;
   return row ? rowToManagedAgentState(row) : null;
 }
 
 function listManagedAgentStates(): ManagedAgentState[] {
   const rows = getDb()
-    .prepare("SELECT * FROM managed_agent_state ORDER BY policy_name ASC")
+    .query("SELECT * FROM managed_agent_state ORDER BY policy_name ASC")
     .all() as ManagedAgentStateRow[];
   return rows.map(rowToManagedAgentState);
 }
@@ -664,7 +723,7 @@ export function upsertManagedAgentState(input: ManagedAgentStateInput): ManagedA
   if (!VALID_MANAGED_STATUSES.includes(input.status)) throw new ValidationError("status must be a managed-agent status");
   if (!VALID_PROVIDERS.includes(input.provider)) throw new ValidationError("provider must be claude or codex");
   const now = input.updatedAt ?? Date.now();
-  getDb().prepare(`
+  getDb().query(`
     INSERT INTO managed_agent_state (
       policy_name, status, agent_id, orchestrator_id, provider, tmux_session, spawn_request_id, workspace_id, workspace_path, workspace_branch,
       last_spawn_at, last_stop_at, healthy_since, restart_count, consecutive_failures,
@@ -724,6 +783,6 @@ export function updateManagedAgentState(policyName: string, patch: ManagedAgentS
 }
 
 function deleteManagedAgentState(policyName: string): boolean {
-  const result = getDb().prepare("DELETE FROM managed_agent_state WHERE policy_name = ?").run(policyName);
+  const result = getDb().query("DELETE FROM managed_agent_state WHERE policy_name = ?").run(policyName);
   return result.changes > 0;
 }