@huynle/hub 0.8.0 → 0.8.2

package/packages/cli/dist/hub-cli.js

@@ -7,7 +7,7 @@ import { createInterface } from "readline";
 // packages/cli/package.json
 var package_default = {
   name: "@huynle/hub-cli",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "The hub CLI (`hub` / `hubctl`) for agents and scripts (internal; bundled into @huynle/hub, not published on its own).",
   license: "MIT",
@@ -863,7 +863,7 @@ class HubClient {
     return this.call("POST", `/api/decisions/${segment(id)}/answer`, { body, ...signalOf(answer) });
   }
   approve(addr, requestID, options = {}) {
-    const body = { requestID, ...options.always ? { always: true } : {}, ...whyField(options) };
+    const body = { requestID, ...options.always ? { always: true } : {}, ...options.recommend ? { recommend: true } : {}, ...whyField(options) };
     return this.call("POST", `${AGENT}/sessions/${segment(addr)}/approve`, { body, ...signalOf(options) });
   }
   deny(addr, requestID, options = {}) {
@@ -961,6 +961,18 @@ function renderEnvelope(input) {
   return [header, boundary, escapeBody(input.text), boundary, hint].join(`
 `);
 }
+// packages/sdk/src/wake.ts
+var WAKE_SKIP_TEXT = {
+  wake_false: "sent without a wake",
+  subagent: "subagents are never woken",
+  hop_cap: "hop limit reached (8 agent messages without a human turn)",
+  budget: "wake budget spent (30 per 10 minutes)"
+};
+function wakeSkipNote({ delivery, woke, wakeSkipped }) {
+  if (woke !== false || !wakeSkipped || delivery === "steer" || delivery === "turn")
+    return "";
+  return ` — wake skipped: ${WAKE_SKIP_TEXT[wakeSkipped] ?? wakeSkipped}`;
+}
 // packages/cli/src/http.ts
 var EXIT = {
   ok: 0,
@@ -986,6 +998,7 @@ var EXIT_OF = {
   rate_limited: EXIT.rateLimited,
   unsupported: EXIT.unavailable,
   offline: EXIT.unavailable,
+  busy: EXIT.unavailable,
   gone: EXIT.gone,
   unauthorized: EXIT.unauthorized,
   token_expired: EXIT.unauthorized
@@ -1133,6 +1146,9 @@ function storedInsecureWarning(value) {
   } catch {}
   return `the stored hub URL ${shown} is plain http: your app token and everything this command sends or receives travel unencrypted on the network; log in again with an https URL (hub login --url https://<hub>)`;
 }
+function shownURL(value) {
+  return value.trimStart().replace(/^((?:https?:|[a-z][a-z0-9+.-]*:(?=[\/\\]))?[\/\\]*)[^\/\\?#]*@/i, "$1***@").slice(0, 200);
+}
 
 // packages/cli/src/login.ts
 var LOGIN_MAX_WAIT_MS = 15 * 60000;
@@ -1179,7 +1195,7 @@ async function deviceLogin(options) {
   const server = checkServerURL(options.server, allow);
   if (!server) {
     const why = insecureHTTPRefusal(options.server, allow);
-    throw new UsageError(why ? `${why}: ${String(options.server).slice(0, 200)}` : `the hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${String(options.server).slice(0, 200)}`);
+    throw new UsageError(why ? `${why}: ${shownURL(String(options.server))}` : `the hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${shownURL(String(options.server))}`);
   }
   const insecure = isPlainHTTP(server) && !isLoopbackServer(server) ? insecureHTTPWarning(server) : undefined;
   const fetcher = options.fetch ?? fetch;
@@ -3094,7 +3110,33 @@ import path3 from "node:path";
 var APP_DIR = "hub";
 var LEGACY_APP_DIRS = Object.freeze(["opencode-hub", "opencode-voice"]);
 var configBase = (env, home) => env.XDG_CONFIG_HOME || path3.join(home, ".config");
-var stateBase = (home) => path3.join(home, ".local", "state");
+var xdgStateHome = (env) => env.XDG_STATE_HOME && path3.isAbsolute(env.XDG_STATE_HOME) ? env.XDG_STATE_HOME : undefined;
+var HUB_STATE_MARKERS = Object.freeze(["state.json", "token-keys.json", "agent", "blobs", "concierge-sessions.json", "bin", "hub.log", "hub.pid", "claude-code", "codex"]);
+var holdsHubState = (dir, exists = existsSync) => HUB_STATE_MARKERS.some((marker) => exists(path3.join(dir, marker)));
+var shellQuote = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
+function resolveHubStateDir(env, home, exists = existsSync) {
+  const legacy = path3.join(home, ".local", "state", APP_DIR);
+  const xdg = xdgStateHome(env);
+  const xdgHub = xdg ? path3.join(xdg, APP_DIR) : undefined;
+  const defaults = [legacy, ...xdgHub && xdgHub !== legacy ? [xdgHub] : []];
+  const result = (dir, source, hint) => ({
+    dir,
+    source,
+    ...hint ? { hint } : {},
+    candidates: [dir, ...defaults.filter((d) => d !== dir)]
+  });
+  const explicit = hubEnv(env).HUB_STATE_DIR;
+  if (explicit)
+    return result(explicit, "env");
+  const holdsState = (dir) => holdsHubState(dir, exists);
+  if (xdgHub && holdsState(xdgHub))
+    return result(xdgHub, "xdg");
+  if (holdsState(legacy)) {
+    const hint = xdgHub && xdgHub !== legacy ? `XDG_STATE_HOME is set, but the existing ${legacy} is used as the hub state dir; to switch, stop the hub and OpenCode, then: mv ${shellQuote(legacy)} ${shellQuote(xdgHub)}` : undefined;
+    return result(legacy, "legacy", hint);
+  }
+  return xdgHub ? result(xdgHub, "fresh") : result(legacy, "default");
+}
 var exists = (p) => existsSync(p) || isLink(p);
 function isLink(p) {
   try {
@@ -3810,6 +3852,9 @@ function formAnswerProblem(v) {
 }
 var REVERT_FILES_MAX = 50;
 var REVERT_FILE_MAX_CHARS = 1000;
+function isRevertCommitted(v) {
+  return isObj(v) && nonEmpty(v.messageID) && v.messageID.length <= 300 && (v.from === undefined || num(v.from)) && num(v.until) && num(v.at);
+}
 var FORWARDED_EVENTS = new Set([
   "session.created",
   "session.renamed",
@@ -3901,13 +3946,14 @@ function isLaunchCreate(req) {
 }
 var AGENT_NAME_MAX = 100;
 var PERMISSION_MESSAGE_MAX = 1000;
+var RES_CODE_MAX = 40;
 var isModelSelection = (v) => isObj(v) && typeof v.providerID === "string" && ID.test(v.providerID) && typeof v.modelID === "string" && ID.test(v.modelID) && (v.variant === undefined || typeof v.variant === "string" && ID.test(v.variant));
 var SESSION_TOKEN_TEXT = new RegExp(`^[\\x21-\\x7e]{1,${SESSION_TOKEN_MAX_CHARS}}$`);
 function isSessionToken(v) {
   return isObj(v) && nonEmpty(v.sessionID) && v.sessionID.length <= 300 && str2(v.token) && SESSION_TOKEN_TEXT.test(v.token) && num(v.exp);
 }
 function isSession(v) {
-  return isObj(v) && nonEmpty(v.id) && str2(v.title) && str2(v.directory) && num(v.updated) && typeof v.owned === "boolean" && (v.parentID === undefined || str2(v.parentID)) && (v.exposed === undefined || typeof v.exposed === "boolean") && (v.project === undefined || str2(v.project)) && (v.projectName === undefined || str2(v.projectName)) && (v.archived === undefined || typeof v.archived === "boolean") && (v.open === undefined || typeof v.open === "boolean") && (v.terminal === undefined || isTerminal(v.terminal)) && (v.revert === undefined || isSessionRevert(v.revert)) && (v.agent === undefined || nonEmpty(v.agent) && v.agent.length <= AGENT_NAME_MAX) && (v.contextRevision === undefined || Number.isSafeInteger(v.contextRevision) && v.contextRevision >= 0);
+  return isObj(v) && nonEmpty(v.id) && str2(v.title) && str2(v.directory) && num(v.updated) && typeof v.owned === "boolean" && (v.parentID === undefined || str2(v.parentID)) && (v.exposed === undefined || typeof v.exposed === "boolean") && (v.project === undefined || str2(v.project)) && (v.projectName === undefined || str2(v.projectName)) && (v.archived === undefined || typeof v.archived === "boolean") && (v.open === undefined || typeof v.open === "boolean") && (v.terminal === undefined || isTerminal(v.terminal)) && (v.revert === undefined || isSessionRevert(v.revert)) && (v.revertCommitted === undefined || isRevertCommitted(v.revertCommitted)) && (v.agent === undefined || nonEmpty(v.agent) && v.agent.length <= AGENT_NAME_MAX) && (v.contextRevision === undefined || Number.isSafeInteger(v.contextRevision) && v.contextRevision >= 0) && (v.locked === undefined || v.locked === true);
 }
 var REVERT_STATUS = new Set(["added", "deleted", "modified"]);
 var count = (v) => Number.isSafeInteger(v) && v >= 0;
@@ -3915,7 +3961,7 @@ function isRevertFile(v) {
   return isObj(v) && nonEmpty(v.file) && v.file.length <= REVERT_FILE_MAX_CHARS && (v.status === undefined || REVERT_STATUS.has(v.status)) && (v.additions === undefined || count(v.additions)) && (v.deletions === undefined || count(v.deletions));
 }
 function isSessionRevert(v) {
-  return isObj(v) && nonEmpty(v.messageID) && v.messageID.length <= 300 && count(v.hidden) && (v.at === undefined || num(v.at)) && Array.isArray(v.files) && v.files.length <= REVERT_FILES_MAX && v.files.every(isRevertFile) && count(v.filesTotal) && v.filesTotal >= v.files.length;
+  return isObj(v) && nonEmpty(v.messageID) && v.messageID.length <= 300 && count(v.hidden) && (v.at === undefined || num(v.at)) && Array.isArray(v.files) && v.files.length <= REVERT_FILES_MAX && v.files.every(isRevertFile) && count(v.filesTotal) && v.filesTotal >= v.files.length && (v.stagedAt === undefined || num(v.stagedAt));
 }
 var TERMINAL_STATUS = new Set(["idle", "working", "blocked", "done", "unknown"]);
 function isTerminal(v) {
@@ -4099,8 +4145,12 @@ function parseSpokeMessage(raw) {
   switch (m.t) {
     case "hello":
       return (m.role === undefined || m.role === "spoke") && num(m.v) && nonEmpty(m.processID) && (m.kind === "service" || m.kind === "standalone") && str2(m.directory) && num(m.pid) && (m.mode === "always" || m.mode === "session") && (str2(m.opencodeVersion) || m.opencodeVersion === undefined && m.harness !== undefined && m.harness !== HARNESS_OPENCODE) && str2(m.pluginVersion) && (m.features === undefined || featureList(m.features)) && (m.harness === undefined || token(m.harness, 64)) && (m.harnessVersion === undefined || str2(m.harnessVersion) && m.harnessVersion.length <= 100) && (m.evidence === undefined || token(m.evidence, 32)) && (m.launchID === undefined || str2(m.launchID) && ID.test(m.launchID)) ? m : undefined;
-    case "sessions":
-      return Array.isArray(m.sessions) && m.sessions.every(isSession) ? m : undefined;
+    case "sessions": {
+      if (!Array.isArray(m.sessions))
+        return;
+      const sessions = m.sessions.map(lenientSession);
+      return sessions.every(isSession) ? { ...m, sessions } : undefined;
+    }
     case "terminals":
       return m.herdr === undefined || isHerdrInfo(m.herdr) ? m : undefined;
     case "event":
@@ -4108,13 +4158,34 @@ function parseSpokeMessage(raw) {
     case "req":
       return nonEmpty(m.id) && isSpokeRequest(m.req) ? m : undefined;
     case "res":
-      return isResFrame(m) ? m : undefined;
+      return isResFrame(m) ? lenientRes(m) : undefined;
     case "bye":
       return isByeFrame(m) ? m : undefined;
     default:
       return;
   }
 }
+function lenientRes(m) {
+  if (m.code === undefined || nonEmpty(m.code) && m.code.length <= RES_CODE_MAX)
+    return m;
+  const { code: _dropped, ...rest } = m;
+  return rest;
+}
+function lenientSession(v) {
+  if (!isObj(v))
+    return v;
+  let out = v;
+  if (out.revertCommitted !== undefined && !isRevertCommitted(out.revertCommitted)) {
+    const { revertCommitted: _dropped, ...rest } = out;
+    out = rest;
+  }
+  const revert = out.revert;
+  if (isObj(revert) && revert.stagedAt !== undefined && !num(revert.stagedAt)) {
+    const { stagedAt: _dropped, ...rest } = revert;
+    out = { ...out, revert: rest };
+  }
+  return out;
+}
 function parseServerMessage(raw) {
   const m = parseFrame(raw);
   if (!m)
@@ -4125,7 +4196,7 @@ function parseServerMessage(raw) {
     case "req":
       return nonEmpty(m.id) && isServerRequest(m.req) ? m : undefined;
     case "res":
-      return isResFrame(m) ? m : undefined;
+      return isResFrame(m) ? lenientRes(m) : undefined;
     case "bye":
       return isByeFrame(m) ? m : undefined;
     default:
@@ -4536,8 +4607,8 @@ async function machineEnroll(options) {
   if (!server) {
     const why = insecureHTTPRefusal(options.server, allow);
     if (why)
-      return failure(COMMAND2, "usage", `${why[0].toUpperCase()}${why.slice(1)}: ${line(String(options.server), 200)}`);
-    return failure(COMMAND2, "usage", `The hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${line(String(options.server), 200)}`);
+      return failure(COMMAND2, "usage", `${why[0].toUpperCase()}${why.slice(1)}: ${line(shownURL(String(options.server)), 200)}`);
+    return failure(COMMAND2, "usage", `The hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${line(shownURL(String(options.server)), 200)}`);
   }
   const insecure = isPlainHTTP(server) && !isLoopbackServer(server) ? insecureHTTPWarning(server) : undefined;
   const machineName = options.machineName ?? defaultMachineName(hostname2());
@@ -4799,7 +4870,6 @@ function profileNames(set) {
 // packages/node/src/opencode-warm.ts
 import { closeSync as closeSync3, constants, fstatSync, lstatSync as lstatSync3, openSync as openSync3, readSync, realpathSync, statSync } from "node:fs";
 import path7 from "node:path";
-import { readFile } from "node:fs/promises";
 
 // src/spoke/listing.ts
 import path6 from "node:path";
@@ -4842,9 +4912,12 @@ async function listServiceSessions(client, options = {}) {
     return [];
   const pageSize = options.pageSize ?? 100;
   const maxPages = options.maxPages ?? 20;
+  const { signal } = options;
+  const request = signal ? { signal } : {};
+  signal?.throwIfAborted();
   const projects = new Map;
   try {
-    for (const project of await client.project.list())
+    for (const project of await client.project.list(request))
       projects.set(project.id, project);
   } catch {}
   const scope = options.scope;
@@ -4855,7 +4928,8 @@ async function listServiceSessions(client, options = {}) {
   let cursor;
   let ended = false;
   for (let page = 0;page < maxPages && out.length < max && !ended; page++) {
-    const result = await client.session.list({ limit: pageSize, parentID: null, ...cursor ? { cursor } : {} });
+    signal?.throwIfAborted();
+    const result = await client.session.list({ limit: pageSize, parentID: null, ...cursor ? { cursor } : {} }, request);
     for (const s of result.data) {
       if (s.parentID || s.time.archived || out.length >= max)
         continue;
@@ -4873,7 +4947,8 @@ async function listServiceSessions(client, options = {}) {
   const have = new Set(out.map((s) => s.id));
   const missing = [...new Set(options.include ?? [])].filter((id) => !have.has(id)).slice(0, INCLUDE_FETCH_MAX);
   if (missing.length && client.session.get) {
-    const fetched = await Promise.all(missing.map((sessionID) => client.session.get({ sessionID }).catch(() => {
+    signal?.throwIfAborted();
+    const fetched = await Promise.all(missing.map((sessionID) => client.session.get({ sessionID }, request).catch(() => {
       return;
     })));
     for (const s of fetched)
@@ -4885,12 +4960,13 @@ async function listServiceSessions(client, options = {}) {
 
 // packages/node/src/opencode-warm.ts
 var WARM_INTERVAL_MS = 30000;
-var WARM_TIMEOUT_MS = 1e4;
+var WARM_TIMEOUT_MS = 30000;
 var WARM_DIRECTORIES_MAX = 8;
 var SESSION_DAYS = 7;
 var SESSION_PAGE = 100;
 var LOOPBACK2 = new Set(["127.0.0.1", "[::1]"]);
 var PASSWORD_FILE_MAX = 4096;
+var REGISTRATION_MAX = 64 * 1024;
 var isDirectory = (directory) => {
   try {
     return statSync(directory).isDirectory();
@@ -5071,12 +5147,34 @@ class OpenCodeWarmer {
     return problem ? "failed" : "warmed";
   }
 }
-async function readServiceRegistration(file) {
+async function readServiceRegistration(file, options = {}) {
+  const uid = options.uid ?? (typeof process.getuid === "function" ? process.getuid() : undefined);
   let info;
+  let fd;
   try {
-    info = JSON.parse(await readFile(file, "utf8"));
+    const before = lstatSync3(file);
+    if (!before.isFile())
+      return;
+    fd = openSync3(file, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
+    const stat = fstatSync(fd);
+    if (!stat.isFile() || stat.dev !== before.dev || stat.ino !== before.ino)
+      return;
+    if ((stat.mode & 18) !== 0)
+      return;
+    if (uid !== undefined && stat.uid !== uid)
+      return;
+    if (stat.size > REGISTRATION_MAX)
+      return;
+    const buffer = Buffer.alloc(REGISTRATION_MAX + 1);
+    const length = readSync(fd, buffer, 0, buffer.length, 0);
+    if (length > REGISTRATION_MAX)
+      return;
+    info = JSON.parse(buffer.subarray(0, length).toString("utf8"));
   } catch {
     return;
+  } finally {
+    if (fd !== undefined)
+      closeSync3(fd);
   }
   if (!info || typeof info !== "object")
     return;
@@ -5085,9 +5183,8 @@ async function readServiceRegistration(file) {
     return;
   try {
     process.kill(pid, 0);
-  } catch (cause) {
-    if (cause.code !== "EPERM")
-      return;
+  } catch {
+    return;
   }
   return typeof password === "string" ? { url, auth: { type: "basic", username: "opencode", password } } : { url };
 }
@@ -5287,7 +5384,15 @@ function normalizeOpenCode(raw, problems) {
     problems.push(`opencode.servers: at most ${OPENCODE_SERVERS_MAX} servers; the rest are ignored`);
     servers.length = OPENCODE_SERVERS_MAX;
   }
-  return { ...directories ? { directories } : {}, servers };
+  let timeoutSeconds;
+  if (raw.timeoutSeconds !== undefined) {
+    const t = raw.timeoutSeconds;
+    if (typeof t === "number" && Number.isInteger(t) && t >= 1 && t <= 300)
+      timeoutSeconds = t;
+    else
+      problems.push("opencode.timeoutSeconds must be a whole number of seconds from 1 to 300");
+  }
+  return { ...directories ? { directories } : {}, servers, ...timeoutSeconds !== undefined ? { timeoutSeconds } : {} };
 }
 function normalizeHarnesses(raw, problems) {
   if (!isObject3(raw)) {
@@ -5459,14 +5564,15 @@ var DELIVERY = {
   queued: "queued (read at its next turn)",
   retained: "retained (held until its open question is answered)",
   pending: "pending (offline or busy; delivered when it reconnects or its turn ends, for 24 h)",
-  dropped: "not delivered (its recipient session ended)"
+  dropped: "not delivered (its recipient session ended)",
+  expired: "not delivered (its recipient stayed offline or busy for 24 h)"
 };
 var deliveryText = (delivery) => delivery ? DELIVERY[delivery] ?? delivery : "stored (in its inbox)";
 function toText(message) {
   const recipient = partyText(message.recipient);
   return message.to === recipient || message.to === message.recipient.sessionID ? recipient : `${message.to} → ${recipient}`;
 }
-var sentText = ({ message, delivery }) => `${message.kind} ${message.id} to ${toText(message)}: ${deliveryText(delivery)}`;
+var sentText = (sent) => `${sent.message.kind} ${sent.message.id} to ${toText(sent.message)}: ${deliveryText(sent.delivery)}${wakeSkipNote(sent)}`;
 var ASK_EXPIRES_DEFAULT_S = 24 * 60 * 60;
 var UNIT_S = { "": 1, s: 1, m: 60, h: 3600, d: 86400 };
 function durationArg(value, flag) {
@@ -5723,9 +5829,12 @@ function launchedText(launch, created, key = launch.spec.key) {
   return `${launch.id} was already launched with key ${key}: ${summary(launch).slice(launch.id.length + 2)}`;
 }
 var stoppedLaunchText = (launch) => `stopped ${summary(launch)}`;
+var launcherText = (l) => l.byLabel ? `app ${JSON.stringify(l.byLabel)}` : `app ${l.by?.replace(/^app:/, "") ?? "?"}`;
 function launchLine(l) {
   const where = l.directory ?? `${l.spec.workspace.repo}${l.spec.workspace.branch ? ` (${l.spec.workspace.branch})` : ""}`;
-  return [l.id, stateText2(l), sessionText(l) || undefined, where, labelsText(l.spec.labels) || undefined].filter(Boolean).join("  ");
+  const waits = l.state === "queued" && l.waiting ? `waits: ${l.waiting.reason}` : undefined;
+  const revoked = l.launcherRevoked && l.state !== "ended" ? `launcher revoked (${launcherText(l)}): stop it with hub launches stop ${l.id}` : undefined;
+  return [l.id, stateText2(l), sessionText(l) || undefined, where, labelsText(l.spec.labels) || undefined, waits, revoked].filter(Boolean).join("  ");
 }
 var launchesText = (launches) => launches.length ? launches.map(launchLine).join(`
 `) : "no launches";
@@ -5753,8 +5862,10 @@ function launchText(l) {
     lines.push(`runs: ${run.join(" ")}`);
   if (l.spec.end)
     lines.push(`ends: ${[l.spec.end.when, l.spec.end.timeout ? `timeout ${l.spec.end.timeout}` : undefined, l.spec.end.cleanup ? `cleanup ${l.spec.end.cleanup}` : undefined].filter(Boolean).join(", ")}`);
+  if (l.state === "queued" && l.waiting)
+    lines.push(`waits (${l.waiting.wait}) since ${new Date(l.waiting.since).toISOString()}: ${l.waiting.reason}`);
   if (l.by)
-    lines.push(`by: ${l.by}`);
+    lines.push(`by: ${l.by}${l.byLabel ? ` (${l.byLabel})` : ""}${l.launcherRevoked ? ", launcher revoked" : ""}`);
   if (labelsText(l.spec.labels))
     lines.push(`labels: ${labelsText(l.spec.labels)}`);
   if (l.artifacts && artifactsText(l.artifacts))
@@ -5765,6 +5876,10 @@ function launchText(l) {
 `);
 }
 
+// packages/cli/src/tool-args.ts
+class ToolArgError extends Error {
+}
+
 // packages/cli/src/artifacts-mcp.ts
 var MCP_INLINE_TEXT_BYTES = 256 * 1024;
 var KINDS = ["markdown", "code", "image", "table", "chart", "dashboard", "html", "app", "file"];
@@ -5788,7 +5903,7 @@ var FILE_ARGS = {
 var need = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
-    throw new Error(`"${key}" is required (a non-empty string)`);
+    throw new ToolArgError(`"${key}" is required (a non-empty string)`);
   return value;
 };
 var optional2 = (args, key) => {
@@ -5796,20 +5911,20 @@ var optional2 = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "string")
-    throw new Error(`"${key}" must be a string`);
+    throw new ToolArgError(`"${key}" must be a string`);
   return value.trim() ? value : undefined;
 };
 function files(args, kind) {
   const text = args.text;
   if (text !== undefined && typeof text !== "string")
-    throw new Error('"text" must be a string');
+    throw new ToolArgError('"text" must be a string');
   const blobs = args.blobs;
   if (blobs !== undefined && (!Array.isArray(blobs) || !blobs.every((b) => typeof b === "object" && b !== null)))
-    throw new Error('"blobs" must be a list of blob references');
+    throw new ToolArgError('"blobs" must be a list of blob references');
   if (text === undefined && (blobs === undefined || blobs.length === 0))
-    throw new Error("give text or blobs (stage bigger content first and pass its reference)");
+    throw new ToolArgError("give text or blobs (stage bigger content first and pass its reference)");
   if (text !== undefined && Buffer.byteLength(text, "utf8") > MCP_INLINE_TEXT_BYTES)
-    throw new Error(`text is larger than ${MCP_INLINE_TEXT_BYTES} bytes: stage it with uploadBlob and pass blobs`);
+    throw new ToolArgError(`text is larger than ${MCP_INLINE_TEXT_BYTES} bytes: stage it with uploadBlob and pass blobs`);
   const path = optional2(args, "path");
   const entry = optional2(args, "entry");
   const mediaType = optional2(args, "mediaType") ?? (kind && DEFAULT_MEDIA[kind]) ?? "text/plain";
@@ -5876,7 +5991,7 @@ var artifactTools = [
       const title = need(args, "title");
       const kind = need(args, "kind");
       if (!KINDS.includes(kind))
-        throw new Error(`"kind" must be one of ${KINDS.join(", ")}`);
+        throw new ToolArgError(`"kind" must be one of ${KINDS.join(", ")}`);
       const body = files(args, kind);
       const description = optional2(args, "description");
       const visibility = optional2(args, "visibility");
@@ -5915,7 +6030,7 @@ var KINDS2 = ["ask", "propose-edit", "run-action"];
 var need2 = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
-    throw new Error(`"${key}" is required (a non-empty string)`);
+    throw new ToolArgError(`"${key}" is required (a non-empty string)`);
   return value;
 };
 var optional3 = (args, key) => {
@@ -5923,24 +6038,24 @@ var optional3 = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "string")
-    throw new Error(`"${key}" must be a string`);
+    throw new ToolArgError(`"${key}" must be a string`);
   return value.trim() ? value : undefined;
 };
 var integer = (args, key) => {
   const value = args[key];
   if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0)
-    throw new Error(`"${key}" is required (a whole number)`);
+    throw new ToolArgError(`"${key}" is required (a whole number)`);
   return value;
 };
 function handlerOf(args) {
   const session = optional3(args, "session");
   const machine = optional3(args, "machine");
   if (session && machine)
-    throw new Error('give either "session" (an existing session) or "machine" + "repo" (a new handler session), not both');
+    throw new ToolArgError('give either "session" (an existing session) or "machine" + "repo" (a new handler session), not both');
   if (session)
     return { session };
   if (!machine)
-    throw new Error('"machine" and "repo" are required to launch a handler session (or name an existing one with "session")');
+    throw new ToolArgError('"machine" and "repo" are required to launch a handler session (or name an existing one with "session")');
   const repo = need2(args, "repo");
   const harness = optional3(args, "harness");
   const model = optional3(args, "model");
@@ -6004,7 +6119,7 @@ var artifactJobTools = [
     run: async (hub, args, signal) => {
       const kind = optional3(args, "kind");
       if (kind && !KINDS2.includes(kind))
-        throw new Error(`"kind" must be one of ${KINDS2.join(", ")}`);
+        throw new ToolArgError(`"kind" must be one of ${KINDS2.join(", ")}`);
       const action = optional3(args, "action");
       const apply = optional3(args, "apply");
       const key = optional3(args, "key");
@@ -6073,12 +6188,12 @@ var artifactJobTools = [
       const answer = optional3(args, "answer");
       const text = args.text;
       if (text !== undefined && typeof text !== "string")
-        throw new Error('"text" must be a string');
+        throw new ToolArgError('"text" must be a string');
       if (typeof text === "string" && Buffer.byteLength(text, "utf8") > MCP_JOB_TEXT_BYTES)
-        throw new Error(`"text" is larger than ${MCP_JOB_TEXT_BYTES} bytes`);
+        throw new ToolArgError(`"text" is larger than ${MCP_JOB_TEXT_BYTES} bytes`);
       const keep = args.keep;
       if (keep !== undefined && (!Array.isArray(keep) || !keep.every((k) => typeof k === "string")))
-        throw new Error('"keep" must be a list of paths');
+        throw new ToolArgError('"keep" must be a list of paths');
       const path = optional3(args, "path");
       const entry = optional3(args, "entry");
       const result = error ? { error } : text !== undefined || keep !== undefined ? {
@@ -6125,7 +6240,7 @@ var UPDATES = TEAM_INTAKE_STATUS_INPUTS;
 var need3 = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
-    throw new Error(`"${key}" is required (a non-empty string)`);
+    throw new ToolArgError(`"${key}" is required (a non-empty string)`);
   return value;
 };
 var optional4 = (args, key) => {
@@ -6133,7 +6248,7 @@ var optional4 = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "string")
-    throw new Error(`"${key}" must be a string`);
+    throw new ToolArgError(`"${key}" must be a string`);
   return value.trim() ? value : undefined;
 };
 var strings2 = (args, key) => {
@@ -6141,13 +6256,13 @@ var strings2 = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (!Array.isArray(value) || !value.every((v) => typeof v === "string"))
-    throw new Error(`"${key}" must be a list of strings`);
+    throw new ToolArgError(`"${key}" must be a list of strings`);
   return value;
 };
 var oneOf4 = (args, key, allowed) => {
   const value = optional4(args, key);
   if (value !== undefined && !allowed.includes(value))
-    throw new Error(`"${key}" must be one of ${allowed.join(", ")}`);
+    throw new ToolArgError(`"${key}" must be one of ${allowed.join(", ")}`);
   return value;
 };
 function dueOf(args) {
@@ -6156,7 +6271,7 @@ function dueOf(args) {
     return;
   const ms = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : Number.NaN;
   if (!Number.isSafeInteger(ms) || ms <= 0)
-    throw new Error(`"due" must be an ISO date/time or epoch milliseconds`);
+    throw new ToolArgError(`"due" must be an ISO date/time or epoch milliseconds`);
   return ms;
 }
 var line4 = (i) => `${i.id}  ${i.status}${i.progress ? `/${i.progress}` : ""}  ${i.priority}  r${i.revision}  ${sanitizeText(i.title).replace(/\s+/g, " ")}`;
@@ -6243,10 +6358,10 @@ ${intakeText(intake)}`;
     run: async (hub, args, signal) => {
       const status = oneOf4(args, "status", UPDATES);
       if (!status)
-        throw new Error(`"status" is required: one of ${UPDATES.join(", ")}`);
+        throw new ToolArgError(`"status" is required: one of ${UPDATES.join(", ")}`);
       const expectedRevision = args.expectedRevision;
       if (expectedRevision !== undefined && expectedRevision !== null && (typeof expectedRevision !== "number" || !Number.isSafeInteger(expectedRevision) || expectedRevision < 0))
-        throw new Error(`"expectedRevision" must be the revision you read (or left out)`);
+        throw new ToolArgError(`"expectedRevision" must be the revision you read (or left out)`);
       const reason = optional4(args, "reason");
       const { intake, assignment } = await reportIntakeStatus(hub.teams, need3(args, "team"), need3(args, "intake"), { status, ...typeof expectedRevision === "number" ? { expectedRevision } : {}, ...reason ? { reason } : {} }, { signal });
       return `${intake.id} is ${intake.status}${intake.progress ? ` (${intake.progress})` : ""}, revision ${intake.revision}${assignment ? `; assignment ${assignment.id} ${assignment.status}` : ""}`;
@@ -6285,10 +6400,61 @@ var SPEC_FIELDS = {
   metadata: { type: "object", additionalProperties: STRING4, description: "String key/value pairs (keys are slugs)." },
   projects: { ...STRINGS, description: "Project names the team works on." }
 };
+var LAUNCH = {
+  type: "object",
+  description: "A launch spec (nested, as POST /api/agent/launches takes; unlike the launch tool's flat fields): workspace{repo, mode, branch, base, remote} is required; placement{machine, labels, mode}, runtime{kind, profile}, end{when, timeout, cleanup} and the top-level fields are optional; key is set by staffing (send idempotencyKey instead). The role's prefs fill harness, model and placement.machine, and its profile fills agentProfile, when not given. A flat field (repo, machine, cleanup at the top) is refused with the nested place it belongs.",
+  properties: {
+    workspace: {
+      type: "object",
+      description: "Where the member works on its machine.",
+      properties: {
+        repo: { ...STRING4, description: "The repository's absolute path on the machine." },
+        mode: { type: "string", enum: ["worktree", "checkout", "clone"], description: "worktree (default; needs branch), checkout, or clone (needs remote)." },
+        branch: { ...STRING4, description: "The branch to create or check out (a safe git branch name; required for worktree)." },
+        base: { ...STRING4, description: "What a new branch starts from." },
+        remote: { ...STRING4, description: "An https or ssh git remote, without credentials (required for clone)." }
+      },
+      required: ["repo"]
+    },
+    placement: {
+      type: "object",
+      description: "Which machine runs it.",
+      properties: {
+        machine: { ...STRING4, description: "A machine ID or name." },
+        labels: { type: "object", additionalProperties: STRING4, description: "Node labels to match." },
+        mode: { type: "string", enum: ["require", "prefer"], description: "require (default) or prefer the machine/labels." }
+      }
+    },
+    runtime: {
+      type: "object",
+      properties: {
+        kind: { type: "string", enum: ["host", "openshell"], description: "host (default) or openshell (clone workspaces only)." },
+        profile: { ...STRING4, description: "An openshell sandbox profile (openshell only)." }
+      }
+    },
+    end: {
+      type: "object",
+      description: "When the launch ends.",
+      properties: {
+        when: { type: "string", enum: ["idle", "asked", "never"], description: "idle (default), asked or never." },
+        timeout: { type: ["string", "number"], description: "1 minute to 30 days: seconds, or 30m, 4h, 2d." },
+        cleanup: { type: "string", enum: ["keep", "remove"], description: "keep (default) or remove the workspace at the end." }
+      }
+    },
+    name: { ...STRING4, description: "The session's @name, without the @." },
+    roles: { ...STRINGS, description: "Roles the session claims (up to 10)." },
+    harness: { ...STRING4, description: "The harness (default opencode)." },
+    agent: { ...STRING4, description: "The harness agent." },
+    model: { ...STRING4, description: "provider/model." },
+    prompt: { ...STRING4, description: "The first prompt (up to 10000 characters)." },
+    intent: { ...STRING4, description: "What the session is for (one line)." },
+    labels: { type: "object", additionalProperties: STRING4, description: "Free-form app labels." },
+    agentProfile: { type: "object", properties: { profileID: STRING4, version: { type: "integer", minimum: 1 } }, required: ["profileID", "version"], description: "The profile version to pin (needs profiles:assign for an app)." }
+  },
+  required: ["workspace"]
+};
 var SCOPES = "App tokens need scope teams:read (reads) or teams:manage (changes); seats, status and staffing also need sessions:read. Session tokens read only teams they are seated in and never change definitions. Team roles confer no authority.";
-
-class ArgError extends Error {
-}
+var ArgError = ToolArgError;
 var need4 = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
@@ -6581,7 +6747,7 @@ var teamTools = [
   {
     name: "team_staff",
     description: `Staff a role: attach an existing session (sessionID, any machine) or launch a new member (launch: a launch spec as the launch tool takes). An agent needs the user's grants (roles for the session's project; launch for a repo) or the hub answers needs_user; staffing never issues grants. ${SCOPES}`,
-    properties: { team: TEAM2, role: STRING4, sessionID: { ...STRING4, description: "An existing session (ses_…)." }, launch: { type: "object", description: "A launch spec (repo, harness, model, prompt, …)." }, idempotencyKey: IDEMPOTENCY },
+    properties: { team: TEAM2, role: STRING4, sessionID: { ...STRING4, description: "An existing session (ses_…)." }, launch: LAUNCH, idempotencyKey: IDEMPOTENCY },
     required: ["team", "role"],
     readOnly: false,
     run: async (hub, args, signal) => {
@@ -6616,7 +6782,7 @@ var teamTools = [
   {
     name: "team_replace",
     description: `Replace a seat by an existing session (sessionID) or a new launch (launch): the old seat ends at once and the new member gets the slot's next generation. Send the seat's revision (team_status). ${SCOPES}`,
-    properties: { team: TEAM2, staffingID: STRING4, sessionID: STRING4, launch: { type: "object" }, expectedRevision: { ...REVISION2, description: "The seat's revision you read (team_status)." } },
+    properties: { team: TEAM2, staffingID: STRING4, sessionID: STRING4, launch: LAUNCH, expectedRevision: { ...REVISION2, description: "The seat's revision you read (team_status)." } },
     required: ["team", "staffingID", "expectedRevision"],
     readOnly: false,
     run: async (hub, args, signal) => {
@@ -6633,6 +6799,253 @@ var teamTools = [
   }
 ];
 
+// packages/cli/src/profiles-mcp.ts
+var STRING5 = { type: "string" };
+var STRINGS2 = { type: "array", items: STRING5 };
+var ID4 = { type: "string", description: "The profile's ID (prof_…; see profiles)." };
+var REVISION3 = { type: "integer", minimum: 0, description: "The profile's revision you read (profile_show); a stale one answers conflict with the current revision." };
+var IDEMPOTENCY2 = { type: "string", description: "Idempotency-Key: the same key and arguments within 24 h answer the first result again." };
+var SKILL = { type: "object", properties: { name: { ...STRING5, description: "A slug." }, description: STRING5, body: { ...STRING5, description: "The skill's full text (loaded on demand)." } }, required: ["name", "description", "body"] };
+var COMMAND3 = { type: "object", properties: { name: { ...STRING5, description: "A slug." }, description: STRING5, template: { ...STRING5, description: "Text with {{name}} parameters and {{secret:NAME}} references (never resolved by the hub)." } }, required: ["name", "description", "template"] };
+var CONTENT_FIELDS = {
+  instructions: { type: ["string", "null"], description: "The profile's instructions (AGENTS.md-like text)." },
+  model: { type: ["string", "null"], description: "provider/model the profile suggests." },
+  skills: { type: "array", items: SKILL, description: "Skills, wholesale." },
+  commands: { type: "array", items: COMMAND3, description: "Commands, wholesale." }
+};
+var META_FIELDS = {
+  title: { ...STRING5, description: "1–120 characters." },
+  description: STRING5,
+  tags: { ...STRINGS2, description: "Slugs." },
+  metadata: { type: "object", additionalProperties: STRING5, description: "String key/value pairs (≤ 32 slug keys)." },
+  projects: { ...STRINGS2, description: "Project names the profile is meant for (≤ 16)." }
+};
+var SCOPES2 = "App tokens need scope profiles:read (reads) or profiles:manage (changes; profile_version_create with content fields and the skill/command set/remove tools read the latest version first, so they also need profiles:read); pins need profiles:assign and sessions:read (an app also needs a prompt grant on the session). Session tokens never change profiles. A profile confers no authority.";
+var ArgError2 = ToolArgError;
+var need5 = (args, key) => {
+  const value = args[key];
+  if (typeof value !== "string" || !value.trim())
+    throw new ArgError2(`"${key}" is required (a non-empty string)`);
+  return value;
+};
+var optional6 = (args, key) => {
+  const value = args[key];
+  if (value === undefined || value === null)
+    return;
+  if (typeof value !== "string")
+    throw new ArgError2(`"${key}" must be a string`);
+  return value.trim() ? value : undefined;
+};
+var whole2 = (args, key, min, what) => {
+  const value = args[key];
+  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < min)
+    throw new ArgError2(`"${key}" is required: ${what}`);
+  return value;
+};
+var revision2 = (args) => whole2(args, "expectedRevision", 0, "the revision you read (profile_show; 0 for a session with no pin)");
+var idempotency = (args) => {
+  const key = optional6(args, "idempotencyKey");
+  return key ? { idempotencyKey: key } : {};
+};
+var picked2 = (args, keys) => Object.fromEntries(keys.filter((k) => args[k] !== undefined).map((k) => [k, args[k]]));
+var one2 = (text) => sanitizeText(text).replace(/\s+/g, " ");
+var profileLine = (p) => `${p.id}  ${p.name}  v${p.latestVersion} r${p.revision}  ${p.state}  ${one2(p.title)}`;
+function summaryLines(v) {
+  if (!v)
+    return [];
+  return [
+    `version ${v.version} (${v.digest.slice(0, 12)}, ${v.bytes} bytes): instructions ${v.instructions ? "yes" : "no"}${v.model ? `, model ${one2(v.model)}` : ""}`,
+    `skills: ${v.skills.length ? v.skills.map((s) => s.name).join(", ") : "none"}`,
+    `commands: ${v.commands.length ? v.commands.map((c) => `${c.name}(${c.params.join(", ")})`).join(", ") : "none"}`,
+    ...v.secretRefs.length ? [`secret references: ${v.secretRefs.join(", ")}`] : []
+  ];
+}
+var versionText = (r) => [`new version ${r.version.version}: ${profileLine(r.profile)}`, ...summaryLines(r.version)].join(`
+`);
+async function latestContent(profiles, id, signal) {
+  const { profile } = await profiles.get(id, { signal });
+  const { version } = await profiles.version(profile.id, profile.latestVersion, { signal });
+  return { latest: version.version, content: version.content };
+}
+var contentTool = (name, description, properties, required, change) => ({
+  name,
+  description: `${description} Writes the latest version's content with this change as the next version (versions are immutable; pinned sessions keep theirs). ${SCOPES2}`,
+  properties: { id: ID4, ...properties, expectedRevision: REVISION3 },
+  required: ["id", ...required, "expectedRevision"],
+  readOnly: false,
+  organizes: true,
+  idempotent: true,
+  run: async (hub, args, signal) => {
+    const expectedRevision = revision2(args);
+    const id = need5(args, "id");
+    const { latest, content } = await latestContent(hub.profiles, id, signal);
+    return versionText(await hub.profiles.createVersion(id, { expectedRevision, content: change(content, args, latest) }, { signal }));
+  }
+});
+var setNamed = (items, item) => items.some((i) => i.name === item.name) ? items.map((i) => i.name === item.name ? item : i) : [...items, item];
+var removeNamed = (items, name, what, latest) => {
+  if (!items.some((i) => i.name === name))
+    throw new ArgError2(`version ${latest} has no ${what} ${name}`);
+  return items.filter((i) => i.name !== name);
+};
+var stateTool = (verb, description) => ({
+  name: `profile_${verb}`,
+  description: `${description} ${SCOPES2}`,
+  properties: { id: ID4, expectedRevision: REVISION3 },
+  required: ["id", "expectedRevision"],
+  readOnly: false,
+  idempotent: true,
+  run: async (hub, args, signal) => {
+    const expectedRevision = revision2(args);
+    const { profile } = await hub.profiles.update(need5(args, "id"), { expectedRevision, state: verb === "archive" ? "archived" : "active" }, { signal });
+    return `${verb === "archive" ? "archived" : "restored"}: ${profileLine(profile)}`;
+  }
+});
+var profileLifecycleTools = [
+  {
+    name: "profile_show",
+    description: `One profile: name, title, state, revision (send it as expectedRevision), tags, projects, metadata, and its latest version's instructions, model, skill and command names (never bodies). ${SCOPES2}`,
+    properties: { id: ID4 },
+    required: ["id"],
+    readOnly: true,
+    run: async (hub, args, signal) => {
+      const { profile, latest } = await hub.profiles.get(need5(args, "id"), { signal });
+      return [
+        profileLine(profile),
+        ...profile.description ? [`description: ${one2(profile.description)}`] : [],
+        ...profile.tags?.length ? [`tags: ${profile.tags.join(", ")}`] : [],
+        ...profile.projects?.length ? [`projects: ${profile.projects.map(one2).join(", ")}`] : [],
+        ...profile.metadata && Object.keys(profile.metadata).length ? [`metadata: ${Object.entries(profile.metadata).map(([k, v]) => `${k}=${one2(v)}`).join(", ")}`] : [],
+        ...summaryLines(latest)
+      ].join(`
+`);
+    }
+  },
+  {
+    name: "profile_versions",
+    description: `A profile's retained versions, newest first (version, digest, bytes, when, skill and command counts). ${SCOPES2}`,
+    properties: { id: ID4, limit: { type: "integer", minimum: 1, maximum: 200 }, cursor: STRING5 },
+    required: ["id"],
+    readOnly: true,
+    run: async (hub, args, signal) => {
+      const limit = args.limit === undefined ? undefined : whole2(args, "limit", 1, "a whole number from 1 to 200");
+      const cursor = optional6(args, "cursor");
+      const page = await hub.profiles.versions(need5(args, "id"), { signal, ...limit !== undefined ? { limit } : {}, ...cursor ? { cursor } : {} });
+      const counts = (v) => v.skills !== undefined ? `  ${v.skills} skills, ${v.commands ?? 0} commands${v.instructions ? ", instructions" : ""}` : "";
+      return [...page.items.map((v) => `v${v.version}  ${v.digest.slice(0, 12)}  ${v.bytes} bytes  ${new Date(v.createdAt).toISOString()}${counts(v)}`), ...page.cursor ? [`more: cursor ${page.cursor}`] : []].join(`
+`) || "no versions";
+    }
+  },
+  {
+    name: "profile_create",
+    description: `Create a profile: a versioned bundle of instructions, skills and commands, published as version 1 at once. The name is unique per user. Attach it to a team role with team_role_set (profile), pin it with profile_assign. ${SCOPES2}`,
+    properties: { name: { ...STRING5, description: "A slug, unique per user." }, ...META_FIELDS, ...CONTENT_FIELDS, idempotencyKey: IDEMPOTENCY2 },
+    required: ["name", "title"],
+    readOnly: false,
+    organizes: true,
+    idempotent: true,
+    run: async (hub, args, signal) => {
+      need5(args, "name");
+      need5(args, "title");
+      const meta = picked2(args, ["name", "title", "description", "tags", "metadata", "projects"]);
+      const text = Object.entries(picked2(args, ["instructions", "model"])).filter(([, v]) => v !== null);
+      const content = { ...Object.fromEntries(text), skills: args.skills ?? [], commands: args.commands ?? [] };
+      const r = await hub.profiles.create({ ...meta, content }, { signal, ...idempotency(args) });
+      return [`created: ${profileLine(r.profile)}`, ...summaryLines(r.version)].join(`
+`);
+    }
+  },
+  {
+    name: "profile_update",
+    description: `Edit a profile's metadata: title, description, tags, metadata, projects (null clears description, metadata or projects). Content changes are new versions (profile_version_create, profile_skill_set, …). ${SCOPES2}`,
+    properties: { id: ID4, ...META_FIELDS, description: { type: ["string", "null"] }, metadata: { ...META_FIELDS.metadata, type: ["object", "null"] }, projects: { ...META_FIELDS.projects, type: ["array", "null"] }, expectedRevision: REVISION3 },
+    required: ["id", "expectedRevision"],
+    readOnly: false,
+    organizes: true,
+    idempotent: true,
+    run: async (hub, args, signal) => {
+      const expectedRevision = revision2(args);
+      const patch = picked2(args, ["title", "description", "tags", "metadata", "projects"]);
+      if (Object.keys(patch).length === 0)
+        throw new ArgError2("give at least one field to change");
+      const { profile } = await hub.profiles.update(need5(args, "id"), { expectedRevision, ...patch }, { signal });
+      return `updated: ${profileLine(profile)}`;
+    }
+  },
+  {
+    name: "profile_version_create",
+    description: `Write a profile's next version: either content fields (instructions, model, skills, commands; the ones you omit are kept from the latest version, null clears instructions or model) or fromVersion (an older version's content again: an explicit rollback). Versions are immutable; pinned sessions keep theirs until re-pinned. ${SCOPES2}`,
+    properties: { id: ID4, ...CONTENT_FIELDS, fromVersion: { type: "integer", minimum: 1, description: "A retained version to restore as the next one." }, expectedRevision: REVISION3, idempotencyKey: IDEMPOTENCY2 },
+    required: ["id", "expectedRevision"],
+    readOnly: false,
+    organizes: true,
+    idempotent: true,
+    run: async (hub, args, signal) => {
+      const expectedRevision = revision2(args);
+      const id = need5(args, "id");
+      const given = Object.keys(picked2(args, Object.keys(CONTENT_FIELDS)));
+      const options = { signal, ...idempotency(args) };
+      if (args.fromVersion !== undefined) {
+        if (given.length)
+          throw new ArgError2(`give either fromVersion or content fields (${given.join(", ")}), not both`);
+        return versionText(await hub.profiles.createVersion(id, { expectedRevision, fromVersion: whole2(args, "fromVersion", 1, "a version number") }, options));
+      }
+      if (!given.length)
+        throw new ArgError2("give content fields (instructions, model, skills, commands) or fromVersion");
+      const { content } = await latestContent(hub.profiles, id, signal);
+      const next = { ...content };
+      for (const key of given) {
+        if (args[key] === null)
+          delete next[key];
+        else
+          next[key] = args[key];
+      }
+      return versionText(await hub.profiles.createVersion(id, { expectedRevision, content: next }, options));
+    }
+  },
+  contentTool("profile_skill_set", "Attach a skill to a profile, or replace the skill of that name.", { name: { ...STRING5, description: "The skill's name (a slug)." }, description: STRING5, body: { ...STRING5, description: "The skill's full text." } }, ["name", "description", "body"], (content, args) => ({
+    ...content,
+    skills: setNamed(content.skills, { name: need5(args, "name"), description: need5(args, "description"), body: need5(args, "body") })
+  })),
+  contentTool("profile_skill_remove", "Detach a skill from a profile.", { name: { ...STRING5, description: "The skill's name." } }, ["name"], (content, args, latest) => ({
+    ...content,
+    skills: removeNamed(content.skills, need5(args, "name"), "skill", latest)
+  })),
+  contentTool("profile_command_set", "Attach a command to a profile, or replace the command of that name.", { name: { ...STRING5, description: "The command's name (a slug)." }, description: STRING5, template: COMMAND3.properties.template }, ["name", "description", "template"], (content, args) => ({ ...content, commands: setNamed(content.commands, { name: need5(args, "name"), description: need5(args, "description"), template: need5(args, "template") }) })),
+  contentTool("profile_command_remove", "Detach a command from a profile.", { name: { ...STRING5, description: "The command's name." } }, ["name"], (content, args, latest) => ({
+    ...content,
+    commands: removeNamed(content.commands, need5(args, "name"), "command", latest)
+  })),
+  stateTool("archive", "Archive a profile: it takes no new versions or pins; pinned sessions keep theirs; reversible with profile_restore."),
+  stateTool("restore", "Restore an archived profile (it takes versions and pins again)."),
+  {
+    name: "profile_assign",
+    description: `Pin a profile version to a session (applied through its machine; the ack tells whether it took). Send the session's pin revision (0 when it has none; see profile). Pinning confers no authority. ${SCOPES2}`,
+    properties: { addr: { ...STRING5, description: "The session: @name, ses_… ID or other address." }, profileID: ID4, version: { type: "integer", minimum: 1 }, expectedRevision: { ...REVISION3, description: "The session's pin revision (0 when it has none)." } },
+    required: ["addr", "profileID", "version", "expectedRevision"],
+    readOnly: false,
+    idempotent: true,
+    run: async (hub, args, signal) => {
+      const expectedRevision = revision2(args);
+      const { assignment: a } = await hub.profiles.assign(need5(args, "addr"), { profileID: need5(args, "profileID"), version: whole2(args, "version", 1, "a version number"), expectedRevision }, { signal });
+      return `${a.sessionID} pins ${a.profileID} v${a.version} r${a.revision}${a.ack ? `, ack ${a.ack.status}${a.ack.offline ? " (offline)" : ""}` : ""}`;
+    }
+  },
+  {
+    name: "profile_unassign",
+    description: `Remove a session's pin (what it already applied stays until it restarts). Send the pin's revision (profile_assign's answer). ${SCOPES2}`,
+    properties: { addr: { ...STRING5, description: "The session." }, expectedRevision: { ...REVISION3, description: "The session's pin revision." } },
+    required: ["addr", "expectedRevision"],
+    readOnly: false,
+    idempotent: true,
+    run: async (hub, args, signal) => {
+      const addr = need5(args, "addr");
+      await hub.profiles.unassign(addr, revision2(args), { signal });
+      return `unpinned ${addr}`;
+    }
+  }
+];
+
 // packages/cli/src/watchlist.ts
 var safe = (value) => sanitizeLabel(String(value), 1024);
 var list2 = (items) => items.length ? items.map(safe).join(", ") : "none";
@@ -6659,11 +7072,11 @@ function watchlistChangedText(verb, r) {
 var PAST = { watch: "watching", unwatch: "not watching", mute: "muted", unmute: "unmuted" };
 var watchlistVerbText = (verb, r) => watchlistChangedText(PAST[verb], r);
 var ADDR = { type: "string", description: "Session address: ses_… (or a unique prefix), @name, @@role, @name.project." };
-var STRINGS2 = { type: "array", items: { type: "string" } };
-var need5 = (args, key) => {
+var STRINGS3 = { type: "array", items: { type: "string" } };
+var need6 = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
-    throw new Error(`"${key}" is required (a non-empty string)`);
+    throw new ToolArgError(`"${key}" is required (a non-empty string)`);
   return value;
 };
 var flag = (args, key, fallback) => {
@@ -6671,7 +7084,7 @@ var flag = (args, key, fallback) => {
   if (value === undefined || value === null)
     return fallback;
   if (typeof value !== "boolean")
-    throw new Error(`"${key}" must be true or false`);
+    throw new ToolArgError(`"${key}" must be true or false`);
   return value;
 };
 var UPDATE_FIELDS = ["autoActive", "activeWithinHours", "usePins", "sessions", "projects", "labels", "muted", "mutedProjects"];
@@ -6691,11 +7104,11 @@ var watchlistTools = [
       autoActive: { type: "boolean" },
       activeWithinHours: { type: "integer", minimum: 1, maximum: 24 },
       usePins: { type: "boolean" },
-      sessions: STRINGS2,
-      projects: STRINGS2,
+      sessions: STRINGS3,
+      projects: STRINGS3,
       labels: { type: "array", items: { type: "object", additionalProperties: { type: "string" } } },
-      muted: STRINGS2,
-      mutedProjects: STRINGS2
+      muted: STRINGS3,
+      mutedProjects: STRINGS3
     },
     required: ["expectedRevision"],
     readOnly: false,
@@ -6703,10 +7116,10 @@ var watchlistTools = [
     run: async (hub, args, signal) => {
       const expected = args.expectedRevision;
       if (typeof expected !== "number" || !Number.isSafeInteger(expected) || expected < 0)
-        throw new Error(`"expectedRevision" is required (the revision you read)`);
+        throw new ToolArgError(`"expectedRevision" is required (the revision you read)`);
       const unknown = Object.keys(args).filter((k) => k !== "expectedRevision" && !UPDATE_FIELDS.includes(k));
       if (unknown.length)
-        throw new Error(`Unknown argument${unknown.length > 1 ? "s" : ""} ${unknown.map((k) => `"${safe(k).slice(0, 40)}"`).join(", ")}: use ${UPDATE_FIELDS.join(", ")} and expectedRevision`);
+        throw new ToolArgError(`Unknown argument${unknown.length > 1 ? "s" : ""} ${unknown.map((k) => `"${safe(k).slice(0, 40)}"`).join(", ")}: use ${UPDATE_FIELDS.join(", ")} and expectedRevision`);
       const patch = {};
       for (const field of UPDATE_FIELDS)
         if (args[field] !== undefined && args[field] !== null)
@@ -6727,7 +7140,7 @@ ${watchlistConfigText(r.config)}`;
     idempotent: true,
     run: async (hub, args, signal) => {
       const on = flag(args, "watch", true);
-      const addr = need5(args, "addr");
+      const addr = need6(args, "addr");
       const r = on ? await hub.concierge.watchlist.watch(addr, { signal }) : await hub.concierge.watchlist.unwatch(addr, { signal });
       return watchlistVerbText(on ? "watch" : "unwatch", r);
     }
@@ -6742,7 +7155,7 @@ ${watchlistConfigText(r.config)}`;
     idempotent: true,
     run: async (hub, args, signal) => {
       const on = flag(args, "mute", true);
-      const addr = need5(args, "addr");
+      const addr = need6(args, "addr");
       const r = on ? await hub.concierge.watchlist.mute(addr, { signal }) : await hub.concierge.watchlist.unmute(addr, { signal });
       return watchlistVerbText(on ? "mute" : "unmute", r);
     }
@@ -6752,21 +7165,19 @@ ${watchlistConfigText(r.config)}`;
 // packages/cli/src/mcp.ts
 var MCP_PROTOCOL_VERSIONS = ["2025-06-18", "2025-03-26", "2024-11-05"];
 var RPC = { parse: -32700, invalidRequest: -32600, methodNotFound: -32601, invalidParams: -32602, internal: -32603 };
-
-class ArgError2 extends Error {
-}
-var need6 = (args, key) => {
+var ArgError3 = ToolArgError;
+var need7 = (args, key) => {
   const value = args[key];
   if (typeof value !== "string" || !value.trim())
-    throw new ArgError2(`"${key}" is required (a non-empty string)`);
+    throw new ArgError3(`"${key}" is required (a non-empty string)`);
   return value;
 };
-var optional6 = (args, key) => {
+var optional7 = (args, key) => {
   const value = args[key];
   if (value === undefined || value === null)
     return;
   if (typeof value !== "string")
-    throw new ArgError2(`"${key}" must be a string`);
+    throw new ArgError3(`"${key}" must be a string`);
   return value.trim() ? value : undefined;
 };
 var optionalInt = (args, key, min, max) => {
@@ -6774,7 +7185,7 @@ var optionalInt = (args, key, min, max) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "number" || !Number.isInteger(value) || value < min || value > max)
-    throw new ArgError2(`"${key}" must be a whole number from ${min} to ${max}`);
+    throw new ArgError3(`"${key}" must be a whole number from ${min} to ${max}`);
   return value;
 };
 var optionalStrings = (args, key) => {
@@ -6782,7 +7193,7 @@ var optionalStrings = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (!Array.isArray(value) || !value.every((v) => typeof v === "string"))
-    throw new ArgError2(`"${key}" must be a list of strings`);
+    throw new ArgError3(`"${key}" must be a list of strings`);
   return value;
 };
 var optionalBool = (args, key) => {
@@ -6790,7 +7201,7 @@ var optionalBool = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "boolean")
-    throw new ArgError2(`"${key}" must be true or false`);
+    throw new ArgError3(`"${key}" must be true or false`);
   return value;
 };
 var optionalWait = (args) => {
@@ -6798,7 +7209,7 @@ var optionalWait = (args) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
-    throw new ArgError2(`"wait" must be a number of seconds (0–${WAIT_POLL_MAX_S})`);
+    throw new ArgError3(`"wait" must be a number of seconds (0–${WAIT_POLL_MAX_S})`);
   return Math.min(value, WAIT_POLL_MAX_S);
 };
 var optionalExpires = (args) => {
@@ -6812,11 +7223,11 @@ var optionalExpires = (args) => {
       return durationArg(value.trim(), '"expires"');
     } catch (cause) {
       if (cause instanceof UsageError)
-        throw new ArgError2(cause.message);
+        throw new ArgError3(cause.message);
       throw cause;
     }
   }
-  throw new ArgError2(`"expires" must be seconds or a duration like 30s, 5m, 2h, 1d`);
+  throw new ArgError3(`"expires" must be seconds or a duration like 30s, 5m, 2h, 1d`);
 };
 var sendOptions = (args) => {
   const wake = optionalBool(args, "wake");
@@ -6824,7 +7235,7 @@ var sendOptions = (args) => {
   return { ...wake !== undefined ? { wake } : {}, ...urgent !== undefined ? { urgent } : {} };
 };
 var whyOption = (args) => {
-  const why = optional6(args, "why");
+  const why = optional7(args, "why");
   return why !== undefined ? { why } : {};
 };
 var optionalDelivery = (args) => {
@@ -6832,18 +7243,18 @@ var optionalDelivery = (args) => {
   if (value === undefined || value === null)
     return;
   if (!DELIVERIES.includes(value))
-    throw new ArgError2(`"delivery" is one of ${DELIVERIES.join(", ")}`);
+    throw new ArgError3(`"delivery" is one of ${DELIVERIES.join(", ")}`);
   return value;
 };
 var formAnswer = (args) => {
   const cancel = optionalBool(args, "cancel") === true;
   const answer = args.answer;
   if (cancel && answer !== undefined && answer !== null)
-    throw new ArgError2(`give either "answer" or "cancel", not both`);
+    throw new ArgError3(`give either "answer" or "cancel", not both`);
   if (cancel)
     return "cancel";
   if (typeof answer !== "object" || answer === null || Array.isArray(answer))
-    throw new ArgError2(`"answer" is required (an object: field → value), or "cancel": true`);
+    throw new ArgError3(`"answer" is required (an object: field → value), or "cancel": true`);
   return answer;
 };
 var optionalEnum = (args, key, options) => {
@@ -6851,7 +7262,7 @@ var optionalEnum = (args, key, options) => {
   if (value === undefined || value === null)
     return;
   if (!options.includes(value))
-    throw new ArgError2(`"${key}" is one of ${options.join(", ")}`);
+    throw new ArgError3(`"${key}" is one of ${options.join(", ")}`);
   return value;
 };
 var optionalLabels = (args, key) => {
@@ -6859,7 +7270,7 @@ var optionalLabels = (args, key) => {
   if (value === undefined || value === null)
     return;
   if (typeof value !== "object" || Array.isArray(value) || !Object.values(value).every((v) => typeof v === "string"))
-    throw new ArgError2(`"${key}" must be an object of text values (key → value)`);
+    throw new ArgError3(`"${key}" must be an object of text values (key → value)`);
   return Object.keys(value).length ? value : undefined;
 };
 var definedFields = (fields) => {
@@ -6867,35 +7278,35 @@ var definedFields = (fields) => {
   return Object.keys(out).length ? out : undefined;
 };
 function launchSpec(args) {
-  const repo = need6(args, "repo");
+  const repo = need7(args, "repo");
   if (!repo.startsWith("/"))
-    throw new ArgError2(`"repo" must be an absolute path on the node`);
+    throw new ArgError3(`"repo" must be an absolute path on the node`);
   const kind = optionalEnum(args, "runtime", RUNTIME_KINDS);
-  const profile = optional6(args, "profile");
+  const profile = optional7(args, "profile");
   if (profile !== undefined && kind === undefined)
-    throw new ArgError2(`"profile" needs "runtime" (e.g. openshell)`);
+    throw new ArgError3(`"profile" needs "runtime" (e.g. openshell)`);
   const nodeLabels = optionalLabels(args, "nodeLabels");
-  const machine = optional6(args, "machine");
+  const machine = optional7(args, "machine");
   const prefer = optionalBool(args, "prefer") === true;
   if (prefer && machine === undefined && nodeLabels === undefined)
-    throw new ArgError2(`"prefer" needs "machine" or "nodeLabels"`);
-  const workspace = { repo, ...definedFields({ mode: optionalEnum(args, "mode", WORKSPACE_MODES), branch: optional6(args, "branch"), base: optional6(args, "base"), remote: optional6(args, "remote") }) };
+    throw new ArgError3(`"prefer" needs "machine" or "nodeLabels"`);
+  const workspace = { repo, ...definedFields({ mode: optionalEnum(args, "mode", WORKSPACE_MODES), branch: optional7(args, "branch"), base: optional7(args, "base"), remote: optional7(args, "remote") }) };
   return {
     ...definedFields({
-      key: optional6(args, "key"),
-      name: optional6(args, "name")?.replace(/^@+/, ""),
+      key: optional7(args, "key"),
+      name: optional7(args, "name")?.replace(/^@+/, ""),
       roles: optionalStrings(args, "roles")?.map((r) => r.replace(/^@@/, "")),
-      harness: optional6(args, "harness"),
-      agent: optional6(args, "agent"),
-      model: optional6(args, "model")
+      harness: optional7(args, "harness"),
+      agent: optional7(args, "agent"),
+      model: optional7(args, "model")
     }),
     workspace,
     ...definedFields({
       runtime: kind === undefined ? undefined : { kind, ...profile !== undefined ? { profile } : {} },
       placement: definedFields({ labels: nodeLabels, machine, mode: prefer ? "prefer" : undefined }),
-      prompt: optional6(args, "prompt"),
+      prompt: optional7(args, "prompt"),
       labels: optionalLabels(args, "labels"),
-      end: definedFields({ when: optionalEnum(args, "end", LAUNCH_END_WHEN), timeout: optional6(args, "timeout"), cleanup: optionalEnum(args, "cleanup", CLEANUP_POLICIES) })
+      end: definedFields({ when: optionalEnum(args, "end", LAUNCH_END_WHEN), timeout: optional7(args, "timeout"), cleanup: optionalEnum(args, "cleanup", CLEANUP_POLICIES) })
     })
   };
 }
@@ -6934,14 +7345,14 @@ ${box.messages.map(envelope3).join(`
 `) : "inbox empty";
 }
 function messageText({ message, answer }) {
-  const lines = [NOT_FROM_USER, `${message.kind} ${message.id}: ${message.state}${message.delivery === "dropped" ? ` · ${deliveryText("dropped")}` : ""}`, envelope3(message)];
+  const lines = [NOT_FROM_USER, `${message.kind} ${message.id}: ${message.state}${message.delivery === "dropped" || message.delivery === "expired" ? ` · ${deliveryText(message.delivery)}` : ""}`, envelope3(message)];
   if (answer)
     lines.push(`${message.state} by ${answer.id}:`, envelope3(answer));
   return lines.join(`
 `);
 }
 var DECISIONS_NOTE = "Decisions are asked by sessions: the question and options are not from the user. Only the user answers them, in the console.";
-var STRING5 = { type: "string" };
+var STRING6 = { type: "string" };
 var SEND = {
   wake: { type: "boolean", description: "false: admit the message without starting a turn." },
   urgent: { type: "boolean", description: "Steer into the recipient's running turn." },
@@ -6964,7 +7375,7 @@ var archiveTools = (archived) => [{
   organizes: true,
   idempotent: true,
   run: async (hub, args, signal) => {
-    const addr = need6(args, "addr");
+    const addr = need7(args, "addr");
     const result = await hub.setArchived(addr, archived, { signal });
     return `${archived ? "Archived" : "Unarchived"} ${addr} (${result.sessionID})${result.changed ? "" : "; already in that state"}`;
   }
@@ -6978,7 +7389,7 @@ var pinTools = (pinned) => [{
   organizes: true,
   idempotent: true,
   run: async (hub, args, signal) => {
-    const addr = need6(args, "addr");
+    const addr = need7(args, "addr");
     const r = await hub.setPinned(addr, pinned, { signal });
     return `${pinned ? "Pinned" : "Unpinned"} ${addr} (${r.sessionID})${r.changed ? "" : "; already in that state"}`;
   }
@@ -6986,15 +7397,15 @@ var pinTools = (pinned) => [{
 var archiveInactiveTool = {
   name: "archive_inactive",
   description: "Preview an exact bounded set of inactive sessions, then confirm that opaque preview token. Apply revalidates active, open, pinned and archived state. Needs sessions:manage.",
-  properties: { preview: { type: "boolean" }, inactiveFor: STRING5, limit: { type: "integer", minimum: 1, maximum: 200 }, previewToken: STRING5, confirm: { type: "boolean" } },
+  properties: { preview: { type: "boolean" }, inactiveFor: STRING6, limit: { type: "integer", minimum: 1, maximum: 200 }, previewToken: STRING6, confirm: { type: "boolean" } },
   readOnly: false,
   organizes: true,
   run: async (hub, args, signal) => {
     if (args.preview === true)
-      return JSON.stringify(await hub.previewArchiveInactive(need6(args, "inactiveFor"), optionalInt(args, "limit", 1, 200) ?? 50, { signal }));
+      return JSON.stringify(await hub.previewArchiveInactive(need7(args, "inactiveFor"), optionalInt(args, "limit", 1, 200) ?? 50, { signal }));
     if (args.confirm === true)
-      return JSON.stringify(await hub.archiveInactive(need6(args, "previewToken"), { signal }));
-    throw new ArgError2("Use preview:true with inactiveFor, then confirm:true with previewToken");
+      return JSON.stringify(await hub.archiveInactive(need7(args, "previewToken"), { signal }));
+    throw new ArgError3("Use preview:true with inactiveFor, then confirm:true with previewToken");
   }
 };
 var intentTools = [
@@ -7004,44 +7415,44 @@ var intentTools = [
     properties: { addr: ADDR2 },
     required: ["addr"],
     readOnly: true,
-    run: async (hub, args, signal) => intentLine(need6(args, "addr"), (await hub.intent(need6(args, "addr"), { signal })).intent)
+    run: async (hub, args, signal) => intentLine(need7(args, "addr"), (await hub.intent(need7(args, "addr"), { signal })).intent)
   },
   {
     name: "session_intent_set",
     description: "Set (text, one line, at most 280 characters) or clear (clear: true) a session's intent. Users and apps (sessions:manage) set the user's intent; a session token only its own session's. expectedRevision: the revision read (read first when absent); a stale one is a conflict.",
-    properties: { addr: ADDR2, text: STRING5, clear: { type: "boolean" }, expectedRevision: { type: "integer", minimum: 0 } },
+    properties: { addr: ADDR2, text: STRING6, clear: { type: "boolean" }, expectedRevision: { type: "integer", minimum: 0 } },
     required: ["addr"],
     readOnly: false,
     organizes: true,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
-      const text = optional6(args, "text");
+      const addr = need7(args, "addr");
+      const text = optional7(args, "text");
       const clear = args.clear === true;
       if (clear === (text !== undefined))
-        throw new ArgError2('Give "text" or "clear": true');
+        throw new ArgError3('Give "text" or "clear": true');
       const expectedRevision = optionalInt(args, "expectedRevision", 0, Number.MAX_SAFE_INTEGER);
       return intentLine(addr, await writeIntent(hub, addr, clear ? null : text, { signal, ...expectedRevision !== undefined ? { expectedRevision } : {} }));
     }
   }
 ];
 var TARGET = { ...ADDR2, description: `${ADDR2.description} Required for an app token; a session token defaults to itself.` };
-var ROLE2 = { ...STRING5, description: "A role (reviewer, @@reviewer or reviewer.project)." };
-var ROLE_PROJECT = { ...STRING5, description: "Scope the role to this project (as role.project)." };
+var ROLE2 = { ...STRING6, description: "A role (reviewer, @@reviewer or reviewer.project)." };
+var ROLE_PROJECT = { ...STRING6, description: "Scope the role to this project (as role.project)." };
 var MANAGE_NOTE = "Needs scope sessions:manage for an app token";
 var roleText2 = (r) => `@@${r.role}${r.project !== undefined ? `.${r.project}` : ""}`;
 var nameTools = [
   {
     name: "name",
     description: `Name a session (@name); as a session, leave addr out to name yourself (a session token names only its own session). Its previous name stays an alias for 24 h. A taken name fails (name_taken); @me is reserved. ${MANAGE_NOTE}.`,
-    properties: { addr: TARGET, name: { ...STRING5, description: "The name: 2–40 characters a-z, 0-9 and - (a leading @ is fine)." } },
+    properties: { addr: TARGET, name: { ...STRING6, description: "The name: 2–40 characters a-z, 0-9 and - (a leading @ is fine)." } },
     required: ["name"],
     readOnly: false,
     organizes: true,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const session = optional6(args, "addr");
-      const r = await hub.name(need6(args, "name"), { ...session ? { session } : {}, signal });
+      const session = optional7(args, "addr");
+      const r = await hub.name(need7(args, "name"), { ...session ? { session } : {}, signal });
       return `Named ${r.sessionID} @${r.name}${r.alias ? ` (@${r.alias} stays an alias for 24 h)` : ""}`;
     }
   },
@@ -7054,9 +7465,9 @@ var nameTools = [
     organizes: true,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const session = optional6(args, "addr");
-      const project = optional6(args, "project");
-      const r = await hub.claimRole(need6(args, "role"), { ...session ? { session } : {}, ...project !== undefined ? { project } : {}, ...optionalBool(args, "exclusive") ? { exclusive: true } : {}, signal });
+      const session = optional7(args, "addr");
+      const project = optional7(args, "project");
+      const r = await hub.claimRole(need7(args, "role"), { ...session ? { session } : {}, ...project !== undefined ? { project } : {}, ...optionalBool(args, "exclusive") ? { exclusive: true } : {}, signal });
       return `${r.sessionID} holds ${roleText2(r)} (generation ${r.generation}${r.exclusive ? ", exclusive" : ""})`;
     }
   },
@@ -7068,9 +7479,9 @@ var nameTools = [
     readOnly: false,
     organizes: true,
     run: async (hub, args, signal) => {
-      const session = optional6(args, "addr");
-      const project = optional6(args, "project");
-      const r = await hub.releaseRole(need6(args, "role"), { ...session ? { session } : {}, ...project !== undefined ? { project } : {}, signal });
+      const session = optional7(args, "addr");
+      const project = optional7(args, "project");
+      const r = await hub.releaseRole(need7(args, "role"), { ...session ? { session } : {}, ...project !== undefined ? { project } : {}, signal });
       return `${r.sessionID} released ${roleText2(r)}`;
     }
   }
@@ -7079,16 +7490,16 @@ var eventsTool = {
   name: "events",
   description: "Compact Hub events (session.*, blocker.*, machine.changed, message.changed, launch.changed, session.archived) after a cursor, as JSON {events, cursor, more, reset, refresh?}. Call without cursor to start at the latest, then pass back the returned cursor. reset:true means the cursor expired: re-read the listed snapshots (status, sessions, inbox, …) and continue with the new cursor. Unknown event types are valid; ignore them. Needs scope events:subscribe (plus each family's scope) for an app token.",
   properties: {
-    cursor: { ...STRING5, description: "The cursor from the previous events answer (hev1_…); omit to start at the latest." },
+    cursor: { ...STRING6, description: "The cursor from the previous events answer (hev1_…); omit to start at the latest." },
     wait: { type: "integer", minimum: 0, maximum: WAIT_POLL_MAX_S, description: `Seconds to wait while nothing matches (0–${WAIT_POLL_MAX_S}).` },
     limit: { type: "integer", minimum: 1, maximum: 200, description: "At most this many events (default 50)." },
-    types: { type: "array", items: STRING5, description: "Only these event types (exact, or a family like launch.*)." },
-    sessions: { type: "array", items: STRING5, description: "Only events of these sessions (ses_…, @name, @@role)." }
+    types: { type: "array", items: STRING6, description: "Only these event types (exact, or a family like launch.*)." },
+    sessions: { type: "array", items: STRING6, description: "Only events of these sessions (ses_…, @name, @@role)." }
   },
   readOnly: true,
   run: async (hub, args, signal) => {
     const page = await hub.events({
-      cursor: optional6(args, "cursor"),
+      cursor: optional7(args, "cursor"),
       wait: optionalInt(args, "wait", 0, WAIT_POLL_MAX_S),
       limit: optionalInt(args, "limit", 1, 200),
       types: optionalStrings(args, "types"),
@@ -7103,13 +7514,13 @@ var webhookTools = [
   {
     name: "webhook_create",
     description: "Create a durable signed webhook for canonical compact events. The signing secret is returned only here. Needs events:subscribe plus every selected family's scope.",
-    properties: { url: STRING5, events: { type: "array", items: STRING5 }, label: STRING5 },
+    properties: { url: STRING6, events: { type: "array", items: STRING6 }, label: STRING6 },
     required: ["url"],
     readOnly: false,
     run: async (hub, args, signal) => {
       const events = optionalStrings(args, "events");
-      const label = optional6(args, "label");
-      const r = await hub.webhookCreate({ url: need6(args, "url"), ...events ? { events } : {}, ...label ? { label } : {} }, { signal });
+      const label = optional7(args, "label");
+      const r = await hub.webhookCreate({ url: need7(args, "url"), ...events ? { events } : {}, ...label ? { label } : {} }, { signal });
       return `${webhookText(r.webhook)}
 signing secret (shown once): ${r.secret}`;
     }
@@ -7128,11 +7539,11 @@ signing secret (shown once): ${r.secret}`;
   {
     name: "webhook_show",
     description: "Show one webhook and its retained delivery attempts; never its secret.",
-    properties: { id: STRING5 },
+    properties: { id: STRING6 },
     required: ["id"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const r = await hub.webhook(need6(args, "id"), { signal });
+      const r = await hub.webhook(need7(args, "id"), { signal });
       return `${webhookText(r.webhook)}
 ${JSON.stringify(r.deliveries)}`;
     }
@@ -7140,25 +7551,25 @@ ${JSON.stringify(r.deliveries)}`;
   {
     name: "webhook_delete",
     description: "Delete one webhook and its pending deliveries.",
-    properties: { id: STRING5 },
+    properties: { id: STRING6 },
     required: ["id"],
     readOnly: false,
     organizes: true,
     idempotent: false,
     run: async (hub, args, signal) => {
-      const id = need6(args, "id");
+      const id = need7(args, "id");
       await hub.webhookDelete(id, { signal });
       return `Deleted webhook ${id}`;
     }
   }
 ];
 async function profileTarget(hub, args, signal) {
-  const addr = optional6(args, "addr");
+  const addr = optional7(args, "addr");
   if (addr)
     return addr;
   const { actor } = await hub.whoami({ signal });
   if (actor.kind !== "session")
-    throw new ArgError2(`"addr" is required unless this credential is a session's`);
+    throw new ArgError3(`"addr" is required unless this credential is a session's`);
   return actor.sessionID;
 }
 var optionalParams = (args) => optionalLabels(args, "params") ?? {};
@@ -7192,11 +7603,11 @@ var profileTools = [
   {
     name: "profile_skill",
     description: "Load one skill's full text from the profile pinned to a session (your own by default), on demand.",
-    properties: { name: STRING5, addr: ADDR2 },
+    properties: { name: STRING6, addr: ADDR2 },
     required: ["name"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const r = await hub.profiles.sessionSkill(await profileTarget(hub, args, signal), need6(args, "name"), { signal });
+      const r = await hub.profiles.sessionSkill(await profileTarget(hub, args, signal), need7(args, "name"), { signal });
       return `skill ${r.skill.name} (${r.profileID} v${r.version}):
 ${sanitizeText(r.skill.body)}`;
     }
@@ -7204,11 +7615,11 @@ ${sanitizeText(r.skill.body)}`;
   {
     name: "profile_command",
     description: "Render one command of the profile pinned to a session (your own by default) with its {{name}} parameters. Returns the text only: nothing is sent. {{secret:NAME}} references stay unresolved.",
-    properties: { name: STRING5, params: { type: "object", additionalProperties: STRING5, description: "Parameter name → text value." }, addr: ADDR2 },
+    properties: { name: STRING6, params: { type: "object", additionalProperties: STRING6, description: "Parameter name → text value." }, addr: ADDR2 },
     required: ["name"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const r = await hub.profiles.sessionRender(await profileTarget(hub, args, signal), need6(args, "name"), optionalParams(args), { signal });
+      const r = await hub.profiles.sessionRender(await profileTarget(hub, args, signal), need7(args, "name"), optionalParams(args), { signal });
       return r.prompt;
     }
   },
@@ -7227,13 +7638,13 @@ ${sanitizeText(r.skill.body)}`;
   {
     name: "profile_usage",
     description: "Where one profile is used: pinned sessions (requested vs running version, ack, presence, harness), team roles naming it, launches that named it and the sessions' workspaces, with counts. An app token needs profiles:read, plus sessions:read / teams:read / sessions:launch (its own launches) / workspaces:read for each part; parts it may not read are listed as hidden.",
-    properties: { id: STRING5, limit: { type: "integer", minimum: 1, maximum: 200, description: "Sessions per page (default 50)." }, cursor: STRING5 },
+    properties: { id: STRING6, limit: { type: "integer", minimum: 1, maximum: 200, description: "Sessions per page (default 50)." }, cursor: STRING6 },
     required: ["id"],
     readOnly: true,
     run: async (hub, args, signal) => {
       const limit = optionalInt(args, "limit", 1, 200);
-      const cursor = optional6(args, "cursor");
-      const u = await hub.profiles.usage(need6(args, "id"), { ...limit !== undefined ? { limit } : {}, ...cursor ? { cursor } : {}, signal });
+      const cursor = optional7(args, "cursor");
+      const u = await hub.profiles.usage(need7(args, "id"), { ...limit !== undefined ? { limit } : {}, ...cursor ? { cursor } : {}, signal });
       const c = u.counts;
       const plural = (n, word, many = `${word}s`) => `${n} ${n === 1 ? word : many}`;
       const lines = [`${u.profileID} (latest v${u.latestVersion})`];
@@ -7272,16 +7683,16 @@ ${sanitizeText(r.skill.body)}`;
 var needRevision = (args, key = "expectedRevision") => {
   const value = optionalInt(args, key, 0, Number.MAX_SAFE_INTEGER);
   if (value === undefined)
-    throw new ArgError2(`"${key}" is required: the revision you read`);
+    throw new ArgError3(`"${key}" is required: the revision you read`);
   return value;
 };
 var idemOption = (args) => {
-  const key = optional6(args, "idempotencyKey");
+  const key = optional7(args, "idempotencyKey");
   return key !== undefined ? { idempotencyKey: key } : {};
 };
 var WORKSPACE = { type: "string", description: "The workspace's ID (ws_…)." };
-var REVISION3 = { type: "integer", minimum: 0, description: "The revision you read (a stale one answers conflict with the current revision)." };
-var IDEMPOTENCY2 = { type: "string", description: "Idempotency-Key: the same key and arguments within 24 h answer the first result again." };
+var REVISION4 = { type: "integer", minimum: 0, description: "The revision you read (a stale one answers conflict with the current revision)." };
+var IDEMPOTENCY3 = { type: "string", description: "Idempotency-Key: the same key and arguments within 24 h answer the first result again." };
 var MEMBER_ROLES = ["worker", "observer"];
 var ASSIGNMENT_STATUSES = ["open", "in_progress", "blocked", "done", "cancelled"];
 var WS_SCOPES = "Needs scope workspaces:read (reads) or workspaces:manage (changes) for an app token; member and assignment tools also need sessions:read. Session tokens are refused. Membership and supervision confer no authority.";
@@ -7306,7 +7717,7 @@ var workspaceTools = [
     required: ["workspace"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const id = need6(args, "workspace");
+      const id = need7(args, "workspace");
       const [{ workspace, bindings }, { members }, graph] = await Promise.all([hub.workspaces.get(id, { signal }), hub.workspaces.members(id, { signal }), hub.workspaces.supervision(id, { signal })]);
       const lines = [wsLine(workspace)];
       if (workspace.masterMemberID)
@@ -7322,39 +7733,39 @@ var workspaceTools = [
   {
     name: "workspace_create",
     description: `Create a coordination workspace. ${WS_SCOPES}`,
-    properties: { title: STRING5, description: STRING5, tags: { type: "array", items: STRING5 }, idempotencyKey: IDEMPOTENCY2 },
+    properties: { title: STRING6, description: STRING6, tags: { type: "array", items: STRING6 }, idempotencyKey: IDEMPOTENCY3 },
     required: ["title"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const description = optional6(args, "description");
+      const description = optional7(args, "description");
       const tags = optionalStrings(args, "tags");
-      const { workspace } = await hub.workspaces.create({ title: need6(args, "title"), ...description ? { description } : {}, ...tags ? { tags } : {} }, { ...idemOption(args), signal });
+      const { workspace } = await hub.workspaces.create({ title: need7(args, "title"), ...description ? { description } : {}, ...tags ? { tags } : {} }, { ...idemOption(args), signal });
       return `created ${wsLine(workspace)}`;
     }
   },
   {
     name: "workspace_update",
     description: `Change a workspace's title, description or tags under its revision. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, expectedRevision: REVISION3, title: STRING5, description: STRING5, tags: { type: "array", items: STRING5 } },
+    properties: { workspace: WORKSPACE, expectedRevision: REVISION4, title: STRING6, description: STRING6, tags: { type: "array", items: STRING6 } },
     required: ["workspace", "expectedRevision"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const patch = definedFields({ title: optional6(args, "title"), description: optional6(args, "description"), tags: optionalStrings(args, "tags") });
+      const patch = definedFields({ title: optional7(args, "title"), description: optional7(args, "description"), tags: optionalStrings(args, "tags") });
       if (!patch)
-        throw new ArgError2(`give "title", "description" or "tags"`);
-      const { workspace } = await hub.workspaces.update(need6(args, "workspace"), { expectedRevision: needRevision(args), ...patch }, { signal });
+        throw new ArgError3(`give "title", "description" or "tags"`);
+      const { workspace } = await hub.workspaces.update(need7(args, "workspace"), { expectedRevision: needRevision(args), ...patch }, { signal });
       return `updated ${wsLine(workspace)}`;
     }
   },
   ...["archive", "restore"].map((verb) => ({
     name: `workspace_${verb}`,
     description: verb === "archive" ? `Archive a workspace under its revision: current members depart and their supervision links are detached. ${WS_SCOPES}` : `Restore an archived workspace under its revision (nobody re-joins). ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, expectedRevision: REVISION3 },
+    properties: { workspace: WORKSPACE, expectedRevision: REVISION4 },
     required: ["workspace", "expectedRevision"],
     readOnly: false,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const id = need6(args, "workspace");
+      const id = need7(args, "workspace");
       if (verb === "archive") {
         const r = await hub.workspaces.archive(id, needRevision(args), { signal });
         return `archived ${wsLine(r.workspace)}; ${r.departed} member(s) departed, ${r.supervision.detached} supervision link(s) detached`;
@@ -7365,77 +7776,77 @@ var workspaceTools = [
   {
     name: "workspace_bind",
     description: `Bind a workspace to a repository (absolute path) on one of the user's machines. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, machineID: STRING5, repo: STRING5, label: STRING5, idempotencyKey: IDEMPOTENCY2 },
+    properties: { workspace: WORKSPACE, machineID: STRING6, repo: STRING6, label: STRING6, idempotencyKey: IDEMPOTENCY3 },
     required: ["workspace", "machineID", "repo"],
     readOnly: false,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const label = optional6(args, "label");
-      const r = await hub.workspaces.bind(need6(args, "workspace"), { machineID: need6(args, "machineID"), repo: need6(args, "repo"), ...label ? { label } : {} }, { ...idemOption(args), signal });
+      const label = optional7(args, "label");
+      const r = await hub.workspaces.bind(need7(args, "workspace"), { machineID: need7(args, "machineID"), repo: need7(args, "repo"), ...label ? { label } : {} }, { ...idemOption(args), signal });
       return `${r.created ? "bound" : "already bound"} ${r.binding.id}  ${r.binding.machineID}:${r.binding.repo}  r${r.binding.revision}`;
     }
   },
   {
     name: "workspace_unbind",
     description: `Remove a repository binding under the binding's revision. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, bindingID: STRING5, expectedRevision: REVISION3 },
+    properties: { workspace: WORKSPACE, bindingID: STRING6, expectedRevision: REVISION4 },
     required: ["workspace", "bindingID", "expectedRevision"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      await hub.workspaces.unbind(need6(args, "workspace"), need6(args, "bindingID"), needRevision(args), { signal });
-      return `unbound ${need6(args, "bindingID")}`;
+      await hub.workspaces.unbind(need7(args, "workspace"), need7(args, "bindingID"), needRevision(args), { signal });
+      return `unbound ${need7(args, "bindingID")}`;
     }
   },
   {
     name: "workspace_join",
     description: `Add a session (ses_…) to a workspace as worker or observer (the master is set by explicit replacement). ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, sessionID: STRING5, role: { type: "string", enum: [...MEMBER_ROLES] }, idempotencyKey: IDEMPOTENCY2 },
+    properties: { workspace: WORKSPACE, sessionID: STRING6, role: { type: "string", enum: [...MEMBER_ROLES] }, idempotencyKey: IDEMPOTENCY3 },
     required: ["workspace", "sessionID", "role"],
     readOnly: false,
     idempotent: true,
     run: async (hub, args, signal) => {
       const role = optionalEnum(args, "role", MEMBER_ROLES);
       if (!role)
-        throw new ArgError2(`"role" is one of ${MEMBER_ROLES.join(", ")}`);
-      const { member, created } = await hub.workspaces.join(need6(args, "workspace"), { sessionID: need6(args, "sessionID"), role }, { ...idemOption(args), signal });
+        throw new ArgError3(`"role" is one of ${MEMBER_ROLES.join(", ")}`);
+      const { member, created } = await hub.workspaces.join(need7(args, "workspace"), { sessionID: need7(args, "sessionID"), role }, { ...idemOption(args), signal });
       return `member ${member.id} (${member.sessionID}, ${member.role}, generation ${member.generation}, r${member.revision}) ${created ? "joined" : "was already a member"}`;
     }
   },
   {
     name: "workspace_leave",
     description: `Remove a member under its revision; its supervision links are detached. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, memberID: STRING5, expectedRevision: REVISION3 },
+    properties: { workspace: WORKSPACE, memberID: STRING6, expectedRevision: REVISION4 },
     required: ["workspace", "memberID", "expectedRevision"],
     readOnly: false,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const r = await hub.workspaces.leave(need6(args, "workspace"), need6(args, "memberID"), needRevision(args), { signal });
+      const r = await hub.workspaces.leave(need7(args, "workspace"), need7(args, "memberID"), needRevision(args), { signal });
       return `member ${r.member.id} left (${r.member.leftReason ?? "removed"}); ${r.supervision.detached} supervision link(s) detached`;
     }
   },
   {
     name: "workspace_assign",
     description: `Give a current member an assignment (title and optional outcome criteria; instructions travel as messages). ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, memberID: STRING5, title: STRING5, criteria: { type: "array", items: STRING5 }, ref: STRING5, idempotencyKey: IDEMPOTENCY2 },
+    properties: { workspace: WORKSPACE, memberID: STRING6, title: STRING6, criteria: { type: "array", items: STRING6 }, ref: STRING6, idempotencyKey: IDEMPOTENCY3 },
     required: ["workspace", "memberID", "title"],
     readOnly: false,
     run: async (hub, args, signal) => {
       const criteria = optionalStrings(args, "criteria");
-      const ref = optional6(args, "ref");
-      const { assignment } = await hub.workspaces.assign(need6(args, "workspace"), { memberID: need6(args, "memberID"), title: need6(args, "title"), ...criteria ? { criteria } : {}, ...ref ? { ref } : {} }, { ...idemOption(args), signal });
+      const ref = optional7(args, "ref");
+      const { assignment } = await hub.workspaces.assign(need7(args, "workspace"), { memberID: need7(args, "memberID"), title: need7(args, "title"), ...criteria ? { criteria } : {}, ...ref ? { ref } : {} }, { ...idemOption(args), signal });
       return `assignment ${assignment.id} → ${assignment.memberID}: ${assignment.status}, r${assignment.revision}`;
     }
   },
   {
     name: "workspace_assignments",
     description: `A workspace's assignments (id, member, status, revision, title), optionally one member's or one status. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, memberID: STRING5, status: { type: "string", enum: [...ASSIGNMENT_STATUSES] } },
+    properties: { workspace: WORKSPACE, memberID: STRING6, status: { type: "string", enum: [...ASSIGNMENT_STATUSES] } },
     required: ["workspace"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const memberID = optional6(args, "memberID");
+      const memberID = optional7(args, "memberID");
       const status = optionalEnum(args, "status", ASSIGNMENT_STATUSES);
-      const r = await hub.workspaces.assignments(need6(args, "workspace"), { ...memberID ? { memberID } : {}, ...status ? { status } : {}, limit: 200, signal });
+      const r = await hub.workspaces.assignments(need7(args, "workspace"), { ...memberID ? { memberID } : {}, ...status ? { status } : {}, limit: 200, signal });
       return r.items.length ? r.items.map((v) => `${v.assignment.id}  ${v.assignment.memberID} (${v.member}, ${v.presence})  ${v.assignment.status}  r${v.assignment.revision}  ${oneLine(sanitizeText(v.assignment.title))}`).join(`
 `) : "no assignments";
     }
@@ -7443,16 +7854,16 @@ var workspaceTools = [
   {
     name: "workspace_assignment_update",
     description: `Set an assignment's status (done and cancelled are final) or move it to another current member, under its revision. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, assignmentID: STRING5, expectedRevision: REVISION3, status: { type: "string", enum: [...ASSIGNMENT_STATUSES] }, memberID: STRING5 },
+    properties: { workspace: WORKSPACE, assignmentID: STRING6, expectedRevision: REVISION4, status: { type: "string", enum: [...ASSIGNMENT_STATUSES] }, memberID: STRING6 },
     required: ["workspace", "assignmentID", "expectedRevision"],
     readOnly: false,
     run: async (hub, args, signal) => {
       const status = optionalEnum(args, "status", ASSIGNMENT_STATUSES);
-      const memberID = optional6(args, "memberID");
+      const memberID = optional7(args, "memberID");
       if (status === undefined === (memberID === undefined))
-        throw new ArgError2(`give exactly one of "status" or "memberID"`);
-      const id = need6(args, "workspace");
-      const assignmentID = need6(args, "assignmentID");
+        throw new ArgError3(`give exactly one of "status" or "memberID"`);
+      const id = need7(args, "workspace");
+      const assignmentID = need7(args, "assignmentID");
       const { assignment } = status !== undefined ? await hub.workspaces.setAssignmentStatus(id, assignmentID, status, needRevision(args), { signal }) : await hub.workspaces.reassign(id, assignmentID, memberID, needRevision(args), { signal });
       return `assignment ${assignment.id} → ${assignment.memberID}: ${assignment.status}, r${assignment.revision}`;
     }
@@ -7460,16 +7871,16 @@ var workspaceTools = [
   {
     name: "workspace_supervise",
     description: `Set who supervises a member (supervisor null detaches), under the supervision graph's revision (workspace_show). Acyclic, at most 6 levels. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, memberID: STRING5, supervisor: { type: ["string", "null"], description: "The supervising member's ID, or null to detach." }, order: { type: "number" }, expectedRevision: REVISION3 },
+    properties: { workspace: WORKSPACE, memberID: STRING6, supervisor: { type: ["string", "null"], description: "The supervising member's ID, or null to detach." }, order: { type: "number" }, expectedRevision: REVISION4 },
     required: ["workspace", "memberID", "supervisor", "expectedRevision"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const supervisor = args.supervisor === null ? null : need6(args, "supervisor");
+      const supervisor = args.supervisor === null ? null : need7(args, "supervisor");
       const order = args.order;
       if (order !== undefined && (typeof order !== "number" || !Number.isFinite(order)))
-        throw new ArgError2(`"order" must be a number`);
-      const r = await hub.workspaces.supervise(need6(args, "workspace"), { memberID: need6(args, "memberID"), supervisorMemberID: supervisor, ...order !== undefined ? { order } : {}, expectedRevision: needRevision(args) }, { signal });
-      return `${r.change}: ${need6(args, "memberID")}${r.link ? ` ← ${r.link.supervisorMemberID} (order ${r.link.order})` : ""}; supervision revision ${r.revision}${r.pruned ? `, ${r.pruned} stale link(s) dropped` : ""}`;
+        throw new ArgError3(`"order" must be a number`);
+      const r = await hub.workspaces.supervise(need7(args, "workspace"), { memberID: need7(args, "memberID"), supervisorMemberID: supervisor, ...order !== undefined ? { order } : {}, expectedRevision: needRevision(args) }, { signal });
+      return `${r.change}: ${need7(args, "memberID")}${r.link ? ` ← ${r.link.supervisorMemberID} (order ${r.link.order})` : ""}; supervision revision ${r.revision}${r.pruned ? `, ${r.pruned} stale link(s) dropped` : ""}`;
     }
   },
   {
@@ -7479,7 +7890,7 @@ var workspaceTools = [
     required: ["workspace"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const v = await hub.workspaces.master(need6(args, "workspace"), { signal });
+      const v = await hub.workspaces.master(need7(args, "workspace"), { signal });
       const line = (m) => `${m.member.id}  ${m.member.sessionID}  generation ${m.member.generation}  ${m.presence}${m.member.leftReason ? `  (${m.member.leftReason})` : ""}`;
       return [
         `workspace ${v.workspaceID} r${v.revision}`,
@@ -7493,17 +7904,17 @@ var workspaceTools = [
   {
     name: "workspace_master_replace",
     description: `Replace (or first set) a workspace's master under the workspace revision: a session (ses_…) or a running launch's session (launchID). The old master departs as replaced; its supervised members move to the new one. No grants move: the new master's session needs its own grants. ${WS_SCOPES}`,
-    properties: { workspace: WORKSPACE, sessionID: STRING5, launchID: STRING5, expectedRevision: REVISION3, idempotencyKey: IDEMPOTENCY2 },
+    properties: { workspace: WORKSPACE, sessionID: STRING6, launchID: STRING6, expectedRevision: REVISION4, idempotencyKey: IDEMPOTENCY3 },
     required: ["workspace", "expectedRevision"],
     readOnly: false,
     idempotent: true,
     run: async (hub, args, signal) => {
-      const sessionID = optional6(args, "sessionID");
-      const launchID = optional6(args, "launchID");
+      const sessionID = optional7(args, "sessionID");
+      const launchID = optional7(args, "launchID");
       if (sessionID === undefined === (launchID === undefined))
-        throw new ArgError2(`give exactly one of "sessionID" or "launchID"`);
+        throw new ArgError3(`give exactly one of "sessionID" or "launchID"`);
       const target = sessionID !== undefined ? { sessionID } : { launchID };
-      const r = await hub.workspaces.replaceMaster(need6(args, "workspace"), { ...target, expectedRevision: needRevision(args) }, { ...idemOption(args), signal });
+      const r = await hub.workspaces.replaceMaster(need7(args, "workspace"), { ...target, expectedRevision: needRevision(args) }, { ...idemOption(args), signal });
       if (!r.changed)
         return `${r.master.sessionID} already is the master (${r.master.id}); nothing changed`;
       return [
@@ -7521,7 +7932,7 @@ var workspaceTools = [
     required: ["workspace"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const b = await hub.workspaces.board(need6(args, "workspace"), { signal });
+      const b = await hub.workspaces.board(need7(args, "workspace"), { signal });
       const more = (truncated) => truncated ? "  (more not shown)" : "";
       const section = (name, s, line) => s.status === "ok" ? [`${name}:${more(s.truncated)}`, ...s.items.map((i) => `  ${line(i)}`)] : [`${name}: ${s.status}${s.status === "omitted" ? ` (needs ${s.scope})` : ""}`];
       const lines = [wsLine(b.workspace), ...b.workspace.masterMemberID ? [`master: ${b.workspace.masterMemberID}`] : []];
@@ -7546,6 +7957,7 @@ var TOOLS = [
   eventsTool,
   ...webhookTools,
   ...profileTools,
+  ...profileLifecycleTools,
   ...workspaceTools,
   ...artifactTools,
   ...artifactJobTools,
@@ -7570,14 +7982,14 @@ var TOOLS = [
     name: "sessions",
     description: "The sessions as a flat list, optionally filtered.",
     properties: {
-      project: { ...STRING5, description: "Only this project." },
-      state: { ...STRING5, description: "Only these states (comma-separated, e.g. busy,blocked)." },
-      machine: { ...STRING5, description: "Only this machine." },
-      label: { type: "array", items: STRING5, description: "key=value labels that must all match." }
+      project: { ...STRING6, description: "Only this project." },
+      state: { ...STRING6, description: "Only these states (comma-separated, e.g. busy,blocked)." },
+      machine: { ...STRING6, description: "Only this machine." },
+      label: { type: "array", items: STRING6, description: "key=value labels that must all match." }
     },
     readOnly: true,
     run: async (hub, args, signal) => {
-      const body = await hub.sessions({ project: optional6(args, "project"), state: optional6(args, "state"), machine: optional6(args, "machine"), label: optionalStrings(args, "label"), signal });
+      const body = await hub.sessions({ project: optional7(args, "project"), state: optional7(args, "state"), machine: optional7(args, "machine"), label: optionalStrings(args, "label"), signal });
       return sessionsText(body.sessions ?? []);
     }
   },
@@ -7587,7 +7999,7 @@ var TOOLS = [
     properties: { addr: ADDR2 },
     required: ["addr"],
     readOnly: true,
-    run: async (hub, args, signal) => showText(await hub.show(need6(args, "addr"), { signal }))
+    run: async (hub, args, signal) => showText(await hub.show(need7(args, "addr"), { signal }))
   },
   {
     name: "log",
@@ -7596,7 +8008,7 @@ var TOOLS = [
     required: ["addr"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
+      const addr = need7(args, "addr");
       const n = optionalInt(args, "n", 1, 200);
       return logText((await hub.log(addr, { ...n !== undefined ? { n } : {}, signal })).rows ?? []);
     }
@@ -7605,25 +8017,25 @@ var TOOLS = [
     name: "who",
     description: "Named and role-holding sessions; a team member sees its teams, grouped by team with its reach to each.",
     properties: {
-      project: { ...STRING5, description: "Only this project." },
-      role: { ...STRING5, description: "Only holders of this role (reviewer, @@reviewer or reviewer#team)." },
-      team: { ...STRING5, description: "Only this team (name or ID)." }
+      project: { ...STRING6, description: "Only this project." },
+      role: { ...STRING6, description: "Only holders of this role (reviewer, @@reviewer or reviewer#team)." },
+      team: { ...STRING6, description: "Only this team (name or ID)." }
     },
     readOnly: true,
     run: async (hub, args, signal) => {
-      const body = await hub.who({ project: optional6(args, "project"), role: optional6(args, "role"), team: optional6(args, "team"), signal });
+      const body = await hub.who({ project: optional7(args, "project"), role: optional7(args, "role"), team: optional7(args, "team"), signal });
       return whoText(body.sessions ?? [], body);
     }
   },
   {
     name: "msg",
     description: "Tell a session something (fire and forget). Sent as this server's credential, not as an OpenCode session.",
-    properties: { to: TO, text: { ...STRING5, description: "The message." }, ...SEND },
+    properties: { to: TO, text: { ...STRING6, description: "The message." }, ...SEND },
     required: ["to", "text"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const to = need6(args, "to");
-      const text = need6(args, "text");
+      const to = need7(args, "to");
+      const text = need7(args, "text");
       const options = { ...sendOptions(args), signal };
       if (optionalBool(args, "all"))
         return sentAllText(await hub.msg(to, text, { ...options, all: true }));
@@ -7635,7 +8047,7 @@ var TOOLS = [
     description: `Ask a session a question, tracked until answered, declined or expired. wait (at most ${WAIT_POLL_MAX_S} s) blocks for the answer; otherwise it shows up in the inbox tool.`,
     properties: {
       to: TO,
-      text: { ...STRING5, description: "The question." },
+      text: { ...STRING6, description: "The question." },
       wait: { type: "number", minimum: 0, maximum: WAIT_POLL_MAX_S, description: `Seconds to wait for the answer (0–${WAIT_POLL_MAX_S}).` },
       expires: { type: ["number", "string"], description: "When the ask expires: seconds, or 30s, 5m, 2h, 1d (1 minute to 7 days; default 24 h)." },
       ...SEND
@@ -7643,14 +8055,14 @@ var TOOLS = [
     required: ["to", "text"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const to = need6(args, "to");
-      const text = need6(args, "text");
+      const to = need7(args, "to");
+      const text = need7(args, "text");
       const wait = optionalWait(args);
       const expires = optionalExpires(args);
       const options = { ...sendOptions(args), ...expires !== undefined ? { expires } : {}, signal };
       if (optionalBool(args, "all")) {
         if (wait !== undefined)
-          throw new ArgError2(`"wait" cannot be combined with "all"`);
+          throw new ArgError3(`"wait" cannot be combined with "all"`);
         return sentAllText(await hub.ask(to, text, { ...options, all: true }));
       }
       const asked = await hub.ask(to, text, { ...options, ...wait !== undefined ? { wait } : {} });
@@ -7662,12 +8074,12 @@ ${openedText(asked.decision)}` : outcome;
   {
     name: "reply",
     description: "Reply to a message you received; it goes to the message's real sender.",
-    properties: { id: MSG_ID, text: { ...STRING5, description: "The reply." }, wake: SEND.wake },
+    properties: { id: MSG_ID, text: { ...STRING6, description: "The reply." }, wake: SEND.wake },
     required: ["id", "text"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const id = need6(args, "id");
-      const text = need6(args, "text");
+      const id = need7(args, "id");
+      const text = need7(args, "text");
       const wake = optionalBool(args, "wake");
       return repliedText(await hub.reply(id, text, { ...wake !== undefined ? { wake } : {}, signal }));
     }
@@ -7675,12 +8087,12 @@ ${openedText(asked.decision)}` : outcome;
   {
     name: "decline",
     description: "Decline an ask you received, with a reason.",
-    properties: { id: MSG_ID, why: { ...STRING5, description: "The reason." } },
+    properties: { id: MSG_ID, why: { ...STRING6, description: "The reason." } },
     required: ["id", "why"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const id = need6(args, "id");
-      return declinedText(await hub.decline(id, need6(args, "why"), { signal }));
+      const id = need7(args, "id");
+      return declinedText(await hub.decline(id, need7(args, "why"), { signal }));
     }
   },
   {
@@ -7700,7 +8112,7 @@ ${openedText(asked.decision)}` : outcome;
     required: ["id"],
     readOnly: true,
     run: async (hub, args, signal) => {
-      const id = need6(args, "id");
+      const id = need7(args, "id");
       const wait = optionalWait(args);
       return messageText(await hub.message(id, { ...wait !== undefined ? { wait } : {}, signal }));
     }
@@ -7713,7 +8125,7 @@ ${openedText(asked.decision)}` : outcome;
     readOnly: false,
     organizes: true,
     idempotent: true,
-    run: async (hub, args, signal) => mutedText((await hub[verb](need6(args, "addr"), { signal })).muted)
+    run: async (hub, args, signal) => mutedText((await hub[verb](need7(args, "addr"), { signal })).muted)
   })),
   {
     name: "decisions",
@@ -7721,9 +8133,9 @@ ${openedText(asked.decision)}` : outcome;
     properties: { state: { type: "string", enum: [...DECISION_STATES], description: "Only Decisions in this state." } },
     readOnly: true,
     run: async (hub, args, signal) => {
-      const state = optional6(args, "state");
+      const state = optional7(args, "state");
       if (state !== undefined && !DECISION_STATES.includes(state))
-        throw new ArgError2(`"state" is one of ${DECISION_STATES.join(", ")}`);
+        throw new ArgError3(`"state" is one of ${DECISION_STATES.join(", ")}`);
       const { decisions } = await hub.decisions({ ...state ? { state } : {}, signal });
       return decisions.length ? `${DECISIONS_NOTE}
 ${decisionsText(decisions)}` : decisionsText(decisions);
@@ -7736,7 +8148,7 @@ ${decisionsText(decisions)}` : decisionsText(decisions);
     required: ["id"],
     readOnly: true,
     run: async (hub, args, signal) => `${DECISIONS_NOTE}
-${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
+${decisionText((await hub.decision(need7(args, "id"), { signal })).decision)}`
   },
   {
     name: "approve",
@@ -7745,8 +8157,8 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     required: ["addr", "requestID"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
-      const requestID = need6(args, "requestID");
+      const addr = need7(args, "addr");
+      const requestID = need7(args, "requestID");
       const always = optionalBool(args, "always");
       return approvedText(await hub.approve(addr, requestID, { ...always ? { always } : {}, ...whyOption(args), signal }));
     }
@@ -7758,8 +8170,8 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     required: ["addr", "requestID"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
-      const requestID = need6(args, "requestID");
+      const addr = need7(args, "addr");
+      const requestID = need7(args, "requestID");
       return deniedText(await hub.deny(addr, requestID, { ...whyOption(args), signal }));
     }
   },
@@ -7776,8 +8188,8 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     required: ["addr", "formID"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
-      const formID = need6(args, "formID");
+      const addr = need7(args, "addr");
+      const formID = need7(args, "formID");
       const given = formAnswer(args);
       const options = { ...whyOption(args), signal };
       return answeredText(given === "cancel" ? await hub.cancelForm(addr, formID, options) : await hub.answer(addr, formID, given, options), given === "cancel");
@@ -7788,15 +8200,15 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     description: `Prompt a session (an agent's prompt carries the hub's provenance). ${NEEDS_USER}`,
     properties: {
       addr: ADDR2,
-      text: { ...STRING5, description: "The prompt." },
+      text: { ...STRING6, description: "The prompt." },
       delivery: { type: "string", enum: [...DELIVERIES], description: "How it enters a busy session (the spoke picks when unset)." },
       why: WHY
     },
     required: ["addr", "text"],
     readOnly: false,
     run: async (hub, args, signal) => {
-      const addr = need6(args, "addr");
-      const text = need6(args, "text");
+      const addr = need7(args, "addr");
+      const text = need7(args, "text");
       const delivery = optionalDelivery(args);
       return promptedText(await hub.prompt(addr, text, { ...delivery ? { delivery } : {}, ...whyOption(args), signal }));
     }
@@ -7807,32 +8219,32 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     properties: { addr: ADDR2, why: WHY },
     required: ["addr"],
     readOnly: false,
-    run: async (hub, args, signal) => stoppedText(await hub.stop(need6(args, "addr"), { ...whyOption(args), signal }))
+    run: async (hub, args, signal) => stoppedText(await hub.stop(need7(args, "addr"), { ...whyOption(args), signal }))
   },
   {
     name: "launch",
     description: "Start a new session on a node (a hub node with the repo under its workspace roots). The same key again answers the same launch. Needs an app token with scope sessions:launch and a grant with verb launch covering the repo.",
     properties: {
-      repo: { ...STRING5, description: "Absolute path of the repository on the node (or where a clone goes)." },
+      repo: { ...STRING6, description: "Absolute path of the repository on the node (or where a clone goes)." },
       mode: { type: "string", enum: [...WORKSPACE_MODES], description: "worktree (default: <repo>/.worktrees/<branch>, needs branch), checkout, or clone (needs remote)." },
-      branch: { ...STRING5, description: "The branch to create or check out." },
-      base: { ...STRING5, description: "What a new branch starts from." },
-      remote: { ...STRING5, description: "An https or ssh git remote (for clone)." },
-      key: { ...STRING5, description: "Idempotency key: retrying with the same key and arguments answers the same launch." },
-      name: { ...STRING5, description: "The session's @name." },
-      roles: { type: "array", items: STRING5, description: "Roles the session claims (e.g. reviewer.hub)." },
-      harness: { ...STRING5, description: "The harness (default opencode)." },
-      agent: { ...STRING5, description: "The harness agent (e.g. build)." },
-      model: { ...STRING5, description: "provider/model." },
+      branch: { ...STRING6, description: "The branch to create or check out." },
+      base: { ...STRING6, description: "What a new branch starts from." },
+      remote: { ...STRING6, description: "An https or ssh git remote (for clone)." },
+      key: { ...STRING6, description: "Idempotency key: retrying with the same key and arguments answers the same launch." },
+      name: { ...STRING6, description: "The session's @name." },
+      roles: { type: "array", items: STRING6, description: "Roles the session claims (e.g. reviewer.hub)." },
+      harness: { ...STRING6, description: "The harness (default opencode)." },
+      agent: { ...STRING6, description: "The harness agent (e.g. build)." },
+      model: { ...STRING6, description: "provider/model." },
       runtime: { type: "string", enum: [...RUNTIME_KINDS], description: "host (default) or openshell (a sandbox)." },
-      profile: { ...STRING5, description: "The runtime's sandbox profile (needs runtime)." },
-      machine: { ...STRING5, description: "The machine (name or ID) to run on." },
+      profile: { ...STRING6, description: "The runtime's sandbox profile (needs runtime)." },
+      machine: { ...STRING6, description: "The machine (name or ID) to run on." },
       nodeLabels: { ...LABELS, description: 'Node labels to place on (e.g. {"os": "darwin"}).' },
       prefer: { type: "boolean", description: "machine and nodeLabels are preferences, not requirements." },
       labels: { ...LABELS, description: "Free-form labels for finding the launch and its session later (never interpreted by the hub)." },
-      prompt: { ...STRING5, description: "The session's first prompt." },
+      prompt: { ...STRING6, description: "The session's first prompt." },
       end: { type: "string", enum: [...LAUNCH_END_WHEN], description: "When it ends: idle (default; idle with nothing open for 30 s), asked (with a question open: needs_user), never." },
-      timeout: { ...STRING5, description: "Longest run, e.g. 4h or 90m." },
+      timeout: { ...STRING6, description: "Longest run, e.g. 4h or 90m." },
       cleanup: { type: "string", enum: [...CLEANUP_POLICIES], description: "keep (default) or remove the workspace when it ends." }
     },
     required: ["repo"],
@@ -7847,12 +8259,12 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     name: "launches",
     description: "Your launches, oldest first (an app or session sees the ones it started).",
     properties: {
-      state: { ...STRING5, description: "Only these states (comma-separated: queued, placing, provisioning, running, ended)." },
-      label: { type: "array", items: STRING5, description: "key=value launch labels that must all match." }
+      state: { ...STRING6, description: "Only these states (comma-separated: queued, placing, provisioning, running, ended)." },
+      label: { type: "array", items: STRING6, description: "key=value launch labels that must all match." }
     },
     readOnly: true,
     run: async (hub, args, signal) => {
-      const state = optional6(args, "state")?.split(",").filter(Boolean);
+      const state = optional7(args, "state")?.split(",").filter(Boolean);
       const label = optionalStrings(args, "label");
       return launchesText((await hub.launches.list({ ...state?.length ? { state } : {}, ...label ? { label } : {}, signal })).launches ?? []);
     }
@@ -7863,7 +8275,7 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     properties: { id: LAUNCH_ID },
     required: ["id"],
     readOnly: true,
-    run: async (hub, args, signal) => launchText((await hub.launches.get(need6(args, "id"), { signal })).launch)
+    run: async (hub, args, signal) => launchText((await hub.launches.get(need7(args, "id"), { signal })).launch)
   },
   {
     name: "launch_stop",
@@ -7871,7 +8283,7 @@ ${decisionText((await hub.decision(need6(args, "id"), { signal })).decision)}`
     properties: { id: LAUNCH_ID },
     required: ["id"],
     readOnly: false,
-    run: async (hub, args, signal) => stoppedLaunchText((await hub.launches.stop(need6(args, "id"), { signal })).launch)
+    run: async (hub, args, signal) => stoppedLaunchText((await hub.launches.stop(need7(args, "id"), { signal })).launch)
   }
 ];
 var toolList = () => TOOLS.map((t) => ({
@@ -7938,7 +8350,7 @@ function createMcpServer(options) {
     } catch (cause) {
       if (controller.signal.aborted)
         return;
-      const text = cause instanceof ArgError2 ? `invalid: ${cause.message}` : cause instanceof CliError ? errorText(cause) : `${tool.name} failed: ${cause instanceof Error ? cause.message : String(cause)}`;
+      const text = cause instanceof ToolArgError ? `invalid: ${cause.message}` : cause instanceof CliError ? errorText(cause) : `${tool.name} failed: ${cause instanceof Error ? cause.message : String(cause)}`;
       return ok2(id, toolResult(clean(text, token), true));
     } finally {
       if (inFlight.get(key(id)) === controller)
@@ -8375,7 +8787,7 @@ import { arch as osArch, platform as osPlatform } from "node:os";
 // packages/node/package.json
 var package_default2 = {
   name: "@huynle/hub-node",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "`hub node`: the per-machine daemon that prepares, collects and cleans up launch workspaces (internal; shipped inside @huynle/hub, not published on its own).",
   license: "MIT",
@@ -9467,7 +9879,7 @@ import path13 from "node:path";
 // packages/runtime-openshell/package.json
 var package_default3 = {
   name: "@huynle/hub-runtime-openshell",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "The `openshell` runtime of `hub node`: launches in NVIDIA OpenShell sandboxes, driven through the openshell CLI (internal; shipped inside @huynle/hub, not published on its own).",
   license: "MIT",
@@ -10031,9 +10443,10 @@ var openCodeServiceFile = (env, home) => path14.join(env.XDG_STATE_HOME || path1
 function startOpenCodeWarmers(config, service, log, signal) {
   const roots = () => config.workspaceRoots;
   const directories = config.opencode?.directories;
-  new OpenCodeWarmer({ discover: service, log, roots, ...directories ? { directories } : {} }).start(signal);
+  const timeout = config.opencode?.timeoutSeconds !== undefined ? { timeoutMs: config.opencode.timeoutSeconds * 1000 } : {};
+  new OpenCodeWarmer({ discover: service, log, roots, ...timeout, ...directories ? { directories } : {} }).start(signal);
   for (const server of config.opencode?.servers ?? []) {
-    new OpenCodeWarmer({ discover: serverEndpoint(server), log, name: "the OpenCode server", roots, ...server.directories ? { directories: server.directories } : {} }).start(signal);
+    new OpenCodeWarmer({ discover: serverEndpoint(server), log, name: "the OpenCode server", roots, ...timeout, ...server.directories ? { directories: server.directories } : {} }).start(signal);
   }
 }
 async function setupOpenShell(config, credentials, options, env, log) {
@@ -10414,8 +10827,8 @@ var EMBEDDED_TEXT = Object.freeze({
 // packages/cli/src/bootstrap/adapters/node-services/render.ts
 var SERVICE_ENVIRONMENT = Object.freeze({
   node: ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_CLAUDE_BIN", "HUB_CODEX_BIN"],
-  "claude-code": ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR", "HUB_CLAUDE_SOCKET", "HUB_CLAUDE_BIN"],
-  "codex-spoke": ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR", "CODEX_HOME", "HUB_CODEX_BIN", "HUB_CODEX_DAEMON_SOCKET"]
+  "claude-code": ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR", "XDG_STATE_HOME", "HUB_CLAUDE_SOCKET", "HUB_CLAUDE_BIN"],
+  "codex-spoke": ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR", "XDG_STATE_HOME", "CODEX_HOME", "HUB_CODEX_BIN", "HUB_CODEX_DAEMON_SOCKET"]
 });
 var UNIT_ROOT = Object.freeze({ launchd: "launch-agents", "systemd-user": "systemd-user" });
 var assetIDFor = (service, manager) => `service/${manager}/${service}`;
@@ -11008,6 +11421,15 @@ function wsURL2(server) {
 var defaultSocket2 = (url, headers) => new WebSocket(url, { headers });
 var message2 = (cause) => cause instanceof Error ? cause.message : String(cause);
 
+class CodedError extends Error {
+  code;
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+    this.name = "CodedError";
+  }
+}
+
 class SpokeConnection {
   options;
   state = "off";
@@ -11177,7 +11599,7 @@ class SpokeConnection {
     try {
       reply = { t: "res", id, ok: true, result: await this.options.handle(req) };
     } catch (cause) {
-      reply = { t: "res", id, ok: false, error: message2(cause) };
+      reply = { t: "res", id, ok: false, error: message2(cause), ...cause instanceof CodedError ? { code: cause.code } : {} };
     }
     this.send(reply);
   }
@@ -11358,7 +11780,7 @@ function tail(s) {
   const asks = s.openAsks ? `, ${s.openAsks} open ask${s.openAsks === 1 ? "" : "s"} from you` : "";
   return `${clean2(s.state) || "unknown"}${asks}`;
 }
-function one2(s) {
+function one3(s) {
   const more = details(s);
   if (s.self)
     return `this session (${[s.sessionID, ...more].join(" · ")}), ${tail(s)}`;
@@ -11371,7 +11793,7 @@ function member(s) {
 }
 function renderReferences(refs) {
   const lines = refs.map((r) => {
-    const body = r.sessions.length === 1 ? one2(r.sessions[0]) : `${r.sessions.length} sessions: ${r.sessions.map(member).join("; ")}`;
+    const body = r.sessions.length === 1 ? one3(r.sessions[0]) : `${r.sessions.length} sessions: ${r.sessions.map(member).join("; ")}`;
     return `- ${r.address} = ${body}.`;
   });
   const single = refs.length === 1 && refs[0].sessions.length === 1;
@@ -11841,7 +12263,7 @@ import { homedir as homedir5 } from "node:os";
 import path17 from "node:path";
 var SOCKET_PATH_MAX = 103;
 function claudeStateDir(env = process.env, home = homedir5()) {
-  return path17.join(hubEnv(env).HUB_STATE_DIR || path17.join(stateBase(home), APP_DIR), "claude-code");
+  return path17.join(resolveHubStateDir(env, home).dir, "claude-code");
 }
 function socketPath(env = process.env, home = homedir5()) {
   return env.HUB_CLAUDE_SOCKET || path17.join(claudeStateDir(env, home), "daemon.sock");
@@ -13141,7 +13563,7 @@ import path22 from "node:path";
 // packages/claude-code/package.json
 var package_default4 = {
   name: "@huynle/hub-claude-code",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "The Claude Code hooks spoke: per-user daemon, hook bridge, plugin dir, `hub claude` wrapper and daemon-backed MCP server (internal; shipped inside @huynle/hub, not published on its own).",
   license: "MIT",
@@ -13430,7 +13852,7 @@ import path25 from "node:path";
 // packages/preset/package.json
 var package_default5 = {
   name: "@huynle/hub-preset",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "The preset spoke: drives a harness without a spoke of its own through a terminal pane (tmux), described by a data-only preset; official presets in presets/ (internal; shipped inside @huynle/hub, not published on its own).",
   license: "MIT",
@@ -13955,7 +14377,7 @@ import { openSync as openSync5, closeSync as closeSync5, readFileSync as readFil
 // packages/codex/package.json
 var package_default6 = {
   name: "@huynle/hub-codex",
-  version: "0.8.0",
+  version: "0.8.2",
   private: true,
   description: "The Codex app-server spoke: attaches to Codex's app-server (its own over stdio, and the shared daemon's socket when present), and the `hub codex` wrapper (internal; shipped inside @huynle/hub, not published on its own).",
   license: "MIT",
@@ -13980,7 +14402,7 @@ function daemonSocketPath(env = process.env, home = homedir6()) {
   return override || path26.join(codexHome(env, home), "app-server-control", "app-server-control.sock");
 }
 function codexStateDir(env = process.env, home = homedir6()) {
-  return path26.join(hubEnv(env).HUB_STATE_DIR || path26.join(stateBase(home), APP_DIR), "codex");
+  return path26.join(resolveHubStateDir(env, home).dir, "codex");
 }
 var pidFile = (env = process.env, home = homedir6()) => path26.join(codexStateDir(env, home), "spoke.pid");
 var isPid = (n) => typeof n === "number" && Number.isInteger(n) && n > 1;
@@ -15374,7 +15796,7 @@ async function codexMain(argv, io) {
 import path30 from "node:path";
 var SERVICE_VERBS = ["install", "uninstall", "status"];
 var isServiceVerb = (verb) => SERVICE_VERBS.includes(verb ?? "");
-var HUB_PLACES = ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR"];
+var HUB_PLACES = ["HUB_SPOKE_CONFIG", "XDG_CONFIG_HOME", "HUB_STATE_DIR", "XDG_STATE_HOME"];
 var CLAUDE_CODE_SERVICE = {
   service: "claude-code",
   command: "hub claude-code",
@@ -15516,7 +15938,7 @@ async function runCodex(args, given) {
 // packages/cli/src/setup/commands.ts
 import { existsSync as existsSync9, readFileSync as readFileSync12, renameSync as renameSync7, writeFileSync as writeFileSync8 } from "node:fs";
 import { hostname as hostname4 } from "node:os";
-import path33 from "node:path";
+import path34 from "node:path";
 
 // packages/cli/src/bootstrap/transaction/result.ts
 var txOk = (value) => ({ ok: true, value });
@@ -17049,6 +17471,7 @@ function installOf(probe, id, shim, roots, context = "host") {
 var escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 
 // packages/cli/src/bootstrap/discovery/host.ts
+import path32 from "node:path";
 function discoverRoots(probe) {
   const home = normalizeAbs(probe.env.HOME) ?? normalizeAbs(probe.home);
   if (!home)
@@ -17058,7 +17481,7 @@ function discoverRoots(probe) {
   const paths = {
     home,
     config,
-    state: xdg("XDG_STATE_HOME", ".local/state"),
+    state: hubStateRoot(probe, home) ?? xdg("XDG_STATE_HOME", ".local/state"),
     data: xdg("XDG_DATA_HOME", ".local/share"),
     "user-bin": join(home, ".local/bin"),
     "system-bin": "/usr/local/bin"
@@ -17069,6 +17492,12 @@ function discoverRoots(probe) {
     paths["systemd-user"] = join(config, "systemd/user");
   return ROOT_IDS.flatMap((id) => paths[id] ? [{ id, path: paths[id] }] : []);
 }
+function hubStateRoot(probe, home) {
+  const env = { ...probe.env, ...probe.env.XDG_STATE_HOME !== undefined ? { XDG_STATE_HOME: normalizeAbs(probe.env.XDG_STATE_HOME) } : {} };
+  const { dir } = resolveHubStateDir(env, home, (p) => probe.lstat(p) !== "missing");
+  const abs = normalizeAbs(dir);
+  return abs && path32.posix.basename(abs) === "hub" ? path32.posix.dirname(abs) : undefined;
+}
 var unescapeMount = (s) => s.replace(/\\([0-7]{3})/g, (_, o) => String.fromCharCode(parseInt(o, 8)));
 function parseMountinfo(text) {
   const mounts = [];
@@ -20448,7 +20877,7 @@ function createCodexAdapter(options) {
 
 // packages/cli/src/bootstrap/adapters/node-services/control.ts
 import { spawn as nodeSpawn } from "node:child_process";
-import path32 from "node:path";
+import path33 from "node:path";
 var HEALTH_WINDOW = Object.freeze({ timeoutMs: 1e4, stableMs: 3000, pollMs: 500 });
 var realClock = { now: () => Date.now(), sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)) };
 var UNITS = new Set(SERVICE_IDS.map((s) => serviceName(s, "systemd-user")));
@@ -20488,7 +20917,7 @@ function checkManagerCall(call) {
     if (verb === "print" || verb === "bootout")
       return words.length === 2 && LABELS2.has(labelOfTarget(target) ?? "");
     if (verb === "bootstrap")
-      return words.length === 3 && DOMAIN.test(target) && isAbsolutePath(file) && LABELS2.has(path32.basename(file).replace(/\.plist$/, "")) && file.endsWith(".plist");
+      return words.length === 3 && DOMAIN.test(target) && isAbsolutePath(file) && LABELS2.has(path33.basename(file).replace(/\.plist$/, "")) && file.endsWith(".plist");
     return false;
   }
   return false;
@@ -20690,7 +21119,7 @@ var defaultSpawn = (file, words, options) => new Promise((resolve) => {
 function spawnManagerRunner(options) {
   for (const program of ["systemctl", "launchctl"]) {
     const file = options.programs[program];
-    if (!isAbsolutePath(file) || path32.basename(file) !== program)
+    if (!isAbsolutePath(file) || path33.basename(file) !== program)
       throw new Error(`${program} must be given as an absolute path to ${program}`);
   }
   const env = {};
@@ -23164,7 +23593,7 @@ async function profileArg(io, value, fallback) {
     return unwrapProfile(defaultProfile(value));
   if (value !== "-" && !value.includes("/") && !value.endsWith(".json"))
     throw new Refusal("usage", `unknown profile ${value}: use ${PROFILE_IDS.join(", ")}, a profile file, or - for stdin`);
-  const text = value === "-" ? await (io.stdin?.() ?? Promise.reject(new Refusal("usage", "cannot read the profile from stdin here"))) : readText2(path33.resolve(io.cwd ?? process.cwd(), value), "profile");
+  const text = value === "-" ? await (io.stdin?.() ?? Promise.reject(new Refusal("usage", "cannot read the profile from stdin here"))) : readText2(path34.resolve(io.cwd ?? process.cwd(), value), "profile");
   const loaded = loadProfile(parseJSON2(text, "profile"));
   if (!loaded.ok)
     throw issueRefusal(loaded.issues);
@@ -23178,7 +23607,7 @@ function unwrapProfile(r) {
 function manifestArg(io, value) {
   if (value === undefined)
     return;
-  const parsed = parseManifest(readText2(path33.resolve(io.cwd ?? process.cwd(), value), "manifest"));
+  const parsed = parseManifest(readText2(path34.resolve(io.cwd ?? process.cwd(), value), "manifest"));
   if (!parsed.ok)
     throw new Refusal("signature_invalid", issuesText(parsed.issues));
   const root = shippedTrustRoot(io.bootstrap?.trustRoot);
@@ -23204,10 +23633,23 @@ function readState(snapshot) {
     throw new Refusal("recovery_required", error.message);
   }
 }
+function launchCredentials(io) {
+  let warned = false;
+  return () => {
+    const found = resolveCredentials(io.env, io.home);
+    if (found?.source === "login" && !warned && isInsecureStoredURL(found.url)) {
+      warned = true;
+      io.stderr(`hubctl: warning: ${storedInsecureWarning(found.url)}
+`);
+    }
+    return found;
+  };
+}
 function launchDriverFor(io) {
   const store = credentialStoreFor(io.env, io.home);
+  const login = launchCredentials(io);
   const client = () => {
-    const credentials = resolveCredentials(io.env, io.home);
+    const credentials = login();
     if (!credentials)
       throw new Error("not logged in to the hub (run `hub login --scope sessions:launch`; an app token launches under a grant with verb launch)");
     return clientFor(credentials);
@@ -23262,7 +23704,7 @@ function choicesOf(io, flags, profile, snapshot) {
   const enrollment = str(flags, "enrollment");
   if (enrollment !== undefined && !ENROLLMENT_MODES.includes(enrollment))
     throw new Refusal("usage", `--enrollment is ${ENROLLMENT_MODES.join(" or ")}`);
-  let roots = flags["workspace-root"]?.map((r) => path33.resolve(io.cwd ?? process.cwd(), r));
+  let roots = flags["workspace-root"]?.map((r) => path34.resolve(io.cwd ?? process.cwd(), r));
   if (!roots?.length && profile.services.includes("node")) {
     const existing = readNodeConfig(nodeConfigPath(io.env, io.home)).config.workspaceRoots;
     if (existing.length > 0)
@@ -23374,7 +23816,7 @@ async function preview3(io, flags, json) {
   const out = str(flags, "out");
   if (out) {
     const request = { schema: "hub.setup-request", version: 1, preview: r.value, profile, choices };
-    const file = path33.resolve(io.cwd ?? process.cwd(), out);
+    const file = path34.resolve(io.cwd ?? process.cwd(), out);
     const tmp = `${file}.${process.pid}.tmp`;
     writeFileSync8(tmp, `${JSON.stringify(request, null, 2)}
 `, { mode: 384 });
@@ -23387,7 +23829,7 @@ async function preview3(io, flags, json) {
 function readRequest(io, file) {
   if (!file)
     throw new UsageError("needs --preview <file> (from hubctl setup preview --out <file>)");
-  const raw = parseJSON2(readText2(path33.resolve(io.cwd ?? process.cwd(), file), "preview"), "preview", "preview_invalid");
+  const raw = parseJSON2(readText2(path34.resolve(io.cwd ?? process.cwd(), file), "preview"), "preview", "preview_invalid");
   const r = validateSetupRequest(raw);
   if (!r.ok)
     throw new Refusal("preview_invalid", `${file} is not a hubctl setup preview: ${issuesText(r.issues)}`, "Preview again: hubctl setup preview --out <file>");
@@ -23563,7 +24005,7 @@ function observe(plan, snapshot) {
         continue;
       const server = file.exists ? at(file.value, `/mcp/servers/${f.registration.name}`) : { found: false };
       const command = server.value?.command;
-      const ours = Array.isArray(command) && command[1] === "mcp" && typeof command[0] === "string" && ["hub", "hubctl"].includes(path33.basename(command[0]));
+      const ours = Array.isArray(command) && command[1] === "mcp" && typeof command[0] === "string" && ["hub", "hubctl"].includes(path34.basename(command[0]));
       registrations.push({ ...f.registration, state: !server.found ? "absent" : ours ? "ours" : "foreign" });
     }
   }
@@ -23696,7 +24138,7 @@ async function ansible(io, flags, json) {
   const planFile = str(flags, "plan");
   let plan;
   if (planFile) {
-    const raw = parseJSON2(readText2(path33.resolve(io.cwd ?? process.cwd(), planFile), "plan"), "plan");
+    const raw = parseJSON2(readText2(path34.resolve(io.cwd ?? process.cwd(), planFile), "plan"), "plan");
     plan = raw.schema === "hub.setup-request" ? raw.preview?.plan : raw.schema === "hub.setup-preview" ? raw.plan : raw;
   }
   const r = renderRoleVars({
@@ -23917,7 +24359,7 @@ Options: --json (raw responses), --help, --version
 Addresses: ses_… (or an unambiguous prefix), @name, @@role, @@role#team (quote it: '@@dev#team'), @name.project, @me (the user)
 Credentials: HUB_URL + HUB_SESSION_TOKEN (set in a session's shells), else the \`hub login\` file.
 Exit codes: 0 ok, 1 other, 2 usage, 3 not found/ambiguous/taken, 4 needs user, 5 forbidden/paused,
-  6 rate limited, 7 unsupported/offline, 8 gone, 9 unauthorized/expired`;
+  6 rate limited, 7 unsupported/offline/busy, 8 gone, 9 unauthorized/expired`;
 var out = (io, text) => io.stdout(text.endsWith(`
 `) ? text : `${text}
 `);
@@ -24400,7 +24842,7 @@ ${openedText(body.decision)}` : outcome.text);
         const server = checkServerURL(url, allow);
         if (!server) {
           const why = insecureHTTPRefusal(url, allow);
-          throw new UsageError(why ? `${why}: ${url.slice(0, 200)}` : `the hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${url.slice(0, 200)}`);
+          throw new UsageError(why ? `${why}: ${shownURL(url)}` : `the hub URL must be https (plain http only for a loopback hub), without user info, query or fragment: ${shownURL(url)}`);
         }
         if (isPlainHTTP(server) && !isLoopbackServer(server))
           io.stderr(`hub: warning: ${insecureHTTPWarning(server)}