agent-relay-orchestrator 0.15.1 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-orchestrator",
-  "version": "0.15.1",
+  "version": "0.17.0",
   "description": "Agent Relay orchestrator — manages agent lifecycle across hosts",
   "type": "module",
   "bin": {
@@ -16,7 +16,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "agent-relay-sdk": "0.2.7"
+    "agent-relay-sdk": "0.2.8"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/control.ts

@@ -183,6 +183,7 @@ export function spawnOptionsFromControl(ctrl: Record<string, any>, config: Orche
     effort: typeof ctrl.effort === "string" ? ctrl.effort : undefined,
     profile: typeof ctrl.profile === "string" ? ctrl.profile : undefined,
     workspaceMode: workspaceMode(ctrl.workspaceMode),
+    workspaceSymlinks: stringArray(ctrl.workspaceSymlinks),
     agentProfile: isRecord(ctrl.agentProfile) ? ctrl.agentProfile : undefined,
     label: typeof ctrl.label === "string" ? ctrl.label : undefined,
     agentId: typeof ctrl.agentId === "string" ? ctrl.agentId : undefined,
@@ -209,6 +210,7 @@ export function spawnOptionsFromRestartSource(restartSource: Record<string, any>
     effort: typeof restartSource.effort === "string" ? restartSource.effort : undefined,
     profile: typeof restartSource.profile === "string" ? restartSource.profile : undefined,
     workspaceMode: workspaceMode(restartSource.workspaceMode),
+    workspaceSymlinks: stringArray(restartSource.workspaceSymlinks),
     agentProfile: isRecord(restartSource.agentProfile) ? restartSource.agentProfile : undefined,
     label: typeof restartSource.label === "string" ? restartSource.label : undefined,
     agentId: typeof restartSource.agentId === "string" ? restartSource.agentId : undefined,

package/src/spawn.ts

@@ -16,6 +16,8 @@ export interface SpawnOptions {
   profile?: string;
   workspaceMode?: WorkspaceMode;
   workspace?: WorkspaceMetadata;
+  /** Untracked files/dirs to symlink from main into an isolated worktree (relay's global workspace config). */
+  workspaceSymlinks?: string[];
   agentProfile?: Record<string, unknown>;
   label?: string;
   agentId?: string;
@@ -361,6 +363,7 @@ export async function spawnAgent(
   const resolvedWorkspace = await resolveSpawnWorkspace({
     ...opts,
     label,
+    workspaceSymlinks: opts.workspaceSymlinks,
     workspaceRoot: join(resolve(config.baseDir), ".agent-relay", "workspaces"),
   });
   const spawnOpts = { ...opts, label, agentId, cwd: resolvedWorkspace.cwd, workspace: resolvedWorkspace.workspace };

package/src/workspace-probe.ts

@@ -1,8 +1,8 @@
 import { existsSync, lstatSync, mkdirSync, readdirSync, statSync, symlinkSync, type Dirent } from "node:fs";
 import { createHash } from "node:crypto";
 import { homedir } from "node:os";
-import { basename, join, resolve } from "node:path";
-import type { WorkspaceDepsProvision, WorkspaceDiff, WorkspaceDiffFile, WorkspaceGitState, WorkspaceMergePreview, WorkspaceMergeResult, WorkspaceMetadata, WorkspaceMode, WorkspaceProbe, WorkspaceProbeWorktree, WorkspaceStatus } from "agent-relay-sdk";
+import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
+import type { WorkspaceDepsProvision, WorkspaceDiff, WorkspaceDiffFile, WorkspaceGitState, WorkspaceMergePreview, WorkspaceMergeResult, WorkspaceMetadata, WorkspaceMode, WorkspaceProbe, WorkspaceProbeWorktree, WorkspaceStatus, WorkspaceSymlinkProvision } from "agent-relay-sdk";
 
 const MAX_DIFF_PATCH_BYTES = 200_000;
 
@@ -13,6 +13,7 @@ interface WorkspaceResolutionInput {
   spawnRequestId?: string;
   workspaceMode?: WorkspaceMode;
   workspaceRoot?: string;
+  workspaceSymlinks?: string[];
   automationId?: string;
   automationRunId?: string;
 }
@@ -134,6 +135,10 @@ export async function resolveSpawnWorkspace(input: WorkspaceResolutionInput): Pr
   // runner so the agent can typecheck/test/build without manual setup (#159).
   const deps = provisionWorkspaceDeps(repoRoot, worktreePath);
 
+  // Symlink configured untracked paths (AGENTS.md, .claude-rig, …) from main. Like
+  // node_modules, these are gitignored so the fresh worktree lacks them (#159 follow-up).
+  const symlinks = provisionWorkspaceSymlinks(repoRoot, worktreePath, input.workspaceSymlinks ?? []);
+
   return {
     cwd: worktreePath,
     workspace: {
@@ -148,6 +153,7 @@ export async function resolveSpawnWorkspace(input: WorkspaceResolutionInput): Pr
       baseSha,
       status: "active",
       deps,
+      ...(symlinks.linked.length || symlinks.errors ? { symlinks } : {}),
       probe,
     },
   };
@@ -226,6 +232,74 @@ function symlinkNodeModules(repoRoot: string, worktreePath: string): string[] {
   return linked;
 }
 
+const GLOB_META = /[*?[\]{}!()]/;
+
+/**
+ * Resolve one config entry to the relative paths it covers within `repoRoot`.
+ * Plain entries are taken literally (match files AND dirs via existsSync); entries
+ * with glob metacharacters are expanded against main with dotfiles included. Anything
+ * that resolves outside the repo (absolute / `..` traversal) or doesn't exist is dropped.
+ */
+function resolveSymlinkPattern(repoRoot: string, pattern: string): string[] {
+  const within = (rel: string): boolean => {
+    const abs = resolve(repoRoot, rel);
+    const back = relative(repoRoot, abs);
+    return back !== "" && !back.startsWith("..") && !isAbsolute(back);
+  };
+
+  if (GLOB_META.test(pattern)) {
+    const matches: string[] = [];
+    for (const rel of new Bun.Glob(pattern).scanSync({ cwd: repoRoot, dot: true, onlyFiles: false })) {
+      if (within(rel)) matches.push(rel);
+    }
+    return matches;
+  }
+
+  if (!within(pattern)) return [];
+  return existsSync(join(repoRoot, pattern)) ? [pattern] : [];
+}
+
+/**
+ * Symlink configured untracked files/dirs from the main checkout into a fresh isolated
+ * worktree. Only links paths that exist in main and aren't already present in the worktree
+ * (git-tracked files are left untouched). Best-effort: a failed link never blocks the spawn.
+ */
+export function provisionWorkspaceSymlinks(
+  repoRoot: string,
+  worktreePath: string,
+  patterns: string[],
+): WorkspaceSymlinkProvision {
+  const linked: string[] = [];
+  const seen = new Set<string>();
+  const errors: string[] = [];
+
+  for (const pattern of patterns) {
+    let rels: string[];
+    try {
+      rels = resolveSymlinkPattern(repoRoot, pattern);
+    } catch (error) {
+      errors.push(`${pattern}: ${error instanceof Error ? error.message : String(error)}`);
+      continue;
+    }
+    for (const rel of rels) {
+      if (seen.has(rel)) continue;
+      seen.add(rel);
+      const source = join(repoRoot, rel);
+      const target = join(worktreePath, rel);
+      if (pathExists(target)) continue; // git-tracked or already linked — don't clobber
+      try {
+        mkdirSync(dirname(target), { recursive: true });
+        symlinkSync(source, target, lstatSync(source).isDirectory() ? "dir" : "file");
+        linked.push(rel);
+      } catch (error) {
+        errors.push(`${rel}: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+  }
+
+  return errors.length ? { linked, errors } : { linked };
+}
+
 /** Run a package install in each dir that owns a lockfile. Root install covers
  * the package manager's workspace members; standalone sub-projects with their
  * own lockfile (e.g. dashboard) get a separate install. */