@indigoai-us/hq-cli 5.345.55 → 5.345.56

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [5.345.56] — 2026-10-09
+- Add `hq lanes reap` to report local lanes whose session senior is confirmed ended, clear stale pid markers on request, and keep process-tree stopping behind the `lanes.reap-stop` hq-flags key. SessionStart runs the report-only sweep detached and stores its report in host-specific user state.
+- Record privacy-limited `hq members invite` success and failure outcomes through the existing CLI feature telemetry event.
+
+- Continue a senior's most recent same-company, same-provider worker lane on `hq lanes create`, refuse live duplicate worker lanes, and filter `hq lanes list` by worker.
+
+- Pass jq diagnostic filters to Windows batch wrappers as single-line arguments so malformed-ACL parity reports the original jq diagnostic instead of failing on an invalid command line.
+- Keep the bundled derive-trigger-facts helper's closed-stdin error prompt on macOS instead of blocking the hook call.
+- Native delegate diagnostics match the bundled helper's Git Bash jq byte handling, including jq.exe CRLF output when `--binary` is unavailable.
+- Lane drop-box hooks deliver queued messages after tool calls and at a deliverable Stop event. Lane list and show JSON include bounded output, PR, inbox, elapsed time, and worker exit fields.
+- hq doctor now finds a company's sync manifest status instead of reporting the company as unresolved.
+
 ## [5.345.55] — 2026-10-08
 - Added `hq daemon sync conflicts acknowledge <id>` so the desktop can clear a parked-conflict notice without writing runner-owned sync state.
 - Add `hq import scan`, which runs the HQ import-context scanner on this

package/assets/scaffold/core/scripts/derive-trigger-facts.sh

@@ -65,7 +65,16 @@ case "${OSTYPE:-}" in
       STDIN_JSON="${STDIN_JSON%$'\n'}"
     done
     ;;
-  *) STDIN_JSON="$(</dev/stdin)" || STDIN_JSON='{}' ;;
+  *)
+    # Bash 3.2 on macOS can block while opening /dev/stdin when fd 0 is closed.
+    # Detect that case with a builtin redirection so the existing fail-closed
+    # behavior returns promptly on every POSIX host.
+    if [[ ! -e /dev/stdin ]]; then
+      printf '%s: line 68: /dev/stdin: No such file or directory\n' "$0" >&2
+      exit 1
+    fi
+    STDIN_JSON="$(</dev/stdin)" || STDIN_JSON='{}'
+    ;;
 esac
 [ -n "$STDIN_JSON" ] || STDIN_JSON='{}'
 JQ="$(command -v jq || true)"

package/assets/scaffold/core/scripts/jobs-validate.sh

