@rallycry/conveyor-agent 11.0.5 → 11.0.7

package/dist/{boot-7XH4FFLO.js → boot-SQKXI5NY.js}

@@ -1,19 +1,22 @@
 import {
   startWorkbenchServer
-} from "./chunk-D57S4UR5.js";
+} from "./chunk-IBAIJY7V.js";
 import {
   TOMBSTONE_MESSAGE,
   isLegacyEntrypointLaunch
 } from "./chunk-R3FDJQL6.js";
 import {
-  readAgentVersion
-} from "./chunk-XORJ6SII.js";
-import "./chunk-W6VILPQE.js";
+  cloneReferenceRepos,
+  computeGraphifyEnv,
+  readAgentVersion,
+  refreshSkillsAfterCheckout,
+  runPreReadyBinds
+} from "./chunk-SR66HQKB.js";
+import "./chunk-JG3VMWRQ.js";
 import {
   GitPrepJob,
   defaultGit,
   ensureDir,
-  redactToken,
   reportBootMilestone
 } from "./chunk-GL2DIQEQ.js";
 import "./chunk-W4LZ7R6Z.js";
@@ -29,7 +32,7 @@ import {
 
 // src/boot/index.ts
 import { spawn } from "child_process";
-import { statSync as statSync4 } from "fs";
+import { statSync as statSync3 } from "fs";
 import { hostname as osHostname } from "os";
 
 // src/boot/bundle.ts
@@ -159,32 +162,6 @@ function buildChildEnv(opts) {
   return child;
 }
 
-// src/boot/graphify.ts
-var USER_HOME_MOUNT = "/mnt/conveyor-users";
-function computeGraphifyEnv(env, repoName, dirExists) {
-  if (env.CONVEYOR_GRAPHIFY_DISABLE === "1") {
-    return {};
-  }
-  const slug = env.CONVEYOR_GRAPHIFY_SLUG || repoName;
-  if (!slug) {
-    return {};
-  }
-  const primaryRoot = `${USER_HOME_MOUNT}/users/_shared/graphify`;
-  const legacyRoot = `${USER_HOME_MOUNT}/_shared/graphify`;
-  let sharedRoot = env.CONVEYOR_GRAPHIFY_SHARED_ROOT;
-  if (!sharedRoot) {
-    sharedRoot = dirExists(primaryRoot) || !dirExists(legacyRoot) ? primaryRoot : legacyRoot;
-  }
-  const dir = env.CONVEYOR_GRAPHIFY_DIR || `${sharedRoot}/${slug}/latest`;
-  const graph = env.CONVEYOR_GRAPHIFY_GRAPH || `${dir}/graph.json`;
-  return {
-    CONVEYOR_GRAPHIFY_SLUG: slug,
-    CONVEYOR_GRAPHIFY_SHARED_ROOT: sharedRoot,
-    CONVEYOR_GRAPHIFY_DIR: dir,
-    CONVEYOR_GRAPHIFY_GRAPH: graph
-  };
-}
-
 // src/boot/logger.ts
 import { appendFileSync } from "fs";
 var BOOTSTRAP_LOG_PATH = "/tmp/claudespace-bootstrap.log";
@@ -851,306 +828,10 @@ async function startWorkspaceSshd(exec, log, port = process.env.CONVEYOR_WORKSPA
   }
 }
 
