@agentproto/cli 0.9.0 → 0.10.0

package/README.md

@@ -40,7 +40,7 @@ agentproto pair         <offer|accept|ls|revoke|exec>               pairing over
 agentproto rendezvous   serve [--port <n>] [--host <ip>]           run a rendezvous broker
 ```
 
-`agentproto --help` prints the full usage; `--version` prints the package version.
+> `agentproto --help` prints the full usage; `--version` prints the package version.
 
 ## Quick start
 

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { promises, existsSync, readFileSync, chmodSync, mkdirSync, writeFileSync, readdirSync, accessSync, constants, renameSync, createReadStream, createWriteStream, statSync, openSync, closeSync } from 'fs';
+import { promises, existsSync, readFileSync, chmodSync, mkdirSync, writeFileSync, readdirSync, accessSync, constants, renameSync, createReadStream, createWriteStream, statSync, realpathSync, openSync, closeSync } from 'fs';
 import { homedir, userInfo, hostname, platform, tmpdir } from 'os';
 import { join, resolve, isAbsolute, dirname, normalize, basename, delimiter, relative } from 'path';
 import * as childProc from 'child_process';
@@ -46,7 +46,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { runRendezvousCli } from '@agentproto/rendezvous/cli';
 
 /**
- * @agentproto/cli v0.9.0
+ * @agentproto/cli v0.10.0
  * The `agentproto` binary — install / run / serve AIP-45 agent CLIs.
  */
 // Provide a real `require` in the ESM bundle. Some bundled deps (e.g.
@@ -16753,9 +16753,18 @@ function isWorkflowHandle(v2) {
 }
 async function importEntryHandle(workflowMdPath, entry) {
   const abs = isAbsolute(entry) ? entry : join(dirname(workflowMdPath), entry);
+  let href = pathToFileURL(abs).href;
+  if (!process.env.VITEST) {
+    try {
+      const url = pathToFileURL(abs);
+      url.searchParams.set("v", String((await stat(abs)).mtimeMs));
+      href = url.href;
+    } catch {
+    }
+  }
   let mod;
   try {
-    mod = await import(pathToFileURL(abs).href);
+    mod = await import(href);
   } catch (err) {
     throw new WorkflowLoadError(
       `cannot import entry '${entry}': ${err instanceof Error ? err.message : String(err)}`
@@ -19068,9 +19077,19 @@ function setActiveWorkspace(config, slug) {
 function findWorkspace(config, slug) {
   return config.workspaces.find((w) => w.slug === sanitizeSlug(slug));
 }
+function canonical(p2) {
+  try {
+    return realpathSync(resolve(p2));
+  } catch {
+    return resolve(p2);
+  }
+}
 function findWorkspaceByPath(config, dir) {
-  const resolved = resolve(dir);
-  const candidates2 = config.workspaces.filter((w) => resolved.startsWith(resolve(w.path) + "/") || resolved === resolve(w.path)).sort((a, b2) => b2.path.length - a.path.length);
+  const resolved = canonical(dir);
+  const candidates2 = config.workspaces.filter((w) => {
+    const wPath = canonical(w.path);
+    return resolved.startsWith(wPath + "/") || resolved === wPath;
+  }).sort((a, b2) => b2.path.length - a.path.length);
   return candidates2[0];
 }
 function getActiveWorkspace(config) {
@@ -19156,6 +19175,76 @@ async function loadConfig2(path) {
     return {};
   }
 }
+var markerSchema = z.object({ worktreeId: z.string() });
+function statOrUndefined(path) {
+  try {
+    return statSync(path);
+  } catch {
+    return void 0;
+  }
+}
+function readWorktreeGitDir(dir) {
+  const link = (() => {
+    try {
+      return readFileSync(join(dir, ".git"), "utf8");
+    } catch {
+      return void 0;
+    }
+  })();
+  if (link === void 0) return void 0;
+  const target = /^gitdir:\s*(.+)$/m.exec(link)?.[1]?.trim();
+  if (!target) return void 0;
+  const gitDir = isAbsolute(target) ? target : resolve(dir, target);
+  return statOrUndefined(join(gitDir, "gitdir"))?.isFile() === true ? gitDir : void 0;
+}
+function readMainRepoPath(gitDir) {
+  let raw;
+  try {
+    raw = readFileSync(join(gitDir, "commondir"), "utf8").trim();
+  } catch {
+    return void 0;
+  }
+  if (!raw) return void 0;
+  const commonGitDir = isAbsolute(raw) ? raw : resolve(gitDir, raw);
+  return dirname(commonGitDir);
+}
+function readWorktreeId(gitDir) {
+  let raw;
+  try {
+    raw = readFileSync(join(gitDir, "agentproto-worktree.json"), "utf8");
+  } catch {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  const result = markerSchema.safeParse(parsed);
+  return result.success ? result.data.worktreeId : void 0;
+}
+function resolveWorktreeIdentity(cwd) {
+  let dir = resolve(cwd);
+  for (; ; ) {
+    const dotGit = statOrUndefined(join(dir, ".git"));
+    if (dotGit) {
+      if (!dotGit.isFile()) return void 0;
+      const gitDir = readWorktreeGitDir(dir);
+      if (gitDir === void 0) return void 0;
+      const worktreeId = readWorktreeId(gitDir);
+      const mainRepoPath = readMainRepoPath(gitDir);
+      return {
+        worktreePath: dir,
+        ...worktreeId === void 0 ? {} : { worktreeId },
+        ...mainRepoPath === void 0 ? {} : { mainRepoPath }
+      };
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return void 0;
+    dir = parent;
+  }
+}
 var providers_store_exports = {};
 __reExport(providers_store_exports, dist_exports);
 function resolveSpawnDefaults(defaults, adapterSlug, input2) {
@@ -19706,15 +19795,38 @@ async function spawnAgentSession(deps2, input2) {
     try {
       const config = await loadWorkspacesConfig();
       if (!cwd) {
-        const ws = input2.workspaceSlug ? findWorkspace(config, input2.workspaceSlug) : getActiveWorkspace(config);
-        if (ws) {
-          cwd = ws.path;
-          resolvedSlug = ws.slug;
+        if (input2.workspaceSlug) {
+          const ws = findWorkspace(config, input2.workspaceSlug);
+          if (ws) {
+            cwd = ws.path;
+            resolvedSlug = ws.slug;
+          }
+        } else if (callerScope) {
+          const parentCwd = callerScope.ownerSessionId ? registry.get(callerScope.ownerSessionId)?.cwd : void 0;
+          if (parentCwd) {
+            cwd = parentCwd;
+            const ws = findWorkspaceByPath(config, parentCwd);
+            if (ws) {
+              resolvedSlug = ws.slug;
+            }
+          }
+        } else {
+          const ws = getActiveWorkspace(config);
+          if (ws) {
+            cwd = ws.path;
+            resolvedSlug = ws.slug;
+          }
         }
       } else if (!resolvedSlug) {
         const ws = findWorkspaceByPath(config, cwd);
         if (ws) {
           resolvedSlug = ws.slug;
+        } else {
+          const identity = resolveWorktreeIdentity(cwd);
+          if (identity?.mainRepoPath) {
+            const baseWs = findWorkspaceByPath(config, identity.mainRepoPath);
+            if (baseWs) resolvedSlug = baseWs.slug;
+          }
         }
       }
     } catch {
@@ -19920,7 +20032,8 @@ async function spawnAgentSession(deps2, input2) {
   const effectivePrompt = input2.prompt ? `${composeRoleContext(role, input2.promptAppend, roleRegistry)}
 
 ${input2.prompt}` : input2.prompt;
-  const initialTitle = input2.prompt ? deriveSessionTitle(input2.prompt) : void 0;
+  const explicitTitle = input2.title?.trim() ? input2.title.trim() : void 0;
+  const initialTitle = explicitTitle ?? (input2.prompt ? deriveSessionTitle(input2.prompt) : void 0);
   let settleClaim;
   if (input2.idempotencyKey) {
     const claims = claimsFor(registry);
@@ -22731,6 +22844,90 @@ function registerSessionTools(rawServer, opts) {
       }
     }
   );
+  server.tool(
+    "session_rename",
+    "Set or clear a session's user-facing name \u2014 the label the sessions tree, transcript header, and tab show. `label` out-ranks `title` in that display chain, so a user rename should write `label` (the default a UI picks) to be sure it shows; `title` is the auto-derived first-sentence fallback. For EACH of `title`/`label`: a non-empty string sets it (trimmed + length-capped), an empty string clears it (reverting to the derived title / a friendly `adapter \xB7 id` fallback), and omitting it leaves that field untouched. Persists across daemon restarts. Does NOT rename the adapter-native session or touch the running agent.",
+    {
+      idOrName: z.string().min(1).describe("Session id or name to rename \u2014 from `session_list`."),
+      label: z.string().optional().describe(
+        "New label (the winning display field). Empty string clears it. Omit to leave the label untouched."
+      ),
+      title: z.string().optional().describe(
+        "New title (the auto-derived fallback slot). Empty string clears it, reverting to the first-sentence derivation. Omit to leave it untouched."
+      )
+    },
+    async (input2) => {
+      const prev = registry.findByIdOrName(input2.idOrName);
+      if (!prev) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: `no session "${input2.idOrName}" found` })
+            }
+          ],
+          isError: true
+        };
+      }
+      if (callerScope) {
+        const subtree = collectSubtree(
+          callerScope.ownerSessionId,
+          registry.list({ includeArchived: true })
+        );
+        if (!subtree.has(prev.id)) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  error: "orchestrator_session_out_of_scope",
+                  message: `session_rename: session "${prev.id}" is not in your subtree \u2014 a scoped orchestrator can only rename sessions it (transitively) spawned.`,
+                  ok: false,
+                  sessionId: prev.id
+                })
+              }
+            ],
+            isError: true
+          };
+        }
+      }
+      if (input2.title === void 0 && input2.label === void 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                error: "nothing_to_rename",
+                message: "session_rename: supply at least one of `title` or `label`.",
+                ok: false,
+                sessionId: prev.id
+              })
+            }
+          ],
+          isError: true
+        };
+      }
+      try {
+        const desc = registry.renameSession(prev.id, {
+          ...input2.title !== void 0 ? { title: input2.title } : {},
+          ...input2.label !== void 0 ? { label: input2.label } : {}
+        });
+        return {
+          content: [{ type: "text", text: JSON.stringify(desc, null, 2) }]
+        };
+      } catch (err) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `session_rename: ${err instanceof Error ? err.message : String(err)}`
+            }
+          ],
+          isError: true
+        };
+      }
+    }
+  );
   server.tool(
     "terminal_start",
     "Spawn a process under a real PTY (node-pty) on the host. Bytes (including ANSI escapes, alt-screen sequences) flow through the daemon's byte ring buffer; subscribers attach via the WS at /sessions/:id/pty. Use for interactive TUIs (claude, vim, htop) or to orchestrate shells from another agent. Returns the session descriptor.",
@@ -25997,60 +26194,6 @@ function createTerminalTranscriptWriter(opts) {
     }
   };
 }
-var markerSchema = z.object({ worktreeId: z.string() });
-function statOrUndefined(path) {
-  try {
-    return statSync(path);
-  } catch {
-    return void 0;
-  }
-}
-function readWorktreeGitDir(dir) {
-  const link = (() => {
-    try {
-      return readFileSync(join(dir, ".git"), "utf8");
-    } catch {
-      return void 0;
-    }
-  })();
-  if (link === void 0) return void 0;
-  const target = /^gitdir:\s*(.+)$/m.exec(link)?.[1]?.trim();
-  if (!target) return void 0;
-  const gitDir = isAbsolute(target) ? target : resolve(dir, target);
-  return statOrUndefined(join(gitDir, "gitdir"))?.isFile() === true ? gitDir : void 0;
-}
-function readWorktreeId(gitDir) {
-  let raw;
-  try {
-    raw = readFileSync(join(gitDir, "agentproto-worktree.json"), "utf8");
-  } catch {
-    return void 0;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return void 0;
-  }
-  const result = markerSchema.safeParse(parsed);
-  return result.success ? result.data.worktreeId : void 0;
-}
-function resolveWorktreeIdentity(cwd) {
-  let dir = resolve(cwd);
-  for (; ; ) {
-    const dotGit = statOrUndefined(join(dir, ".git"));
-    if (dotGit) {
-      if (!dotGit.isFile()) return void 0;
-      const gitDir = readWorktreeGitDir(dir);
-      if (gitDir === void 0) return void 0;
-      const worktreeId = readWorktreeId(gitDir);
-      return worktreeId === void 0 ? { worktreePath: dir } : { worktreePath: dir, worktreeId };
-    }
-    const parent = dirname(dir);
-    if (parent === dir) return void 0;
-    dir = parent;
-  }
-}
 function normalizeAgentPromptOptions(raw) {
   if (!Array.isArray(raw)) return void 0;
   const labels = raw.map((o) => {
@@ -27586,6 +27729,33 @@ function createSessionsRegistry(opts) {
       stampProcessAlive(rt.desc);
       return rt.desc;
     },
+    renameSession(id, patch) {
+      const rt = sessions.get(id);
+      if (!rt) throw new Error(`renameSession: no session "${id}"`);
+      const apply = (field) => {
+        const raw = patch[field];
+        if (raw === void 0) return;
+        const trimmed = raw === null ? "" : raw.trim();
+        if (trimmed === "") {
+          rt.desc[field] = void 0;
+          return;
+        }
+        const points = Array.from(trimmed);
+        rt.desc[field] = points.length > MAX_LENGTH ? points.slice(0, MAX_LENGTH).join("") : trimmed;
+      };
+      apply("title");
+      apply("label");
+      schedulePersist();
+      sessionEvents?.emit({
+        type: "session:renamed",
+        sessionId: id,
+        ...rt.desc.title !== void 0 ? { title: rt.desc.title } : {},
+        ...rt.desc.label !== void 0 ? { label: rt.desc.label } : {},
+        ts: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      stampProcessAlive(rt.desc);
+      return rt.desc;
+    },
     listPendingPermissions(filter) {
       const all = Array.from(pendingPermissions.values());
       const scoped = filter?.sessionId ? all.filter((p2) => p2.sessionId === filter.sessionId) : all;
@@ -30718,6 +30888,9 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
         })() : {},
         ...typeof b2.prompt === "string" ? { prompt: b2.prompt } : {},
         ...typeof b2.label === "string" ? { label: b2.label } : {},
+        // Explicit title override (SPEC-3 FIX C, `--title`) — wins over the
+        // first-sentence derivation from the prompt (see session-spawn.ts).
+        ...typeof b2.title === "string" ? { title: b2.title } : {},
         ...typeof b2.idempotencyKey === "string" && b2.idempotencyKey.length > 0 ? { idempotencyKey: b2.idempotencyKey } : {},
         ...typeof b2.role === "string" && b2.role.length > 0 ? { role: b2.role } : {},
         ...typeof b2.promptAppend === "string" ? { promptAppend: b2.promptAppend } : {},
@@ -30974,6 +31147,49 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     }
     return true;
   }
+  const terminalInputMatch = path.match(/^\/sessions\/([^/]+)\/terminal\/input$/);
+  if (terminalInputMatch && req.method === "POST") {
+    const id2 = terminalInputMatch[1];
+    if (!id2) return false;
+    if (!ptyEnabled) {
+      json(501, {
+        error: "pty_not_configured",
+        message: "POST /sessions/:id/terminal/input needs the host to inject `spawnPty` into createGateway (node-pty optional dep \u2014 install in @agentproto/cli)."
+      });
+      return true;
+    }
+    const desc = registry.get(id2);
+    if (!desc) {
+      json(404, { error: "no_session", message: `no session "${id2}"` });
+      return true;
+    }
+    const body = await readJsonBody(req);
+    const text6 = body?.text;
+    if (typeof text6 !== "string") {
+      json(400, { error: "missing_text", message: "Body `text` must be a string." });
+      return true;
+    }
+    if (desc.kind !== "terminal" || desc.pty !== true) {
+      json(400, {
+        error: "not_a_pty",
+        message: `session "${id2}" is not a live PTY (kind=${desc.kind})`
+      });
+      return true;
+    }
+    const enter = body?.enter !== false;
+    let ok = true;
+    if (text6.length > 0) ok = registry.writeTerminalInput(id2, text6) && ok;
+    if (enter) ok = registry.writeTerminalInput(id2, "\r") && ok;
+    if (!ok) {
+      json(400, {
+        error: "not_a_pty",
+        message: `session "${id2}" has no live PTY to write to`
+      });
+      return true;
+    }
+    json(200, { ok: true });
+    return true;
+  }
   const modelMatch = path.match(/^\/sessions\/([^/]+)\/model$/);
   if (modelMatch && req.method === "POST") {
     const id2 = modelMatch[1];
@@ -31097,6 +31313,31 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     }
     return true;
   }
+  const renameMatch = path.match(/^\/sessions\/([^/]+)$/);
+  if (renameMatch && req.method === "PATCH") {
+    const rawIdOrName2 = renameMatch[1];
+    if (!rawIdOrName2) return false;
+    const resolved = registry.findByIdOrName(rawIdOrName2);
+    if (!resolved) {
+      json(404, { error: "session_not_found", id: rawIdOrName2 });
+      return true;
+    }
+    const body = await readJsonBody(req);
+    const b2 = body && typeof body === "object" ? body : {};
+    const field = (v2) => typeof v2 === "string" ? v2 : v2 === null ? null : void 0;
+    const patch = {
+      ..."title" in b2 ? { title: field(b2.title) } : {},
+      ..."label" in b2 ? { label: field(b2.label) } : {}
+    };
+    try {
+      const desc = registry.renameSession(resolved.id, patch);
+      json(200, desc);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      json(msg.includes("no session") ? 404 : 500, { error: "rename_failed", message: msg });
+    }
+    return true;
+  }
   if (path === "/sessions" && req.method === "POST") {
     const body = await readJsonBody(req);
     if (!body || typeof body !== "object") {
@@ -40837,9 +41078,9 @@ async function discoverDaemon() {
 }
 async function readRuntimeJsonWithStatus(workspacePath) {
   const path = resolve(workspacePath, ".agentproto", "runtime.json");
-  let stat9;
+  let stat10;
   try {
-    stat9 = await promises.stat(path);
+    stat10 = await promises.stat(path);
   } catch {
     return { endpoint: null };
   }
@@ -40862,7 +41103,7 @@ async function readRuntimeJsonWithStatus(workspacePath) {
       stale: {
         path,
         pid: parsed.pid ?? null,
-        mtime: stat9.mtime ?? null
+        mtime: stat10.mtime ?? null
       }
     };
   }
@@ -43825,8 +44066,8 @@ async function runServe(args) {
     values.workspace ?? cfgDaemon.workspace ?? process.cwd()
   );
   try {
-    const stat9 = await promises.stat(workspace);
-    if (!stat9.isDirectory()) {
+    const stat10 = await promises.stat(workspace);
+    if (!stat10.isDirectory()) {
       process.stderr.write(
         `agentproto serve: --workspace "${workspace}" is not a directory.
 `
@@ -44233,7 +44474,7 @@ ${color.dim}\u2500\u2500 shutting down (${signal}) \u2500\u2500${color.reset}
 async function runOneTunnel(opts, gateway, announcedTools, spawnPty, signal, reconnectState) {
   if (!opts.connect) throw new Error("runOneTunnel: --connect not set");
   const headers = {
-    "user-agent": `agentproto/${"0.9.0"}`
+    "user-agent": `agentproto/${"0.10.0"}`
   };
   if (opts.token) headers.authorization = `Bearer ${opts.token}`;
   const ws = new WebSocket3(opts.connect, { headers });
@@ -46105,7 +46346,8 @@ Usage:
                                       [--base-url <url>] [--auth-token <token>]
                                       [--options-json <json|@file>]
                                       [--prompt <text>]
-                                      [--label <text>] [--attach] [--json]
+                                      [--label <text>] [--title <text>]
+                                      [--attach] [--json]
                                       [--orchestrator | --orchestrator-json <json>]
                                       [--mcp-servers-json <json|@file>]
                                       [--hold-permissions] [--no-color]
@@ -46243,6 +46485,7 @@ async function runStart(args) {
       "options-json": { type: "string" },
       prompt: { type: "string", short: "p" },
       label: { type: "string" },
+      title: { type: "string" },
       attach: { type: "boolean" },
       json: { type: "boolean" },
       "no-color": { type: "boolean" },
@@ -46372,6 +46615,7 @@ async function runStart(args) {
   if (options !== void 0 && Object.keys(options).length > 0) body.options = options;
   if (values.prompt) body.prompt = values.prompt;
   if (values.label) body.label = values.label;
+  if (values.title) body.title = values.title;
   if (orchestrator !== void 0) body.orchestrator = orchestrator;
   if (mcpServers !== void 0) body.mcpServers = mcpServers;
   if (values["hold-permissions"]) body.permissionHold = true;
@@ -50017,8 +50261,8 @@ async function fileExists3(path) {
 }
 async function dirExists(path) {
   try {
-    const stat9 = await promises.stat(path);
-    return stat9.isDirectory();
+    const stat10 = await promises.stat(path);
+    return stat10.isDirectory();
   } catch {
     return false;
   }
@@ -52869,7 +53113,7 @@ async function main(argv) {
   const verbIdx = argv.findIndex((a) => VERBS.has(a));
   if (verbIdx === -1) {
     if (argv.includes("--version") || argv.includes("-v")) {
-      process.stdout.write(`agentproto ${"0.9.0"}
+      process.stdout.write(`agentproto ${"0.10.0"}
 `);
       return 0;
     }