@@ -219,7 +219,8 @@ validate_job_file() {
     err "$file" "yaml" "failed to parse YAML"
     return
   fi
-  if [ "$(jq -r 'type' <<<"$json")" != "object" ]; then
+  # Use jq's exit status instead of its text output: jq.exe writes CRLF on Windows.
+  if ! jq -es 'length == 1 and (.[0] | type == "object")' <<<"$json" >/dev/null; then
     err "$file" "yaml" "job root must be a mapping"
     return
   fi

package/assets/scaffold/core/scripts/session-title.sh

@@ -38,13 +38,14 @@ done
 
 command -v node >/dev/null 2>&1 || exit 0
 
-HQ_ROOT="$HQ_ROOT" SESSION_ID="$SESSION_ID" CMD="$COMMAND" SESSION_CWD="$SESSION_CWD" node - <<'JS'
+HQ_ROOT="$HQ_ROOT" SESSION_ID="$SESSION_ID" SESSION_CWD="$SESSION_CWD" \
+  MSYS2_ARG_CONV_EXCL="*" node - "$COMMAND" <<'JS'
 const fs = require("fs");
 const path = require("path");
 
 const hq = process.env.HQ_ROOT || "";
 const sid = process.env.SESSION_ID || "default";
-let command = (process.env.CMD || "").trim().replace(/^\/+/, "");
+let command = (process.argv[2] || "").trim().replace(/^\/+/, "");
 
 const key = sid.replace(/[^A-Za-z0-9._-]/g, "_") || "default";
 const state = path.join(hq, ".claude", "state");
@@ -133,12 +134,12 @@ if (project) {
       if (matchesProject) {
         const st = p.state || "";
         if (st === "IN_PROGRESS") {
-          emoji = "▶️";
+          emoji = "\u25b6\ufe0f";
         } else if (st === "COMPLETED") {
           const ts = p.updatedAt || p.updated_at || "";
           const t = new Date(ts);
           if (!isNaN(t.getTime()) && (Date.now() - t.getTime()) / 1000 < 86400) {
-            emoji = "✅";   // only recent completions
+            emoji = "\u2705";   // only recent completions
           }
         }
         break;
@@ -171,15 +172,15 @@ if (project) {
 // while /handoff runs; only the model can know when it finished, so it sets 📤.
 // Both are distinct from ✅ "the work shipped" and 🤝 "a person owns it now".
 const MODES = [
-  [/^(brainstorm|idea|dream|discover|strategize)$/,                            "💭"],
-  [/^(plan|prd|deep-plan|storyboard|architect|review-plan|codebase-design)$/,  "📐"],
-  [/^(run-project|execute-task|ship|land|land-batch|run-pipeline|orchestrate|tdd|deploy)$/, "⚡"],
-  [/^(review|code-review|security-review)$/,                                   "👀"],
-  [/^(quality-gate|smoke|verify|diagnose|investigate)$/,                       "🧪"],
-  [/^(handoff|checkpoint-handoff|retro)$/,                                     "📝"],
-  [/^(delegate|new-hire|new-agent|promote)$/,                                  "🤝"],
-  [/^(dm|hq-slack|meeting-notes|work-broadcast|signals|hq-share)$/,            "💬"],
-  [/^(schedule|job|loop)$/,                                                    "🔁"],
+  [/^(brainstorm|idea|dream|discover|strategize)$/,                            "\u{1f4ad}"],
+  [/^(plan|prd|deep-plan|storyboard|architect|review-plan|codebase-design)$/,  "\u{1f4d0}"],
+  [/^(run-project|execute-task|ship|land|land-batch|run-pipeline|orchestrate|tdd|deploy)$/, "\u{26a1}"],
+  [/^(review|code-review|security-review)$/,                                   "\u{1f440}"],
+  [/^(quality-gate|smoke|verify|diagnose|investigate)$/,                       "\u{1f9ea}"],
+  [/^(handoff|checkpoint-handoff|retro)$/,                                     "\u{1f4dd}"],
+  [/^(delegate|new-hire|new-agent|promote)$/,                                  "\u{1f91d}"],
+  [/^(dm|hq-slack|meeting-notes|work-broadcast|signals|hq-share)$/,            "\u{1f4ac}"],
+  [/^(schedule|job|loop)$/,                                                    "\u{1f501}"],
 ];
 
 const modeFor = (word) => {
@@ -192,7 +193,7 @@ if (!command) command = "chat";
 // Precedence: a finished or running project outranks the command word — "it
 // shipped" and "it is executing right now" beat "you typed /plan an hour ago".
 // `emoji` is set above from orchestrator state (✅ recent completion, ▶️ running).
-const mode = emoji === "▶️" ? "⚡" : (emoji || modeFor(command));
+const mode = emoji === "\u25b6\ufe0f" ? "\u{26a1}" : (emoji || modeFor(command));
 
 // --- company ---
 // Always the first text token. Long slugs get an explicit short form from the
@@ -301,5 +302,7 @@ let title = compose(parts);
 if (title.length > MAX && parts.length > 1) title = compose([parts[parts.length - 1]]);
 if (title.length > MAX) title = title.slice(0, MAX - 1).replace(/\s+$/, "") + "…";
 
-console.log(title);
+// The script is also run under Git Bash with LC_ALL=C from its caller. Write
+// the protocol bytes explicitly so the host locale cannot replace UTF-8 glyphs.
+process.stdout.write(Buffer.from(`${title}\n`, "utf8"));
 JS

package/dist/command-catalog.generated.d.ts

@@ -11008,6 +11008,38 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly hidden: false;
         }];
         readonly subcommands: readonly [];
+    }, {
+        readonly name: "reap";
+        readonly description: "Classify local lanes whose session senior has ended; report only by default";
+        readonly aliases: readonly ["_reap"];
+        readonly hidden: false;
+        readonly helpOption: true;
+        readonly helpCommand: false;
+        readonly usage: "[options]";
+        readonly helpText: readonly [];
+        readonly arguments: readonly [];
+        readonly options: readonly [{
+            readonly flags: "--min-age <minutes>";
+            readonly description: "Minimum lane age in minutes (default: 120)";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--apply-stale-state";
+            readonly description: "Remove stale worker and watcher pid markers";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--stop";
+            readonly description: "Stop candidate process trees when the hq-flags stop key is enabled";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--reason <text>";
+            readonly description: "Required audit reason when --stop is set";
+            readonly hidden: false;
+        }, {
+            readonly flags: "--json";
+            readonly description: "Print machine-readable JSON (default)";
+            readonly hidden: false;
+        }];
+        readonly subcommands: readonly [];
     }, {
         readonly name: "checks";
         readonly description: "Evaluate tracker and lane health checks";
@@ -11618,6 +11650,10 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly flags: "--worker <name>";
             readonly description: "HQ worker or reusable profile id";
             readonly hidden: false;
+        }, {
+            readonly flags: "--fresh-thread";
+            readonly description: "Skip worker continuity and start a cold provider session";
+            readonly hidden: false;
         }, {
             readonly flags: "--provider <name>";
             readonly description: "claude | codex | grok";
@@ -11950,6 +11986,10 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly flags: "--senior <ref>";
             readonly description: "Filter by senior ref";
             readonly hidden: false;
+        }, {
+            readonly flags: "--worker <id>";
+            readonly description: "Filter by worker id";
+            readonly hidden: false;
         }, {
             readonly flags: "--lane <id>";
             readonly description: "Filter by lane id (repeatable)";

package/dist/command-catalog.generated.js

@@ -13374,6 +13374,47 @@ export const COMMAND_CATALOG = [
                 ],
                 "subcommands": []
             },
+            {
+                "name": "reap",
+                "description": "Classify local lanes whose session senior has ended; report only by default",
+                "aliases": [
+                    "_reap"
+                ],
+                "hidden": false,
+                "helpOption": true,
+                "helpCommand": false,
+                "usage": "[options]",
+                "helpText": [],
+                "arguments": [],
+                "options": [
+                    {
+                        "flags": "--min-age <minutes>",
+                        "description": "Minimum lane age in minutes (default: 120)",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--apply-stale-state",
+                        "description": "Remove stale worker and watcher pid markers",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--stop",
+                        "description": "Stop candidate process trees when the hq-flags stop key is enabled",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--reason <text>",
+                        "description": "Required audit reason when --stop is set",
+                        "hidden": false
+                    },
+                    {
+                        "flags": "--json",
+                        "description": "Print machine-readable JSON (default)",
+                        "hidden": false
+                    }
+                ],
+                "subcommands": []
+            },
             {
                 "name": "checks",
                 "description": "Evaluate tracker and lane health checks",
@@ -14116,6 +14157,11 @@ export const COMMAND_CATALOG = [
                         "description": "HQ worker or reusable profile id",
                         "hidden": false
                     },
+                    {
+                        "flags": "--fresh-thread",
+                        "description": "Skip worker continuity and start a cold provider session",
+                        "hidden": false
+                    },
                     {
                         "flags": "--provider <name>",
                         "description": "claude | codex | grok",
@@ -14526,6 +14572,11 @@ export const COMMAND_CATALOG = [
                         "description": "Filter by senior ref",
                         "hidden": false
                     },
+                    {
+                        "flags": "--worker <id>",
+                        "description": "Filter by worker id",
+                        "hidden": false
+                    },
                     {
                         "flags": "--lane <id>",
                         "description": "Filter by lane id (repeatable)",

package/dist/commands/core-delegate-w1b.js

@@ -11,6 +11,8 @@ import { commandExists, delegateDiagnosticPath, isRecord, jsonAt, jqFallback, jq
 import { resolveLiveRoot } from "../utils/hq-roots.js";
 import { ACL_SOURCE_DISPLAY_LABELS } from "../utils/files-browse-acl.js";
 import { runBundledScript } from "../utils/run-bundled-script.js";
+import { resolveWindowsBash } from "../utils/windows-bash.js";
+import { createShellCompatibleJqInvoker } from "../utils/jq-windows-compat.js";
 const FLAG = "core-native-delegate";
 const ASSETS = {
     bundle: "core/scripts/hq-delegate-bundle.sh",
@@ -367,6 +369,13 @@ function runBundle(args, context, onMalformedWhoami) {
 function runHq(args, context, stdout = "capture") {
     return subprocess("hq", args, context.cwd, { stdout });
 }
+const runJq = createShellCompatibleJqInvoker((args, input, cwd, options) => subprocess("jq", args, cwd, { input, ...options }), process.platform, process.env, (cwd) => {
+    const bash = resolveWindowsBash(process.env).executable;
+    if (!bash)
+        return undefined;
+    const result = subprocess(bash, ["-c", "printf '%s' \"$OSTYPE\""], cwd, { stderr: "ignore" });
+    return result.code === 0 ? result.stdout?.trim() : undefined;
+});
 function commandSubstitutionBytes(value) {
     const bytes = value.stdoutBytes ?? Buffer.from(value.stdout ?? "");
     let end = bytes.length;
@@ -377,11 +386,15 @@ function commandSubstitutionBytes(value) {
 function emitJqParseDiagnostic(input, args, context) {
     if (!commandExists("jq", context.cwd))
         return;
-    const result = subprocess("jq", args, context.cwd, { input, stdout: "ignore", stderr: "pipe" });
-    const rawDiagnostic = result.stderrBytes ?? Buffer.from(result.stderr ?? "");
-    const diagnostic = process.platform === "win32"
-        ? Buffer.from(rawDiagnostic.toString("latin1").replace(/\r(?=\n|$)/g, ""), "latin1")
-        : rawDiagnostic;
+    // cmd.exe cannot pass CR, LF, or NUL inside an argument. jq treats line
+    // breaks between tokens as whitespace, and these fixed filters contain no
+    // multiline string literals, so send the program as one argument on Windows.
+    const jqArgs = [...args];
+    const programIndex = jqArgs.length - 1;
+    if (programIndex >= 0)
+        jqArgs[programIndex] = (jqArgs[programIndex] ?? "").replace(/[\r\n\0]+/gu, " ");
+    const result = runJq(jqArgs, input, context.cwd, { stdout: "ignore", stderr: "pipe" });
+    const diagnostic = result.stderrBytes ?? Buffer.from(result.stderr ?? "");
     if (diagnostic.length)
         err(diagnostic);
 }

package/dist/commands/core-derive-trigger-facts-command.js

@@ -13,6 +13,20 @@ export function registerCoreDeriveTriggerFactsCommand(core) {
         .helpOption(false)
         .argument("[args...]")
         .action(async (args = [], _options, commandContext) => {
+        if (process.env.HQ_CORE_STDIN_CLOSED === "1") {
+            const root = liveRoot();
+            const result = runBundledScript({
+                asset: DERIVE_TRIGGER_FACTS_ASSET,
+                args: commandContext.args.length ? commandContext.args : args,
+                cwd: root,
+                hqRoot: root,
+                msysScriptPath: process.platform === "win32",
+                closeStdin: true,
+            });
+            if (result.code !== 0)
+                process.exit(result.code);
+            return;
+        }
         if (!await coreNativeHookHelpersEnabled()) {
             const root = liveRoot();
             const stdin = process.platform === "win32" ? await readStdin() : undefined;

package/dist/commands/core-derive-trigger-facts-native.d.ts

@@ -20,4 +20,5 @@ export declare function commandOnPath(command: string, env: Record<string, strin
 /** Run the native handler contract, retaining exact bytes for differential tests. */
 export declare function runDeriveTriggerFacts(options: DeriveTriggerRunOptions): DeriveTriggerRunResult;
 export declare function runDeriveTriggerFactsFast(argv: readonly string[], stdin: string, cwd: string, hqRoot: string | undefined): number;
+export declare function runDeriveTriggerFactsFastResult(argv: readonly string[], stdin: string, cwd: string, hqRoot: string | undefined): DeriveTriggerRunResult;
 //# sourceMappingURL=core-derive-trigger-facts-native.d.ts.map

package/dist/commands/core-derive-trigger-facts-native.js

@@ -583,11 +583,30 @@ export function runDeriveTriggerFacts(options) {
     }
 }
 export function runDeriveTriggerFactsFast(argv, stdin, cwd, hqRoot) {
-    const result = runDeriveTriggerFacts({ argv, stdin, cwd, hqRoot: hqRoot ?? cwd });
+    const result = runDeriveTriggerFactsFastResult(argv, stdin, cwd, hqRoot);
     if (result.stdout.length)
         process.stdout.write(result.stdout);
     if (result.stderr.length)
         process.stderr.write(result.stderr);
     return result.code;
 }
+export function runDeriveTriggerFactsFastResult(argv, stdin, cwd, hqRoot) {
+    if (process.env.HQ_CORE_STDIN_CLOSED === "1") {
+        const result = runBundledScript({
+            asset: DERIVE_TRIGGER_FACTS_ASSET,
+            args: [...argv],
+            cwd,
+            hqRoot: hqRoot ?? cwd,
+            msysScriptPath: process.platform === "win32",
+            closeStdin: true,
+            captureOutput: true,
+        });
+        return {
+            code: result.code,
+            stdout: result.stdout ?? Buffer.alloc(0),
+            stderr: result.stderr ?? Buffer.alloc(0),
+        };
+    }
+    return runDeriveTriggerFacts({ argv, stdin, cwd, hqRoot: hqRoot ?? cwd });
+}
 //# sourceMappingURL=core-derive-trigger-facts-native.js.map

package/dist/commands/doctor.d.ts

@@ -119,6 +119,7 @@ export interface RunDoctorResult {
  * read; all other default tiers remain local unless explicitly opted in.
  */
 export declare function runDoctor(options?: RunDoctorOptions): Promise<RunDoctorResult>;
+export declare function createClientHealthReasonCodeCompanyResolver(hqRoot: string): (companySlug: string | null) => Promise<boolean>;
 export declare function createClientHealthCheckStatusCompanyResolver(hqRoot: string): (companySlug: string | null) => Promise<boolean>;
 /** Register the top-level `hq doctor` command so it appears in `hq --help`. */
 export declare function registerDoctorCommand(program: Command): void;

package/dist/commands/doctor.js

@@ -207,7 +207,14 @@ async function resolveClientHealthReasonCodesCheckIds(families, resolveForCompan
                 continue;
             }
             const scoped = /^sync\.(?:journal|manifest)\.(.+)$/.exec(result.checkId);
-            const companySlug = scoped && isCompanyJournalSlug(scoped[1]) ? scoped[1] : null;
+            const companyUidScope = scoped
+                ? /^company:(cmp_[A-Za-z0-9]{3,128})$/.exec(scoped[1])
+                : null;
+            const companySlug = companyUidScope
+                ? `company:${companyUidScope[1]}`
+                : scoped && isCompanyJournalSlug(scoped[1])
+                    ? scoped[1]
+                    : null;
             const checkIds = checksByCompany.get(companySlug) ?? [];
             checkIds.push(result.checkId);
             checksByCompany.set(companySlug, checkIds);
@@ -254,12 +261,18 @@ async function resolveClientHealthCheckStatusCheckIds(families, resolveForCompan
     }
     return enabledChecks;
 }
-function createClientHealthReasonCodeCompanyResolver(hqRoot) {
+export function createClientHealthReasonCodeCompanyResolver(hqRoot) {
     const companies = readCompaniesManifestMap(hqRoot);
     return async (companySlug) => {
         if (companySlug === null) {
             return isActiveCompanyClientHealthReasonCodesEnabled();
         }
+        const scopedCompanyUid = /^company:(cmp_[A-Za-z0-9]{3,128})$/.exec(companySlug);
+        if (scopedCompanyUid) {
+            return clientHealthReasonCodesEnabledForCompany({
+                companyUid: scopedCompanyUid[1],
+            });
+        }
         if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(companySlug)) {
             return false;
         }

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

@@ -2,12 +2,15 @@ import type { Command } from "commander";
 import { type TrackerCheckTeam } from "../lib/lanes/tracker-checks.js";
 import { type TrackerKind, type TrackerRecord } from "../lib/lanes/tracker-store.js";
 import type { LaneRecord, LaneCompanyRef, QuestionRecord } from "../lib/lanes/types.js";
+import { type ReapDeps } from "../lib/lanes/reaper.js";
 export interface LaneChecksDeps {
     hqRoot: () => string;
     resolveCompany: (company?: string) => Promise<LaneCompanyRef>;
     now: () => Date;
     stopLane?: (laneId: string, reason: string) => Promise<void>;
     sessionState?: (root: string, sessionId: string, now: Date) => string | null;
+    stopEnabled?: (lane: LaneRecord) => Promise<boolean> | boolean;
+    reaperDeps?: Partial<ReapDeps>;
 }
 type WrapHandler = <Args extends unknown[]>(action: (...args: Args) => Promise<void>) => (...args: Args) => Promise<void>;
 export interface ProjectMapping {

package/dist/commands/lanes-checks.js

@@ -13,6 +13,7 @@ import { LANES_RUNS_REL } from "../lib/lanes/spawn.js";
 import { assertNoSecretText } from "../lib/lanes/text-scan.js";
 import { checkCompanyPath } from "../lib/lanes/checked-company-path.js";
 import { findOrphanedBareIdDropboxes } from "../lib/lanes/orphaned-dropbox.js";
+import { parseReapMinAge, reapLocalLanes } from "../lib/lanes/reaper.js";
 export function mappingIncludesStory(mapping, storyId) {
     return (mapping.storyPrefix === undefined || storyId.startsWith(mapping.storyPrefix))
         && (mapping.excludePrefix === undefined || !storyId.startsWith(mapping.excludePrefix));
@@ -905,6 +906,39 @@ async function orphanReport(root, company, now, minAgeMinutes, userIdleHours, de
     output("orphans.stop", stopped);
 }
 export function registerLaneChecksCommand(parent, deps, wrap) {
+    parent.command("reap")
+        // CL-5's SessionStart hook launches this alias detached and does not wait for it.
+        .alias("_reap")
+        .description("Classify local lanes whose session senior has ended; report only by default")
+        .option("--min-age <minutes>", "Minimum lane age in minutes (default: 120)")
+        .option("--apply-stale-state", "Remove stale worker and watcher pid markers")
+        .option("--stop", "Stop candidate process trees when the hq-flags stop key is enabled")
+        .option("--reason <text>", "Required audit reason when --stop is set")
+        .option("--json", "Print machine-readable JSON (default)")
+        .action(wrap(async (options) => {
+        const reason = options.reason?.trim();
+        if (options.stop && !reason)
+            fail("lane_reap_reason_required", "--stop requires a non-empty --reason", {});
+        if (!options.stop && options.reason !== undefined)
+            fail("lane_reap_reason_requires_stop", "--reason can only be used with --stop", {});
+        if (reason)
+            assertNoSecretText("stop reason", reason);
+        const minAgeMinutes = parseReapMinAge(options.minAge);
+        const report = await reapLocalLanes(deps.hqRoot(), {
+            minAgeMinutes,
+            stop: options.stop === true,
+            applyStaleState: options.applyStaleState === true,
+            reason: reason ?? "Orphaned lane: owning session is confirmed ended",
+            json: true,
+        }, {
+            ...deps.reaperDeps,
+            now: deps.now,
+            sessionState: deps.sessionState,
+            stopEnabled: deps.stopEnabled,
+            stopLane: deps.stopLane,
+        });
+        console.log(JSON.stringify(report, null, 2));
+    }));
     parent.command("checks")
         .description("Evaluate tracker and lane health checks")
         .option("--company <slug>", "Select the company by slug")

package/dist/commands/lanes-session-start.d.ts

@@ -7,16 +7,11 @@ export interface SessionStartOptions {
     stdout?: Pick<NodeJS.WriteStream, "write">;
     stderr?: Pick<NodeJS.WriteStream, "write">;
     resolveRoot?: (env: NodeJS.ProcessEnv, cwd?: string) => string;
-    startSweep?: (root: string, env: NodeJS.ProcessEnv, context: SessionStartContext) => void;
-}
-interface SessionStartContext {
-    sessionId?: string;
-    companySlug?: string;
+    startSweep?: (root: string, env: NodeJS.ProcessEnv) => void;
 }
 /** Starts the CL-4 read-only orphan report once per host, without holding SessionStart open. */
-export declare function startSessionStartOrphanSweep(root: string, env?: NodeJS.ProcessEnv, spawnDetached?: typeof spawn, context?: SessionStartContext): void;
+export declare function startSessionStartOrphanSweep(root: string, env?: NodeJS.ProcessEnv, spawnDetached?: typeof spawn): void;
 /** SessionStart-compatible, fail-open conduct bootstrap. */
 export declare function runLaneSessionStart(options?: SessionStartOptions): Promise<void>;
 export declare function registerLaneSessionStartCommand(lanes: Command): void;
-export {};
 //# sourceMappingURL=lanes-session-start.d.ts.map

package/dist/commands/lanes-session-start.js

@@ -27,22 +27,6 @@ function sessionWasDisabled(root, env, payloadSessionId) {
     return /^\s*(?:conduct_mode|conduct_enabled|conduct_default):\s*(?:off|false|no|0)\s*(?:#.*)?$/mi.test(text) ||
         /^\s*conduct_engine:\s*(?:""|''|#.*)?\s*$/mi.test(text);
 }
-function sessionStartContext(root, env, payloadSessionId) {
-    const sessionId = payloadSessionId || env.HQ_SESSION_ID;
-    let companySlug = "";
-    if (sessionId && /^[A-Za-z0-9_-]+$/.test(sessionId)) {
-        const meta = path.join(root, "workspace", "sessions", sessionId, "meta.yaml");
-        if (fs.existsSync(meta)) {
-            const text = fs.readFileSync(meta, "utf8");
-            companySlug = /^\s*company_slug:\s*["']?([A-Za-z0-9][A-Za-z0-9-]*)["']?\s*(?:#.*)?$/mi.exec(text)?.[1] ?? "";
-        }
-    }
-    if (!companySlug)
-        companySlug = env.HQ_COMPANY_SLUG?.trim() ?? "";
-    if (!/^[A-Za-z0-9][A-Za-z0-9-]*$/.test(companySlug))
-        companySlug = "";
-    return { ...(sessionId ? { sessionId } : {}), ...(companySlug ? { companySlug } : {}) };
-}
 function extractConductorBlock(core) {
     const start = core.indexOf("<!-- inject:start -->");
     const end = core.indexOf("<!-- inject:end -->");
@@ -52,15 +36,12 @@ function extractConductorBlock(core) {
 }
 const ORPHAN_SWEEP_LOCK_TTL_MS = 15 * 60_000;
 /** Starts the CL-4 read-only orphan report once per host, without holding SessionStart open. */
-export function startSessionStartOrphanSweep(root, env = process.env, spawnDetached = spawn, context = {}) {
-    // The orphan command resolves company membership when --company is absent;
-    // skip here if this session has no tenant context rather than risk ambiguity.
-    if (!context.companySlug)
-        return;
+export function startSessionStartOrphanSweep(root, env = process.env, spawnDetached = spawn) {
     const stateRoot = env.XDG_STATE_HOME || path.join(os.homedir(), ".local", "state");
-    const stateDir = path.join(stateRoot, "hq-cli");
-    const lockPath = path.join(stateDir, "lanes-session-start-orphan-sweep.json");
-    const reportDir = path.join(stateDir, "lanes-orphan-reports", context.companySlug);
+    const host = os.hostname().replace(/[^A-Za-z0-9._-]/g, "_") || "unknown-host";
+    const stateDir = path.join(stateRoot, "hq-cli", "lanes-session-start", host);
+    const lockPath = path.join(stateDir, "orphan-sweep.lock");
+    const reportDir = path.join(stateRoot, "hq-cli", "lanes-orphan-reports", host);
     const ownerToken = randomUUID();
     try {
         fs.mkdirSync(stateDir, { recursive: true, mode: 0o700 });
@@ -108,17 +89,17 @@ export function startSessionStartOrphanSweep(root, env = process.env, spawnDetac
         }
         const wrapper = [
             "const cp=require('node:child_process'),fs=require('node:fs'),path=require('node:path');",
-            "const [cli,lock,root,token,report,company]=process.argv.slice(1);",
+            "const [cli,lock,root,token,report]=process.argv.slice(1);",
             "const cleanup=()=>{try{const lease=JSON.parse(fs.readFileSync(lock,'utf8'));if(lease.owner_token===token)fs.rmSync(lock,{force:true})}catch{}};",
             "const start=()=>{let lease;try{lease=JSON.parse(fs.readFileSync(lock,'utf8'))}catch{}if(lease?.owner_token!==token){if(Date.now()<Number(lease?.started_at||0)+1000)return setTimeout(start,10);process.exit(0)}",
             "try{fs.writeFileSync(lock,JSON.stringify({...lease,pid:process.pid}))}catch{}",
             "const tmp=report+'.tmp';let output;try{output=fs.createWriteStream(tmp,{flags:'wx',mode:0o600})}catch{cleanup();process.exit(0)}",
-            "const child=cp.spawn(process.execPath,[cli,'lanes','orphans','--company',company,'--json'],{stdio:['ignore','pipe','ignore'],env:{...process.env,HQ_ROOT:root,HQ_NO_UPDATE_CHECK:'1'}});",
+            "const child=cp.spawn(process.execPath,[cli,'lanes','_reap','--json'],{stdio:['ignore','pipe','ignore'],env:{...process.env,HQ_ROOT:root,HQ_NO_UPDATE_CHECK:'1'}});",
             "child.stdout.pipe(output);child.on('error',()=>{output.destroy();try{fs.rmSync(tmp,{force:true})}catch{}cleanup()});",
             "child.on('exit',(code)=>output.end(()=>{try{if(code===0)fs.renameSync(tmp,report);else fs.rmSync(tmp,{force:true})}catch{}cleanup()}));};start();",
         ].join("");
         const reportPath = path.join(reportDir, `orphans-${startedAt}-${ownerToken}.json`);
-        const launcher = spawnDetached(process.execPath, ["-e", wrapper, cli, lockPath, root, ownerToken, reportPath, context.companySlug], {
+        const launcher = spawnDetached(process.execPath, ["-e", wrapper, cli, lockPath, root, ownerToken, reportPath], {
             detached: true,
             stdio: "ignore",
             env: { ...env, HQ_ROOT: root, HQ_NO_UPDATE_CHECK: "1" },
@@ -185,8 +166,7 @@ export async function runLaneSessionStart(options = {}) {
         });
         if (!flagEnabled)
             return;
-        const context = sessionStartContext(root, env, payloadSessionId);
-        (options.startSweep ?? ((r, e, c) => startSessionStartOrphanSweep(r, e, spawn, c)))(root, env, context);
+        (options.startSweep ?? ((r, e) => startSessionStartOrphanSweep(r, e, spawn)))(root, env);
         if (sessionWasDisabled(root, env, payloadSessionId))
             return;
         let enabled = enabledFromSettings(root);

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

@@ -1,4 +1,4 @@
-import type { LaneCompanyRef, LanePlacementPolicy, LaneRecord, LanesConfig, QuestionAnswer, QuestionBody, QuestionRecord, SeniorRef, AccountHistoryEntry, LaneAccountSelection, PendingResume, QueuedReason, ResolvedLaneWorker, LivenessDeps, MachineIdentity, MonitorEvidenceReader, ReconcileHost, RunCommand, ThrottleDeps, withLaneHireLocks } from "../lib/lanes/index.js";
+import type { LaneCompanyRef, LanePlacementPolicy, LaneRecord, LanesConfig, QuestionAnswer, QuestionBody, QuestionRecord, SeniorRef, AccountHistoryEntry, LaneAccountSelection, PendingResume, QueuedReason, ResolvedLaneWorker, LivenessDeps, MachineIdentity, MonitorEvidenceReader, ReconcileHost, RunCommand, ThrottleDeps, withLaneAdmissionLock, withLaneHireLocks } from "../lib/lanes/index.js";
 import type { OutpostIdentity } from "../lib/lanes/admission-host.js";
 import type { OutpostDispatchResult } from "../lib/lanes/outpost-dispatch.js";
 import type { CpuBusySource } from "../lib/lanes/throttle.js";
@@ -313,6 +313,7 @@ export interface Ctx {
     storyLedgerEnabled: () => boolean;
     isSsmOwnerDispatch: () => boolean;
     withGrantHireLocks: typeof withLaneHireLocks;
+    withAdmissionLock: typeof withLaneAdmissionLock;
     mergeHoldEnabled?: (company: LaneCompanyRef) => boolean | Promise<boolean>;
     mergeReviewEnabled?: (company: LaneCompanyRef) => boolean | Promise<boolean>;
 }

package/dist/commands/lanes.d.ts

@@ -17,7 +17,7 @@ export { OUTPOST_DIR, OUTPOST_ID_PATH, readOutpostIdentity } from "../lib/lanes/
 export type { OutpostIdentity } from "../lib/lanes/admission-host.js";
 import { type OutpostDispatchResult } from "../lib/lanes/outpost-dispatch.js";
 import { emitLaneDecisionEvents } from "../lib/lanes/mesh-events.js";
-import { MAX_LANE_DEPTH, withLaneHireLocks, type LaneCompanyRef, type QuestionBody, type LaneRecord, type QuestionRecord, type ResolvedLaneWorker, type SeniorRef, type LivenessDeps, type MachineIdentity, type MonitorEvidenceReader, type RunCommand, type ThrottleDeps } from "../lib/lanes/index.js";
+import { MAX_LANE_DEPTH, withLaneAdmissionLock, withLaneHireLocks, type LaneCompanyRef, type QuestionBody, type LaneRecord, type QuestionRecord, type ResolvedLaneWorker, type SeniorRef, type LivenessDeps, type MachineIdentity, type MonitorEvidenceReader, type RunCommand, type ThrottleDeps } from "../lib/lanes/index.js";
 import { questionBodyAbsPath } from "../lib/lanes/questions.js";
 import { type RunCompactionFn } from "../lib/lanes/compaction.js";
 import type { WatcherLoopDeps } from "../lib/lanes/watcher.js";
@@ -106,6 +106,8 @@ export interface LanesCommandDeps {
     isSsmOwnerDispatch?: () => boolean;
     /** Test seam for changing a lane between pre-lock and locked grant reads. */
     withGrantHireLocks?: typeof withLaneHireLocks;
+    /** Test seam proving create admission encloses the worker busy check. */
+    withAdmissionLock?: typeof withLaneAdmissionLock;
     /** Test seam for the review-before-merge registry flag. */
     mergeReviewEnabled?: (company: LaneCompanyRef) => boolean | Promise<boolean>;
     /** Test seam for the repository-merge-hold registry flag. */