@indigoai-us/hq-cli 5.273.0 → 5.274.1

package/dist/commands/core.js

@@ -32,7 +32,7 @@ import { Option } from "commander";
 import { registerCoreCheckpointCommand } from "./core-checkpoint.js";
 import { registerCoreOntologyCommand } from "./core-ontology.js";
 import { resolveLiveRoot } from "../utils/hq-roots.js";
-import { runBundledScript } from "../utils/run-bundled-script.js";
+import { interpreterFor, runBundledScript } from "../utils/run-bundled-script.js";
 import { renderIndexTarget } from "../lib/index-render/index.js";
 import { generateWorkersRegistry } from "../lib/workers-registry/index.js";
 import { scanPackages } from "../lib/scan-packages/index.js";
@@ -48,21 +48,22 @@ import { qmdReindexAfterSync } from "../lib/core-utils/qmd-reindex-after-sync.js
 import { softTimeoutCommand } from "../lib/core-utils/soft-timeout.js";
 import { timeoutGuardCommand } from "../lib/core-utils/timeout-guard.js";
 import { readSentryReportStdin, reportSentryEvent } from "../lib/core-utils/sentry-report.js";
+import { describeCoreCommand, registeredCoreCommandListing, } from "./core-command-catalog.js";
 /**
  * These commands are now native implementations. Their retained shell assets
  * are deliberately claimed in SCAFFOLD_ONLY_ASSETS: loose HQ trees still ship
  * them for legacy callers, but `hq core` never dispatches through them again.
  */
 export const NATIVE_UTILITY_COMMANDS = [
-    { name: "detect-stale-core-policy-mirror", root: "live", summary: "Find (and prune) stale personal-policy mirrors in core", run: (args, context) => detectStaleCorePolicyMirror(args, { root: context.hqRoot }) },
-    { name: "hq-status-summary", root: "cwd", summary: "Summarize working-tree status across the HQ tree", run: (args, context) => summarizeHqStatus(args, { cwd: context.cwd, root: context.hqRoot }) },
-    { name: "ontology-readme-drift", root: "live", summary: "Check a company's ontology README for drift", run: (args, context) => ontologyReadmeDrift(args, { root: context.hqRoot }) },
-    { name: "resize-screenshot", root: "cwd", summary: "Downscale a screenshot for context efficiency", run: (args) => resizeScreenshot(args) },
-    { name: "token-usage-report", root: "cwd", summary: "Report session token usage", run: (args) => tokenUsageReport(args) },
-    { name: "worktree", root: "live", summary: "Create a git worktree under workspace/worktrees/", run: (args, context) => createWorktree(args, { cwd: context.cwd, hqRoot: context.hqRoot }) },
-    { name: "codex-skill-bridge", root: "live", summary: "Install/inspect the Codex skill bridge", run: (args, context) => runCodexSkillBridgeCommand(args, { root: context.hqRoot ?? context.cwd }) },
-    { name: "archive-old-threads", root: "live", summary: "Archive aged session-thread files", run: (args, context) => archiveOldThreads(args, { hqRoot: context.hqRoot ?? context.cwd }) },
-    { name: "qmd-reindex-after-sync", root: "cwd", summary: "Refresh qmd collections after a sync", run: (args, context) => qmdReindexAfterSync(args, { cwd: context.cwd }) },
+    { name: "detect-stale-core-policy-mirror", asset: "core/scripts/detect-stale-core-policy-mirror.sh", root: "live", summary: "Find (and prune) stale personal-policy mirrors in core", run: (args, context) => detectStaleCorePolicyMirror(args, { root: context.hqRoot }) },
+    { name: "hq-status-summary", asset: "core/scripts/hq-status-summary.sh", root: "cwd", summary: "Summarize working-tree status across the HQ tree", run: (args, context) => summarizeHqStatus(args, { cwd: context.cwd, root: context.hqRoot }) },
+    { name: "ontology-readme-drift", asset: "core/scripts/ontology-readme-drift.sh", root: "live", summary: "Check a company's ontology README for drift", run: (args, context) => ontologyReadmeDrift(args, { root: context.hqRoot }) },
+    { name: "resize-screenshot", asset: "core/scripts/resize-screenshot.sh", root: "cwd", summary: "Downscale a screenshot for context efficiency", run: (args) => resizeScreenshot(args) },
+    { name: "token-usage-report", asset: "core/scripts/token-usage-report.sh", root: "cwd", summary: "Report session token usage", run: (args) => tokenUsageReport(args) },
+    { name: "worktree", asset: "core/scripts/worktree.sh", root: "live", summary: "Create a git worktree under workspace/worktrees/", run: (args, context) => createWorktree(args, { cwd: context.cwd, hqRoot: context.hqRoot }) },
+    { name: "codex-skill-bridge", asset: "core/scripts/codex-skill-bridge.sh", root: "live", summary: "Install/inspect the Codex skill bridge", run: (args, context) => runCodexSkillBridgeCommand(args, { root: context.hqRoot ?? context.cwd }) },
+    { name: "archive-old-threads", asset: "core/scripts/archive-old-threads.sh", root: "live", summary: "Archive aged session-thread files", run: (args, context) => archiveOldThreads(args, { hqRoot: context.hqRoot ?? context.cwd }) },
+    { name: "qmd-reindex-after-sync", asset: "core/scripts/qmd-reindex-after-sync.sh", root: "cwd", summary: "Refresh qmd collections after a sync", run: (args, context) => qmdReindexAfterSync(args, { cwd: context.cwd }) },
 ];
 export const NATIVE_SCAFFOLD_COMMANDS = [
     {
@@ -110,51 +111,61 @@ export const WORKER_SUBCOMMANDS = [
 export const REBUILD_INDEX_TARGETS = [
     {
         target: "all",
+        asset: "core/scripts/rebuild-all-indexes.sh",
         renderer: "all",
         summary: "Regenerate every INDEX.md across the HQ tree",
     },
     {
         target: "companies",
+        asset: "core/scripts/rebuild-companies-index.sh",
         renderer: "companies",
         summary: "Regenerate companies/INDEX.md",
     },
     {
         target: "company-knowledge",
+        asset: "core/scripts/rebuild-company-knowledge-index.sh",
         renderer: "company-knowledge",
         summary: "Regenerate a company's knowledge INDEX.md",
     },
     {
         target: "orchestrator",
+        asset: "core/scripts/rebuild-orchestrator-index.sh",
         renderer: "orchestrator",
         summary: "Regenerate the orchestrator workspace INDEX.md",
     },
     {
         target: "projects",
+        asset: "core/scripts/rebuild-projects-index.sh",
         renderer: "projects",
         summary: "Regenerate the projects INDEX.md",
     },
     {
         target: "public-knowledge",
+        asset: "core/scripts/rebuild-public-knowledge-index.sh",
         renderer: "public-knowledge",
         summary: "Regenerate core/knowledge/public/INDEX.md",
     },
     {
         target: "reports",
+        asset: "core/scripts/rebuild-reports-index.sh",
         renderer: "reports",
         summary: "Regenerate the reports INDEX.md",
     },
     {
         target: "social-drafts",
+        asset: "core/scripts/rebuild-social-drafts-index.sh",
         renderer: "social-drafts",
         summary: "Regenerate workspace/social-drafts/INDEX.md",
     },
     {
         target: "threads",
+        asset: "core/scripts/rebuild-threads-index.sh",
         renderer: "threads",
         summary: "Regenerate the session-threads INDEX.md",
     },
     {
         target: "workers",
+        asset: "core/scripts/rebuild-workers-index.sh",
         renderer: "workers",
         summary: "Regenerate the workers INDEX.md",
     },
@@ -201,65 +212,16 @@ export const SCAFFOLD_ONLY_ASSETS = [
     { asset: "core/scripts/lib/session-scope-capability.sh", root: "live", summary: "Session scope-capability lib sourced by hq-session" },
     { asset: "core/scripts/lib/session-id.sh", root: "live", summary: "Session-id resolver lib sourced by hq-session" },
     { asset: "core/scripts/lib/work-mesh-enqueue.sh", root: "live", summary: "Work Mesh Live spool enqueue lib sourced by hooks" },
-    { asset: "core/scripts/archive-old-threads.sh", root: "live", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/codex-skill-bridge.sh", root: "live", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/qmd-reindex-after-sync.sh", root: "cwd", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/detect-stale-core-policy-mirror.sh", root: "live", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/hq-status-summary.sh", root: "cwd", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/ontology-readme-drift.sh", root: "live", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/resize-screenshot.sh", root: "cwd", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/token-usage-report.sh", root: "cwd", summary: "Scaffold-only native utility companion" },
-    { asset: "core/scripts/worktree.sh", root: "live", summary: "Scaffold-only native utility companion" },
-    {
-        asset: "core/scripts/rebuild-all-indexes.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-companies-index.sh",
+    ...NATIVE_UTILITY_COMMANDS.map(({ asset, root, summary }) => ({
+        asset,
+        root,
+        summary: `Scaffold-only native utility companion: ${summary}`,
+    })),
+    ...REBUILD_INDEX_TARGETS.map(({ asset }) => ({
+        asset,
         root: "cwd",
         summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-company-knowledge-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-orchestrator-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-projects-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-public-knowledge-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-reports-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-social-drafts-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-threads-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
-    {
-        asset: "core/scripts/rebuild-workers-index.sh",
-        root: "cwd",
-        summary: "Scaffold-only native rebuild-index companion",
-    },
+    })),
 ];
 /** Every claimed bundled asset, used by packaging and interpreter tests. */
 export const SCAFFOLD_ASSETS = [
@@ -328,7 +290,7 @@ export function registerCoreCommands(program) {
     // similarly named scaffold assets are forwarders, so sending them through
     // runEntry would recurse back into this command forever.
     for (const entry of NATIVE_SCAFFOLD_COMMANDS) {
-        core
+        const command = core
             .command(entry.name)
             .description(entry.summary)
             .allowUnknownOption()
@@ -344,9 +306,14 @@ export function registerCoreCommands(program) {
             if (result.status !== 0)
                 process.exit(result.status);
         });
+        describeCoreCommand(command, {
+            execution: "native",
+            asset: entry.asset,
+            root: entry.root,
+        });
     }
     for (const entry of NATIVE_UTILITY_COMMANDS) {
-        core
+        const command = core
             .command(entry.name)
             .description(entry.summary)
             .allowUnknownOption()
@@ -361,6 +328,11 @@ export function registerCoreCommands(program) {
             if (code !== 0)
                 process.exit(code);
         });
+        describeCoreCommand(command, {
+            execution: "native",
+            asset: entry.asset,
+            root: entry.root,
+        });
     }
     // `hq core worker <name>` — a nested subgroup for worker-scoped skill
     // maintenance. Nested (rather than flat `hq core worker-<name>`) so the two
@@ -369,7 +341,7 @@ export function registerCoreCommands(program) {
         .command("worker")
         .description("Worker-scoped skill maintenance (lint, share)");
     for (const entry of WORKER_SUBCOMMANDS) {
-        worker
+        const command = worker
             .command(entry.name)
             .description(entry.summary)
             // Pure passthrough: the wrapped script owns its own argument grammar.
@@ -382,6 +354,11 @@ export function registerCoreCommands(program) {
             const operands = cmd.args.length > 0 ? cmd.args : args;
             runEntry(entry, scope, operands);
         });
+        describeCoreCommand(command, {
+            execution: interpreterFor(entry.asset) === "node" ? "bundled-node" : "bundled-shell",
+            asset: entry.asset,
+            root: entry.root,
+        });
     }
     const runCommand = (entry, args = [], cmd, target) => {
         const scope = core.opts();
@@ -393,7 +370,7 @@ export function registerCoreCommands(program) {
         runEntry(entry, scope, passthrough);
     };
     const validTargets = REBUILD_INDEX_TARGETS.map((entry) => entry.target);
-    core
+    const rebuildCommand = core
         .command("rebuild-index <target> [args...]")
         .description(`Regenerate one index (target: ${validTargets.join(", ")})`)
         // Pure passthrough: the wrapped script owns its own argument grammar, so
@@ -424,8 +401,16 @@ export function registerCoreCommands(program) {
             throw expectedUserError(`rebuild-index: refused to overwrite ${refused.length} hand-edited INDEX.md file(s). Re-run with --accept to overwrite.`);
         }
     });
+    describeCoreCommand(rebuildCommand, {
+        entries: REBUILD_INDEX_TARGETS.map((entry) => ({
+            name: `rebuild-index ${entry.target}`,
+            execution: "native",
+            asset: entry.asset,
+            root: "live",
+        })),
+    });
     for (const entry of SCAFFOLD_COMMANDS) {
-        core
+        const command = core
             .command(entry.name)
             .description(entry.summary)
             // Pure passthrough: the wrapped script owns its own argument grammar, so
@@ -438,12 +423,17 @@ export function registerCoreCommands(program) {
             .action((args = [], _opts, cmd) => {
             runCommand(entry, args, cmd);
         });
+        describeCoreCommand(command, {
+            execution: interpreterFor(entry.asset) === "node" ? "bundled-node" : "bundled-shell",
+            asset: entry.asset,
+            root: entry.root,
+        });
     }
     // `hq core soft-timeout <interval> [--hard-cap <spec>] [--label <name>] -- <cmd…>`
     // Async and bespoke (the NATIVE_UTILITY_COMMANDS table is synchronous), since
     // it spawns a child and warns over time. Warn-don't-kill primitive for
     // finding 2.1 — the CLI-hosted twin of core/scripts/lib/soft-timeout.sh.
-    core
+    const softTimeout = core
         .command("soft-timeout")
         .description("Run a command under a soft (warn, don't kill) timeout")
         // Passthrough: the wrapped command owns everything after `--`.
@@ -457,10 +447,11 @@ export function registerCoreCommands(program) {
         if (code !== 0)
             process.exit(code);
     });
+    describeCoreCommand(softTimeout, { execution: "native", root: "cwd" });
     // `hq core timeout-guard` — PreToolUse decision for the foreground-timeout
     // guard (finding 2.1). Reads the hook JSON on stdin and exits 2 to block, 0
     // to allow. The shipped .claude hook is a thin shim over this.
-    core
+    const timeoutGuard = core
         .command("timeout-guard")
         .description("PreToolUse guard: block over-ceiling foreground timeouts (reads hook JSON on stdin)")
         .helpOption(false)
@@ -472,10 +463,11 @@ export function registerCoreCommands(program) {
         if (code !== 0)
             process.exit(code);
     });
+    describeCoreCommand(timeoutGuard, { execution: "native", root: "cwd" });
     // `hq core sentry report` — constrained, stderr-diagnostic-only transport
     // for hook health events. Event data is accepted only on stdin so it never
     // appears in the process list shared by the fleet.
-    core
+    const sentryReport = core
         .command("sentry")
         .description("Constrained diagnostics transport for HQ hooks")
         .command("report")
@@ -495,6 +487,18 @@ export function registerCoreCommands(program) {
         if (result.code !== 0)
             process.exitCode = result.code;
     });
+    describeCoreCommand(sentryReport, { execution: "native", root: "live" });
+    const commands = core
+        .command("commands", { hidden: true })
+        .description("List registered hq core commands as JSON")
+        .option("--json", "Print the command catalog as JSON")
+        .action((options) => {
+        if (!options.json) {
+            throw expectedUserError("Usage: hq core commands --json");
+        }
+        process.stdout.write(`${JSON.stringify(registeredCoreCommandListing(core))}\n`);
+    });
+    describeCoreCommand(commands, { execution: "native", root: "cwd" });
     return core;
 }
 //# sourceMappingURL=core.js.map

package/dist/commands/deploy-comments.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+export declare function registerDeployCommentsCommand(deploy: Command): void;
+//# sourceMappingURL=deploy-comments.d.ts.map

package/dist/commands/deploy-comments.js

@@ -0,0 +1,159 @@
+import { deployApiRequest } from "../lib/deploy-api.js";
+import { DEFAULT_HQ_ROOT, ensureCognitoToken } from "../utils/cognito-session.js";
+import { readActiveCompanySlug } from "./skill.js";
+class DeployCommentsError extends Error {
+}
+function callerOrgHeaders(companyFlag) {
+    const slug = companyFlag ?? readActiveCompanySlug(DEFAULT_HQ_ROOT);
+    if (slug === undefined)
+        return {};
+    if (!/^[a-z0-9][a-z0-9-]{0,62}$/.test(slug)) {
+        throw new DeployCommentsError("The company slug is not valid.");
+    }
+    return { "X-Org-Slug": slug };
+}
+function errorCode(body, status) {
+    const code = body.error?.code;
+    return typeof code === "string" && /^[A-Z0-9_]+$/.test(code) ? code : `HTTP_${status}`;
+}
+async function responseError(response) {
+    const body = await response.json().catch(() => ({}));
+    const code = errorCode(body, response.status);
+    if (response.status === 401 || response.status === 403) {
+        return new DeployCommentsError(`You need to be the app owner or an org admin to read its comments. (${code})`);
+    }
+    if (response.status === 404) {
+        return new DeployCommentsError(`App was not found in the current org. (${code})`);
+    }
+    if (response.status === 429) {
+        const value = response.headers.get("Retry-After");
+        const retryAfter = value && /^\d+$/.test(value) ? value : "unknown";
+        return new DeployCommentsError(`Comment reads are rate limited. Retry-After: ${retryAfter} seconds. (${code})`);
+    }
+    return new DeployCommentsError(`Could not read deploy comments (HTTP ${response.status}, ${code}).`);
+}
+async function deployJson(token, route, orgHeaders) {
+    let response;
+    try {
+        response = await deployApiRequest(token, route, "GET", undefined, orgHeaders);
+    }
+    catch {
+        throw new DeployCommentsError("Could not reach hq-deploy.");
+    }
+    if (!response.ok)
+        throw await responseError(response);
+    try {
+        return await response.json();
+    }
+    catch {
+        throw new DeployCommentsError("hq-deploy returned an invalid response.");
+    }
+}
+async function resolveAppId(token, appNameOrId, orgHeaders) {
+    const result = await deployJson(token, "/api/apps", orgHeaders);
+    const apps = Array.isArray(result.apps) ? result.apps : [];
+    const byId = apps.find((app) => app && typeof app.id === "string" && app.id === appNameOrId);
+    const matches = byId
+        ? [byId]
+        : apps.filter((app) => app && typeof app.id === "string" && app.name === appNameOrId);
+    const ids = [...new Set(matches.map((app) => app.id).filter((id) => typeof id === "string"))];
+    if (ids.length === 0)
+        throw new DeployCommentsError("App was not found in the current org.");
+    if (ids.length > 1)
+        throw new DeployCommentsError("More than one app has that name in the current org; use its app id.");
+    return ids[0];
+}
+async function listComments(token, appId, orgHeaders) {
+    const route = `/api/apps/${encodeURIComponent(appId)}/manage/comments`;
+    const result = await deployJson(token, route, orgHeaders);
+    if (typeof result.commentsEnabled !== "boolean" || !Array.isArray(result.comments)) {
+        throw new DeployCommentsError("hq-deploy returned an incomplete comments response.");
+    }
+    return { commentsEnabled: result.commentsEnabled, comments: result.comments };
+}
+function displayText(value) {
+    return [...String(value ?? "")].map((character) => {
+        const code = character.codePointAt(0) ?? 0;
+        return isUnsafeTerminalCodePoint(code)
+            ? `\\u${code.toString(16).padStart(4, "0")}`
+            : character;
+    }).join("");
+}
+function isUnsafeTerminalCodePoint(code) {
+    return code <= 0x1f
+        || (code >= 0x7f && code <= 0x9f)
+        || (code >= 0x202a && code <= 0x202e)
+        || (code >= 0x2066 && code <= 0x2069);
+}
+function safeJson(value) {
+    return JSON.stringify(value, null, 2).replace(/[\u007f-\u009f\u202a-\u202e\u2066-\u2069]/gu, (character) => `\\u${(character.codePointAt(0) ?? 0).toString(16).padStart(4, "0")}`);
+}
+function printCommentLine(comment) {
+    const firstLine = comment.body.split(/\r\n|\r|\n/, 1)[0] ?? "";
+    console.log([
+        displayText(comment.id),
+        displayText(comment.status),
+        displayText(comment.createdAt),
+        displayText(comment.author?.name || "Unknown author"),
+        displayText(comment.anchor?.mode || "unknown"),
+        displayText(firstLine),
+    ].join("  |  "));
+}
+async function run(action) {
+    try {
+        await action();
+    }
+    catch (error) {
+        console.error(error instanceof DeployCommentsError ? error.message : "Deploy comments command failed.");
+        process.exitCode = 1;
+    }
+}
+async function listAction(appNameOrId, options) {
+    const status = options.status ?? "all";
+    if (status !== "open" && status !== "resolved" && status !== "all") {
+        throw new DeployCommentsError("--status must be open, resolved, or all.");
+    }
+    const token = await ensureCognitoToken();
+    const orgHeaders = callerOrgHeaders(options.company);
+    const appId = await resolveAppId(token, appNameOrId, orgHeaders);
+    const result = await listComments(token, appId, orgHeaders);
+    const comments = status === "all"
+        ? result.comments
+        : result.comments.filter((comment) => comment.status === status);
+    if (options.json) {
+        console.log(safeJson({ commentsEnabled: result.commentsEnabled, comments }));
+        return;
+    }
+    if (comments.length === 0) {
+        console.log("No comments.");
+        return;
+    }
+    for (const comment of comments)
+        printCommentLine(comment);
+}
+async function readAction(appNameOrId, commentId, company) {
+    const token = await ensureCognitoToken();
+    const orgHeaders = callerOrgHeaders(company);
+    const appId = await resolveAppId(token, appNameOrId, orgHeaders);
+    const result = await listComments(token, appId, orgHeaders);
+    const comment = result.comments.find((entry) => entry.id === commentId);
+    if (!comment)
+        throw new DeployCommentsError(`Comment '${displayText(commentId)}' was not found on that app.`);
+    console.log(safeJson(comment));
+}
+export function registerDeployCommentsCommand(deploy) {
+    const comments = deploy.command("comments").description("List and read comments on your deployed apps");
+    comments
+        .command("list <app>")
+        .description("List comments on an app in your org")
+        .option("--company <slug>", "use this company instead of the active company")
+        .option("--json", "print the API comment array as JSON")
+        .option("--status <status>", "filter by open, resolved, or all", "all")
+        .action((app, options) => run(() => listAction(app, options)));
+    comments
+        .command("read <app> <commentId>")
+        .description("Read a comment on an app in your org")
+        .option("--company <slug>", "use this company instead of the active company")
+        .action((app, commentId, options) => run(() => readAction(app, commentId, options.company)));
+}
+//# sourceMappingURL=deploy-comments.js.map

package/dist/commands/lanes-message.js

@@ -13,7 +13,7 @@ import { keepAliveExclusion, keepAliveSupersededBy, LANE_SUPERSESSION_LINEAGE_AW
 import { managerStatusGateEnabledForLane } from "../lib/lanes/manager-status-gate.js";
 import { readLanesRegistryFlag } from "../lib/lanes/registry-flag.js";
 import { resolveLaneCompany } from "../lib/lanes/lane-company.js";
-import { accountMoveSummary, accountRequestKeepsCurrentLane, assertCurrentResumeAccountAvailable, recordedResumeEffort, resetKeepAliveProgress, resolveResumeEffort } from "./lanes-shared.js";
+import { accountMoveSummary, accountRequestKeepsCurrentLane, assertCurrentResumeAccountAvailable, callerMatchesSessionSenior, recordedResumeEffort, resetKeepAliveProgress, resolveResumeEffort } from "./lanes-shared.js";
 export function createLaneMessageHandlers(deps) {
     const { archiveResumeMessage, assertLaneRunsHereForAdmission, assertLaneRunsHereForOperatorMutation, assessLaneAdmission, casUpdateLane, dispatchOutpostLaneCommand, drainHookStatusFor, laneIsHostedHere, laneWithRecoveredProviderSession, loadAllLanes, mintMessageId, persistClaudeAccountSelection, prepareAccountMove, printJson, recordResumeSetup, resolveActiveQuestionCompany, resolveResumeProfile, selectAutomaticClaudeResumeAccount, validateResumeProfileModel, withResumeHireAdmission } = deps;
     function currentSuccessorOf(lane, lanes, lineageAware, companyForLane) {
@@ -30,7 +30,19 @@ export function createLaneMessageHandlers(deps) {
         }
         return current.lane_id === lane.lane_id ? undefined : current;
     }
-    function callerMayMessageSupersededLane(ctx, lane, lanes, lineageAware, companyForLane, callerLaneIdOverride) {
+    function callerMayMessageSupersededLane(ctx, lane, lanes, lineageAware, companyForLane, callerLaneIdOverride, callerSessionIdOverride) {
+        if (lane.senior.kind === "session") {
+            const sessionSeniorId = lane.senior.id;
+            if (!sessionSeniorId)
+                return false;
+            if (callerLaneIdOverride !== undefined || ctx.env.HQ_LANE_ID?.trim())
+                return false;
+            if (callerSessionIdOverride === null)
+                return false;
+            return callerSessionIdOverride === undefined
+                ? callerMatchesSessionSenior(ctx, sessionSeniorId)
+                : callerSessionIdOverride === sessionSeniorId;
+        }
         if (lane.senior.kind !== "lane")
             return false;
         const callerLaneId = callerLaneIdOverride ?? ctx.env.HQ_LANE_ID?.trim();
@@ -86,11 +98,15 @@ export function createLaneMessageHandlers(deps) {
         let lanes = localLanes;
         const retiredLaneIds = loadRetiredLaneIds(ctx.hqRoot());
         const dispatchedCallerId = grantContext?.superseded_message_caller_id;
-        const dispatchedContextAuthorized = grantContext !== undefined &&
-            dispatchedCallerId !== undefined &&
+        const dispatchedSessionId = grantContext?.superseded_message_session_id;
+        const dispatchedContextBound = grantContext !== undefined &&
             ctx.isSsmOwnerDispatch() &&
             sameHireGrantSenior(grantContext.expected_senior, currentLane.senior);
-        if (dispatchedContextAuthorized && grantContext) {
+        const dispatchedSessionContext = dispatchedContextBound && currentLane.senior.kind === "session";
+        const dispatchedContextAuthorized = dispatchedContextBound && (dispatchedCallerId !== undefined ||
+            (dispatchedSessionId !== undefined && dispatchedSessionId === currentLane.senior.id));
+        if (dispatchedContextBound && grantContext &&
+            (dispatchedCallerId !== undefined || dispatchedSessionContext)) {
             const merged = new Map(localLanes.map((record) => [record.lane_id, record]));
             for (const snapshot of grantContext.hierarchy) {
                 const contextLane = keepAliveLaneFromSnapshot(snapshot);
@@ -101,14 +117,23 @@ export function createLaneMessageHandlers(deps) {
             lanes = [...merged.values()];
         }
         const exclusion = keepAliveExclusion(currentLane, lanes, retiredLaneIds, lineageAware, companyForLane);
-        const callerLaneId = dispatchedContextAuthorized ? dispatchedCallerId : undefined;
-        if (exclusion === "superseded" && callerMayMessageSupersededLane(ctx, currentLane, lanes, lineageAware, companyForLane, callerLaneId)) {
+        const callerLaneId = dispatchedContextBound ? dispatchedCallerId : undefined;
+        const callerSessionId = dispatchedContextBound
+            ? (dispatchedSessionId === undefined ? null : dispatchedSessionId)
+            : undefined;
+        if (exclusion === "superseded" && callerMayMessageSupersededLane(ctx, currentLane, lanes, lineageAware, companyForLane, callerLaneId, callerSessionId)) {
             return {
                 lane: currentLane,
                 exclusion: undefined,
                 ...(!dispatchedContextAuthorized && ctx.env.HQ_LANE_ID?.trim()
                     ? { supersededMessageCallerId: ctx.env.HQ_LANE_ID.trim() }
                     : {}),
+                ...(!dispatchedContextBound && currentLane.senior.kind === "session" &&
+                    typeof currentLane.senior.id === "string" &&
+                    currentLane.senior.id.length > 0 &&
+                    callerMatchesSessionSenior(ctx, currentLane.senior.id)
+                    ? { supersededMessageSessionId: currentLane.senior.id }
+                    : {}),
             };
         }
         return { lane: currentLane, exclusion };
@@ -149,9 +174,17 @@ export function createLaneMessageHandlers(deps) {
             const supersededMessageCallerId = callerLaneId === undefined || resolution.remoteOnly
                 ? undefined
                 : (await messageLaneExclusion(ctx, lane)).supersededMessageCallerId;
+            const sessionSeniorId = lane.senior.kind === "session" ? lane.senior.id : undefined;
+            const supersededMessageSessionId = !resolution.remoteOnly &&
+                typeof sessionSeniorId === "string" &&
+                sessionSeniorId.length > 0 &&
+                callerMatchesSessionSenior(ctx, sessionSeniorId)
+                ? sessionSeniorId
+                : undefined;
             await dispatchOutpostLaneCommand(ctx, lane, "message", {
                 ...opts,
                 ...(supersededMessageCallerId === undefined ? {} : { supersededMessageCallerId }),
+                ...(supersededMessageSessionId === undefined ? {} : { supersededMessageSessionId }),
             }, resolution.remoteOnly
                 ? { syncPrimary: false, expectedOwnerHost: resolution.ownerHost }
                 : undefined);

package/dist/commands/lanes-move.d.ts

@@ -0,0 +1,12 @@
+import type { Ctx, LaneMoveHandlerDeps } from "./lanes-shared.js";
+export declare function createLaneMoveHandlers(deps: LaneMoveHandlerDeps): {
+    runMove: (ctx: Ctx, laneId: string, opts: {
+        placement?: string;
+    }) => Promise<void>;
+    runMoveTarget: (ctx: Ctx, laneId: string, opts: {
+        hostKind?: string;
+        hostId?: string;
+        account?: string;
+    }) => Promise<void>;
+};
+//# sourceMappingURL=lanes-move.d.ts.map