-// src/boot/workspace-extras.ts
-import {
-  appendFileSync as appendFileSync3,
-  cpSync,
-  existsSync as existsSync3,
-  lstatSync as lstatSync2,
-  mkdirSync as mkdirSync3,
-  readdirSync as readdirSync2,
-  readFileSync as readFileSync2,
-  readlinkSync,
-  rmSync as rmSync2,
-  statSync as statSync3,
-  symlinkSync as symlinkSync2
-} from "fs";
-import { dirname as dirname2, join as join5 } from "path";
-import { fileURLToPath } from "url";
-function errText(err) {
-  return redactToken(err instanceof Error ? err.message : String(err));
-}
-function isDir2(path) {
-  try {
-    return statSync3(path).isDirectory();
-  } catch {
-    return false;
-  }
-}
-function isSymlink(path) {
-  try {
-    return lstatSync2(path).isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
-var GRAPHIFY_BUNDLE_FILES = [
-  "graph.json",
-  "GRAPH_REPORT.md",
-  "manifest.json",
-  ".graphify_analysis.json",
-  ".graphify_labels.json",
-  "publish-manifest.json",
-  "cost.json"
-];
-function bindGraphifyBundle(workspace, graphifyEnv, log) {
-  const slug = graphifyEnv.CONVEYOR_GRAPHIFY_SLUG;
-  const sourceDir = graphifyEnv.CONVEYOR_GRAPHIFY_DIR;
-  const graphFile = graphifyEnv.CONVEYOR_GRAPHIFY_GRAPH;
-  if (!slug || !sourceDir || !graphFile) return;
-  if (!existsSync3(graphFile)) {
-    log.info(`[boot] Graphify bundle not found for '${slug}' at ${sourceDir}`);
-    return;
-  }
-  const targetDir = join5(workspace, "graphify-out");
-  try {
-    mkdirSync3(targetDir, { recursive: true });
-  } catch {
-    log.warn(`[boot] WARN: unable to create graphify-out at ${targetDir}`);
-    return;
-  }
-  for (const rel of GRAPHIFY_BUNDLE_FILES) {
-    const source = join5(sourceDir, rel);
-    const target = join5(targetDir, rel);
-    if (!existsSync3(source)) continue;
-    if (existsSync3(target) || isSymlink(target)) continue;
-    try {
-      symlinkSync2(source, target);
-    } catch {
-    }
-  }
-  log.info(`[boot] Bound graphify bundle '${slug}' into ${targetDir}`);
-}
-async function ensureGrimoireSubmodule(workspace, githubToken, git, log) {
-  try {
-    if (!existsSync3(join5(workspace, ".gitmodules"))) return;
-    let paths = "";
-    try {
-      ({ stdout: paths } = await git(
-        ["config", "--file", ".gitmodules", "--get-regexp", String.raw`submodule\..*\.path`],
-        { cwd: workspace, timeoutMs: 1e4 }
-      ));
-    } catch {
-      return;
-    }
-    if (!paths.split("\n").some((line) => line.trim().endsWith(".claude/grimoire"))) return;
-    if (isDir2(join5(workspace, ".claude", "grimoire", "skills"))) return;
-    if (!githubToken) {
-      log.warn("[boot] WARN: grimoire submodule absent and no token to fetch it");
-      return;
-    }
-    try {
-      await git(
-        [
-          "-c",
-          `url.https://x-access-token:${githubToken}@github.com/.insteadOf=https://github.com/`,
-          "submodule",
-          "update",
-          "--init",
-          ".claude/grimoire"
-        ],
-        { cwd: workspace, timeoutMs: 3e5 }
-      );
-      log.info("[boot] Initialized grimoire submodule");
-    } catch (err) {
-      log.warn(
-        `[boot] WARN: grimoire submodule init failed (baked pods may lack rc-* skills): ${errText(err)}`
-      );
-    }
-  } catch (err) {
-    log.warn(`[boot] WARN: grimoire submodule check failed: ${errText(err)}`);
-  }
-}
-function excludeLinkedSkills(workspace, names, log) {
-  if (names.length === 0) return;
-  const infoDir = join5(workspace, ".git", "info");
-  if (!isDir2(join5(workspace, ".git"))) return;
-  try {
-    mkdirSync3(infoDir, { recursive: true });
-    const excludePath = join5(infoDir, "exclude");
-    const existing = existsSync3(excludePath) ? readFileSync2(excludePath, "utf8") : "";
-    const missing = names.map((name) => `.claude/skills/${name}`).filter((line) => !existing.split("\n").includes(line));
-    if (missing.length === 0) return;
-    const prefix = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
-    appendFileSync3(excludePath, `${prefix}${missing.join("\n")}
-`);
-  } catch (err) {
-    log.warn(`[boot] WARN: unable to exclude grimoire skill links: ${errText(err)}`);
-  }
-}
-function symlinkTargetsGrimoire(path) {
-  try {
-    return readlinkSync(path).includes(join5("grimoire", "skills"));
-  } catch {
-    return false;
-  }
-}
-function linkGrimoireSkills(workspace, log) {
-  const sourceDir = join5(workspace, ".claude", "grimoire", "skills");
-  const targetDir = join5(workspace, ".claude", "skills");
-  if (!isDir2(sourceDir)) return;
-  try {
-    mkdirSync3(targetDir, { recursive: true });
-  } catch {
-    log.warn(`[boot] WARN: unable to create ${targetDir}; skipping grimoire skill links`);
-    return;
-  }
-  const linkedNames = [];
-  let names = [];
-  try {
-    names = readdirSync2(sourceDir);
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    if (!isDir2(join5(sourceDir, name))) continue;
-    const target = join5(targetDir, name);
-    if (existsSync3(target) && !isSymlink(target)) {
-      log.warn(`[boot] WARN: ${target} exists and is not a symlink; skipping`);
-      continue;
-    }
-    if (isSymlink(target) && !symlinkTargetsGrimoire(target)) continue;
-    try {
-      rmSync2(target, { force: true });
-      symlinkSync2(join5("..", "grimoire", "skills", name), target);
-      linkedNames.push(name);
-    } catch {
-    }
-  }
-  excludeLinkedSkills(workspace, linkedNames, log);
-  log.info(`[boot] Linked ${linkedNames.length} grimoire skills into ${targetDir}`);
-}
-function bundledSkillsDir(moduleUrl = import.meta.url) {
-  try {
-    const dir = join5(dirname2(fileURLToPath(moduleUrl)), "..", "skills");
-    return isDir2(dir) ? dir : null;
-  } catch {
-    return null;
-  }
-}
-function materializeBundledSkills(workspace, log, sourceDirOverride) {
-  const sourceDir = sourceDirOverride === void 0 ? bundledSkillsDir() : sourceDirOverride;
-  if (!sourceDir) {
-    log.warn(
-      "[boot] WARN: no bundled skills payload in this agent build. Cloud modes that invoke a skill will have no workflow to follow. This is a packaging fault (tsup copySkillsPayload did not run), not a workspace problem."
-    );
-    return;
-  }
-  const targetDir = join5(workspace, ".claude", "skills");
-  try {
-    mkdirSync3(targetDir, { recursive: true });
-  } catch {
-    log.warn(`[boot] WARN: unable to create ${targetDir}; skipping bundled skills`);
-    return;
-  }
-  const copied = [];
-  let names = [];
-  try {
-    names = readdirSync2(sourceDir);
-  } catch {
-    return;
-  }
-  for (const name of names) {
-    if (!isDir2(join5(sourceDir, name))) continue;
-    const target = join5(targetDir, name);
-    if (existsSync3(target) || isSymlink(target)) continue;
-    try {
-      cpSync(join5(sourceDir, name), target, { recursive: true, dereference: true });
-      copied.push(name);
-    } catch {
-    }
-  }
-  excludeLinkedSkills(workspace, copied, log);
-  log.info(`[boot] Materialized ${copied.length} bundled skills into ${targetDir}`);
-}
-async function neutralizeGrimoirePointer(workspace, git, log) {
-  if (!existsSync3(join5(workspace, ".claude", "grimoire"))) return;
-  try {
-    await git(["update-index", "--assume-unchanged", ".claude/grimoire"], {
-      cwd: workspace,
-      timeoutMs: 1e4
-    });
-    log.info("[boot] Marked .claude/grimoire assume-unchanged (submodule pointer drift is noise)");
-  } catch (err) {
-    log.warn(`[boot] WARN: grimoire assume-unchanged failed: ${errText(err)}`);
-  }
-}
-function parseReferenceRepos(refsJson) {
-  let parsed;
-  try {
-    parsed = JSON.parse(refsJson);
-  } catch {
-    return [];
-  }
-  if (!Array.isArray(parsed)) return [];
-  const refs = [];
-  for (const entry of parsed) {
-    if (typeof entry !== "object" || entry === null) continue;
-    const raw = entry;
-    const str = (key) => typeof raw[key] === "string" ? raw[key] : "";
-    const ref = {
-      slug: str("slug"),
-      owner: str("owner"),
-      name: str("name"),
-      branch: str("branch") || "main",
-      token: str("token")
-    };
-    if (ref.token && ref.slug && ref.owner && ref.name) refs.push(ref);
-  }
-  return refs;
-}
-async function runPreReadyBinds(workspace, bundle, git, log) {
-  const graphifyEnv = computeGraphifyEnv(process.env, bundle.gitPlan.repoName, isDir2);
-  bindGraphifyBundle(workspace, graphifyEnv, log);
-  await ensureGrimoireSubmodule(workspace, bundle.githubToken ?? "", git, log);
-  linkGrimoireSkills(workspace, log);
-  materializeBundledSkills(workspace, log);
-  await neutralizeGrimoirePointer(workspace, git, log);
-}
-async function cloneReferenceRepos(refsJson, git, log, referencesDir = "/workspaces/references") {
-  if (!refsJson) return;
-  const refs = parseReferenceRepos(refsJson);
-  if (refs.length === 0) return;
-  try {
-    mkdirSync3(referencesDir, { recursive: true });
-  } catch {
-    return;
-  }
-  for (const ref of refs) {
-    const dest = join5(referencesDir, ref.slug);
-    if (existsSync3(join5(dest, ".git"))) continue;
-    try {
-      await git(
-        [
-          "clone",
-          "--depth",
-          "1",
-          "--single-branch",
-          "--branch",
-          ref.branch,
-          `https://x-access-token:${ref.token}@github.com/${ref.owner}/${ref.name}.git`,
-          dest
-        ],
-        { timeoutMs: 6e5 }
-      );
-      try {
-        await git(
-          ["remote", "set-url", "origin", `https://github.com/${ref.owner}/${ref.name}.git`],
-          { cwd: dest, timeoutMs: 1e4 }
-        );
-      } catch {
-      }
-      log.info(`[boot] cloned reference ${ref.slug} (${ref.owner}/${ref.name}@${ref.branch})`);
-    } catch {
-      log.warn(`[boot] WARN: reference clone failed: ${ref.slug}`);
-    }
-  }
-}
-
 // src/boot/workbench-boot-deps.ts
 var WORKSPACE_DIR = "/workspaces/repo";
 var HOME_DIR = "/home/conveyor";
-var USER_HOME_MOUNT2 = "/mnt/conveyor-users";
+var USER_HOME_MOUNT = "/mnt/conveyor-users";
 function sleep(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
@@ -1183,6 +864,14 @@ function defaultWorkbenchBootDeps() {
     }),
     bindsBeforeReady: (ctx, bundle) => runPreReadyBinds(WORKSPACE_DIR, bundle, defaultGit, ctx.log),
     cloneReferences: (ctx, bundle) => cloneReferenceRepos(bundle.envVars?.REFERENCE_REPOS_JSON, defaultGit, ctx.log),
+    refreshSkills: async (ctx) => {
+      const { filled, shadowed, stale } = await refreshSkillsAfterCheckout(
+        WORKSPACE_DIR,
+        defaultGit,
+        ctx.log
+      );
+      return { t: "refreshSkills", filled, shadowed, stale };
+    },
     ensureWorkspaceDir: (ctx) => {
       ensureDir(WORKSPACE_DIR);
       ctx.log.info(`[boot] ensured workspace dir ${WORKSPACE_DIR}`);
@@ -1190,7 +879,7 @@ function defaultWorkbenchBootDeps() {
     wireHome: (ctx) => {
       void wireUserHome({
         home: HOME_DIR,
-        userHomeMount: USER_HOME_MOUNT2,
+        userHomeMount: USER_HOME_MOUNT,
         userId: ctx.childEnv?.CONVEYOR_USER_ID,
         projectId: ctx.childEnv?.CONVEYOR_PROJECT_ID ?? ctx.childEnv?.PROJECT_ID,
         sharedDir: process.env.CONVEYOR_SHARED_DIR,
@@ -1239,6 +928,7 @@ async function runWorkbenchBoot(ctx, overrides = {}) {
     token: ctx.bootstrapToken,
     version: readAgentVersion() ?? "unknown",
     getGitStatus: () => toGitStatusFrame(job.status),
+    refreshSkills: () => deps.refreshSkills(ctx),
     oomWatchdog: oomWatchdogOptionsFromEnv(ctx.log)
   });
   ctx.log.info("[boot] step=startDaemon listen socket up (startupProbe gate open)");
@@ -1261,7 +951,7 @@ async function runWorkbenchBoot(ctx, overrides = {}) {
 
 // src/boot/index.ts
 var HOME_DIR2 = "/home/conveyor";
-var USER_HOME_MOUNT3 = "/mnt/conveyor-users";
+var USER_HOME_MOUNT2 = "/mnt/conveyor-users";
 function defaultBootDeps() {
   return {
     fetchFn: fetch,
@@ -1272,7 +962,7 @@ function defaultBootDeps() {
     exec: defaultExec,
     dirExists: (path) => {
       try {
-        return statSync4(path).isDirectory();
+        return statSync3(path).isDirectory();
       } catch {
         return false;
       }
@@ -1349,7 +1039,7 @@ function agentBootSteps(deps = defaultBootDeps(), signal = new AbortController()
         if (ctx.bundle) {
           void wireUserHome({
             home: HOME_DIR2,
-            userHomeMount: USER_HOME_MOUNT3,
+            userHomeMount: USER_HOME_MOUNT2,
             userId: ctx.childEnv?.CONVEYOR_USER_ID,
             projectId: ctx.childEnv?.CONVEYOR_PROJECT_ID ?? ctx.childEnv?.PROJECT_ID,
             sharedDir: process.env.CONVEYOR_SHARED_DIR,

package/dist/{chunk-URYBO32C.js → chunk-43XITDZP.js}

@@ -5,7 +5,7 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-SLUBOIYE.js";
+} from "./chunk-APP6Y2D7.js";
 import {
   reportBootMilestone
 } from "./chunk-GL2DIQEQ.js";
@@ -16,7 +16,7 @@ import {
 } from "./chunk-W4LZ7R6Z.js";
 import {
   getWorkbenchClient
-} from "./chunk-EXQ6AHOY.js";
+} from "./chunk-TOTCEWJD.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";

package/dist/{chunk-SLUBOIYE.js → chunk-APP6Y2D7.js}

@@ -20,7 +20,7 @@ import {
 import {
   WorkbenchError,
   getWorkbenchClient
-} from "./chunk-EXQ6AHOY.js";
+} from "./chunk-TOTCEWJD.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";
@@ -287,6 +287,10 @@ var AgentConnection = class _AgentConnection {
   // PTY relay (S5 terminal). Single-slot callbacks, set per PtySession run.
   ptyInputCallback = null;
   ptyResizeCallback = null;
+  /** Epoch ms of the last relayed keystroke, or null before any input. The
+   *  question-grace expiry reads it to defer un-parking while a human is
+   *  actively typing into the Connected-TUI (they may be mid-answer). */
+  _lastPtyInputAt = null;
   constructor(config) {
     this.config = config;
   }
@@ -475,6 +479,7 @@ var AgentConnection = class _AgentConnection {
       });
       this.socket.on("pty:input", (data) => {
         if (data.sessionId && data.sessionId !== this.config.sessionId) return;
+        this._lastPtyInputAt = Date.now();
         this.ptyInputCallback?.(data.data);
       });
       this.socket.on("pty:resize", (data) => {
@@ -925,6 +930,10 @@ var AgentConnection = class _AgentConnection {
     }).catch(() => {
     });
   }
+  /** Epoch ms of the last relayed TUI keystroke, or null before any. */
+  get lastPtyInputAt() {
+    return this._lastPtyInputAt;
+  }
   /** Subscribe to relayed keystrokes. Returns an unsubscribe fn. */
   onPtyInput(handler) {
     this.ptyInputCallback = handler;
@@ -2539,6 +2548,7 @@ export {
   statWorkspacePath,
   workspacePathExists,
   GIT_TIMEOUT_MS,
+  git,
   updateRemoteToken,
   verifyGitCredential,
   forceFreshMintBlocked,

package/dist/{chunk-D57S4UR5.js → chunk-IBAIJY7V.js}

@@ -1,6 +1,6 @@
 import {
   loadPtySpawn
-} from "./chunk-W6VILPQE.js";
+} from "./chunk-JG3VMWRQ.js";
 import {
   terminateProcessGroup
 } from "./chunk-W4LZ7R6Z.js";
@@ -99,6 +99,19 @@ function handleConnection(socket, opts, liveOps) {
   });
   socket.on("data", (chunk) => reader.push(chunk));
 }
+async function runRefreshSkills(socket, opts) {
+  const empty = { t: "refreshSkills", filled: [], shadowed: [], stale: [] };
+  try {
+    writeFrame(socket, await opts.refreshSkills?.() ?? empty);
+  } catch (err) {
+    writeFrame(socket, {
+      t: "error",
+      message: err instanceof Error ? err.message : String(err),
+      code: errCode(err)
+    });
+  }
+  socket.end();
+}
 function dispatch(socket, req, sink, opts, liveOps) {
   if (!req || typeof req !== "object" || !timingSafeTokenEqual(req.token ?? "", opts.token)) {
     writeFrame(socket, { t: "error", message: "unauthorized", code: "unauthorized" });
@@ -114,6 +127,9 @@ function dispatch(socket, req, sink, opts, liveOps) {
       writeFrame(socket, opts.getGitStatus?.() ?? { t: "gitStatus", state: "ready" });
       socket.end();
       return;
+    case "refreshSkills":
+      void runRefreshSkills(socket, opts);
+      return;
     case "exec":
       runExec(socket, req, sink, liveOps);
       return;

package/dist/{chunk-W6VILPQE.js → chunk-JG3VMWRQ.js}

@@ -200,7 +200,7 @@ async function loadPtySpawn() {
 async function resolvePtySpawn() {
   const { workbenchEnabled } = await import("./mode-ZJSOSLGU.js");
   if (!workbenchEnabled()) return loadPtySpawn();
-  const { getWorkbenchClient } = await import("./client-IG6C5F2G.js");
+  const { getWorkbenchClient } = await import("./client-6AUPKKMV.js");
   return (file, args, options) => getWorkbenchClient().spawnPty(file, args, options);
 }
 function sessionTempBase() {