@indigoai-us/hq-cli 5.279.0 → 5.281.0

package/dist/commands/lanes.js

@@ -36,7 +36,7 @@ import { createOutpostProfileRepinContext, parseOutpostProfileRepinContext, } fr
 import { createOutpostRegistryWorkerApprovalContext, parseOutpostRegistryWorkerApprovalContext, } from "../lib/lanes/outpost-registry-worker-approval.js";
 import { OUTPOST_DIR, OUTPOST_ID_PATH, readOutpostIdentity, resolveAdmissionHost, } from "../lib/lanes/admission-host.js";
 export { OUTPOST_DIR, OUTPOST_ID_PATH, readOutpostIdentity } from "../lib/lanes/admission-host.js";
-import { buildOutpostCapacityCommand, buildOutpostIdentityBackfillCommand, buildOutpostLaneCommand, buildOutpostQuestionListCommand, buildOutpostPickupCommand, createOutpostsClient, dispatchErrorMessage, dispatchOutpostPickup, buildOutpostLaneListCommand, outpostRejectedEffortOption, parseOutpostPickupPayload, stageOutpostPayload, } from "../lib/lanes/outpost-dispatch.js";
+import { buildOutpostCapacityCommand, buildOutpostIdentityBackfillCommand, buildOutpostLaneCommand, buildOutpostQuestionListCommand, buildOutpostPickupCommand, createOutpostsClient, dispatchErrorMessage, dispatchOutpostPickup, buildOutpostLaneListCommand, outpostRejectedEffortOption, parseOutpostPickupPayload, PICKUP_WAIT_MS, stageOutpostPayload, } from "../lib/lanes/outpost-dispatch.js";
 import { outpostHireSummaryCacheKey, readOutpostHireSummaryCache, writeOutpostHireSummaryCache, } from "../lib/lanes/outpost-hire-cache.js";
 import { buildHostCapacitySnapshot, chooseHostForLane, parseHostCapacitySnapshot, } from "../lib/lanes/host-capacity.js";
 import { BALANCE_MOVABLE_STATES, selectClaudeAccount, } from "../lib/lanes/claude-balance.js";
@@ -61,6 +61,7 @@ import { assertQuestionBodySecretSafe } from "../lib/lanes/questions.js";
 import { compactionAfterUsage, } from "../lib/lanes/compaction.js";
 import { parseCliEffort, resolveLaneEffort, } from "../lib/lanes/effort.js";
 import { LanesError } from "../lib/lanes/errors.js";
+import { readLatestEnvelopeRecord } from "../lib/lanes/watcher.js";
 import { loadQuotaState, quotaBlockFor } from "../lib/lanes/quota.js";
 import { SESSION_MOVE_REASON } from "../lib/lanes/move-account.js";
 import { managerStatusGateEnabledForLane, resolveManagerStatusGateForLane, } from "../lib/lanes/manager-status-gate.js";
@@ -74,6 +75,8 @@ export { spawnLaneWorker };
 export { questionBodyAbsPath };
 export { MAX_LANE_DEPTH };
 export const LANES_RUNS_REL = path.join("workspace", "lanes-runs");
+export const LANE_REMOTE_MIRROR_SYNC_FLAG = "lanes.remote-done-mirror";
+const REMOTE_MIRROR_REFRESH_BATCH_SIZE = 100;
 /** The lane → mesh seam. Defined in lib/lanes/mesh-events.ts; the watcher shares it. */
 export { emitLaneDecisionEvents };
 function withoutProviderHome(value) {
@@ -159,6 +162,10 @@ async function defaultListOutpostIds() {
     const rows = await defaultOutpostsClient().list();
     return rows.map((row) => row.outpostId);
 }
+async function defaultListOutpostRoutes() {
+    const rows = await defaultOutpostsClient().list();
+    return rows.map(({ outpostId, instanceName }) => ({ outpostId, instanceName }));
+}
 async function defaultStageOutpostPayload(outpostId, bytes) {
     return stageOutpostPayload(defaultOutpostsClient(), outpostId, bytes);
 }
@@ -218,6 +225,9 @@ function resolveDeps(deps = {}) {
     };
     const bindProcessCwd = deps.hqRoot === undefined;
     const resolveRoot = deps.hqRoot ?? (() => resolveLanesHqRoot({ env, cwd: cwd() }));
+    const listOutpostRoutes = deps.listOutpostRoutes ?? (deps.listOutpostIds
+        ? async () => (await deps.listOutpostIds()).map((outpostId) => ({ outpostId }))
+        : defaultListOutpostRoutes);
     const hqRoot = () => {
         callerCwd();
         const root = resolveRoot();
@@ -236,6 +246,7 @@ function resolveDeps(deps = {}) {
         resolveCompany: deps.resolveCompany ?? defaultResolveCompany,
         resolveActiveCompany: deps.resolveActiveCompany ?? defaultResolveActiveCompany,
         listOutpostIds: deps.listOutpostIds ?? defaultListOutpostIds,
+        listOutpostRoutes,
         readOutpostIdentity: deps.readOutpostIdentity ?? (() => readOutpostIdentity()),
         spawnLogin: deps.spawnLogin ?? defaultSpawnLogin,
         throttleDeps: deps.throttleDeps ?? defaultThrottleDeps(env),
@@ -611,6 +622,7 @@ async function fetchOwnerLaneHireFields(ctx, lane) {
     }
     const outpostId = lane.host.id;
     const hqBinary = outpostCliOverride(ctx, outpostId);
+    const waitMs = outpostSingleLaneWaitMs(ctx.env);
     let dispatched;
     try {
         dispatched = await ctx.dispatchOutpostExec({
@@ -620,12 +632,15 @@ async function fetchOwnerLaneHireFields(ctx, lane) {
                 laneId: lane.lane_id,
                 hqBinary,
             }),
-            timeoutSeconds: OUTPOST_HIRE_SUMMARY_TIMEOUT_SECONDS,
-            waitMs: OUTPOST_HIRE_SUMMARY_WAIT_MS,
+            timeoutSeconds: Math.ceil(waitMs / 1000),
+            waitMs,
         });
     }
     catch (err) {
-        throw new LanesError("outpost_lane_hire_summary_unavailable", `Could not read hire summary for lane ${lane.lane_id} from Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, { lane_id: lane.lane_id, outpost_id: outpostId });
+        const message = dispatchErrorMessage(err);
+        throw new LanesError("outpost_lane_hire_summary_unavailable", /timed out waiting for outpost pickup/i.test(message)
+            ? outpostPickupTimeoutMessage(outpostId, waitMs, `reading hire summary for lane ${lane.lane_id}`)
+            : `Could not read hire summary for lane ${lane.lane_id} from Outpost ${outpostId}: ${message}`, { lane_id: lane.lane_id, outpost_id: outpostId });
     }
     if (dispatched.done !== true || dispatched.status !== "Success" || dispatched.exitCode !== 0) {
         throw new LanesError("outpost_lane_hire_summary_unavailable", `Outpost ${outpostId} did not confirm the hire summary for lane ${lane.lane_id}`, { lane_id: lane.lane_id, outpost_id: outpostId, command_id: dispatched.commandId });
@@ -702,7 +717,7 @@ async function dispatchOutpostLaneList(ctx, outpostId, query, timeoutSeconds, wa
         timeoutSeconds,
         waitMs,
     });
-    if (!rejectedLaneListFlag(filtered, query))
+    if (query.strictSnapshot || !rejectedLaneListFlag(filtered, query))
         return filtered;
     return ctx.dispatchOutpostExec({
         outpostId,
@@ -808,8 +823,6 @@ async function batchOwnerLaneHireFields(ctx, lanes) {
     writeOutpostHireSummaryCache(ctx.hqRoot(), cacheUpdates, ctx.now().getTime(), cached);
     return outcomes;
 }
-const OUTPOST_HIRE_SUMMARY_TIMEOUT_SECONDS = 20;
-const OUTPOST_HIRE_SUMMARY_WAIT_MS = 15_000;
 const OUTPOST_HIRE_SUMMARY_CONCURRENCY = 4;
 async function laneHirePresentation(ctx, lane, lanes) {
     const local = laneHireFields(lane, lanes);
@@ -864,6 +877,7 @@ async function withResumeHireAdmission(ctx, lane, fn, grantContext) {
         !listLaneIds(hqRoot).includes(lane.senior.id)) {
         throw new LanesError("hire_grant_context_required", `Resume of Outpost lane ${lane.lane_id} requires the primary senior's hire-grant context`, { lane_id: lane.lane_id, senior_lane_id: lane.senior.id });
     }
+    await refreshRemoteLaneMirrors(ctx, hqRoot, loadAllLanes(hqRoot), new Set([lane.senior.id]));
     return withHireGrantAdmission(hqRoot, lane.senior.id, (snapshot) => {
         const current = readLane(hqRoot, lane.lane_id);
         if (grantContext !== undefined &&
@@ -886,6 +900,28 @@ async function withResumeHireAdmission(ctx, lane, fn, grantContext) {
 }
 const CAPACITY_PROBE_TIMEOUT_MS = 15_000;
 const MAX_PLACEMENT_OUTPOSTS = 16;
+const OUTPOST_HIRE_SUMMARY_TIMEOUT_SECONDS = 20;
+const OUTPOST_HIRE_SUMMARY_WAIT_MS = 15_000;
+const OUTPOST_SINGLE_LANE_WAIT_ENV = "HQ_LANES_OUTPOST_SINGLE_LANE_WAIT_MS";
+const OUTPOST_SINGLE_LANE_WAIT_MAX_MS = 600_000;
+function outpostSingleLaneWaitMs(env) {
+    const raw = env[OUTPOST_SINGLE_LANE_WAIT_ENV]?.trim() || String(PICKUP_WAIT_MS);
+    const value = /^\d+$/.test(raw) ? Number(raw) : Number.NaN;
+    if (!Number.isSafeInteger(value) ||
+        value < CAPACITY_PROBE_TIMEOUT_MS ||
+        value > OUTPOST_SINGLE_LANE_WAIT_MAX_MS) {
+        throw new LanesError("outpost_wait_invalid", `${OUTPOST_SINGLE_LANE_WAIT_ENV} must be an integer from ${CAPACITY_PROBE_TIMEOUT_MS} to ${OUTPOST_SINGLE_LANE_WAIT_MAX_MS} milliseconds`, { env: OUTPOST_SINGLE_LANE_WAIT_ENV });
+    }
+    return value;
+}
+function outpostRouteMatchesHost(route, host) {
+    return typeof route.instanceName === "string" &&
+        route.instanceName.trim() !== "" &&
+        sanitizeHostComponent(route.instanceName.trim()) === sanitizeHostComponent(host.trim());
+}
+function outpostPickupTimeoutMessage(outpostId, waitMs, operation) {
+    return `Outpost ${outpostId} pickup timed out after ${waitMs}ms while ${operation}. Raise ${OUTPOST_SINGLE_LANE_WAIT_ENV} (milliseconds) and retry.`;
+}
 function outpostIdentityUnknownError(message, expectedId, details = {}) {
     const expected = expectedId ?? "<expected-outpost-id>";
     const command = `hq lanes outpost-identity backfill --id ${expected}`;
@@ -1022,17 +1058,24 @@ function normalizedLaneListQuery(query) {
         ...(query.active ? { active: true } : {}),
         ...(query.hierarchy === undefined ? {} : { hierarchy: query.hierarchy }),
         ...(query.snapshot ? { snapshot: true } : {}),
+        ...(query.strictSnapshot ? { strictSnapshot: true } : {}),
     };
 }
 async function readOutpostLaneRecordsUncached(ctx, outpostId, query) {
+    const targetedLookup = query.hierarchy !== undefined || query.laneIds !== undefined;
+    const waitMs = targetedLookup ? outpostSingleLaneWaitMs(ctx.env) : CAPACITY_PROBE_TIMEOUT_MS;
     let result;
     try {
-        result = await dispatchOutpostLaneList(ctx, outpostId, query, CAPACITY_PROBE_TIMEOUT_MS / 1000, CAPACITY_PROBE_TIMEOUT_MS);
+        result = await dispatchOutpostLaneList(ctx, outpostId, query, Math.ceil(waitMs / 1000), waitMs);
     }
     catch (err) {
+        const message = dispatchErrorMessage(err);
+        if (/timed out waiting for outpost pickup/i.test(message)) {
+            throw new LanesError("outpost_lane_list_unavailable", outpostPickupTimeoutMessage(outpostId, waitMs, "reading the requested lane"), { outpost_id: outpostId, wait_ms: waitMs, wait_env: OUTPOST_SINGLE_LANE_WAIT_ENV });
+        }
         if (isLanesError(err))
             throw err;
-        throw new LanesError("outpost_lane_list_unavailable", `Could not read lanes from Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, { outpost_id: outpostId });
+        throw new LanesError("outpost_lane_list_unavailable", `Could not read lanes from Outpost ${outpostId}: ${message}`, { outpost_id: outpostId });
     }
     if (result.done !== true || result.status !== "Success" || result.exitCode !== 0) {
         throw new LanesError("outpost_lane_list_unavailable", `Outpost ${outpostId} did not return a successful lane list`, { outpost_id: outpostId, status: result.status, done: result.done ?? false, exit_code: result.exitCode });
@@ -1106,6 +1149,156 @@ async function readOutpostLaneRecords(ctx, outpostId, requestedQuery = {}) {
     byOutpost.set(outpostId, { queryKey, promise });
     return promise;
 }
+/** Refresh only primary-created, non-terminal Outpost mirrors in one bounded owner query per Outpost. */
+async function refreshRemoteLaneMirrors(ctx, hqRoot, records, parentLaneIds) {
+    const result = {
+        updated: new Map(),
+        unverifiedRemote: new Map(),
+    };
+    const host = reconcileHostFromCtx(ctx);
+    if (host.outpostId !== null || parentLaneIds?.size === 0)
+        return result;
+    let primaryIdentity;
+    const originMatchesThisPrimary = (lane) => {
+        if (lane.origin_host_source !== "imds") {
+            return lane.origin_host === host.hostname;
+        }
+        primaryIdentity ??= ctx.resolveMachineIdentity();
+        if (primaryIdentity.status !== "ok")
+            return false;
+        const primaryImdsId = primaryIdentity.imds ??
+            (primaryIdentity.source === "imds" ? primaryIdentity.id : null);
+        return primaryImdsId !== null && primaryImdsId === lane.origin_host;
+    };
+    const candidates = records
+        .filter((lane) => lane.host.kind === "outpost" &&
+        originMatchesThisPrimary(lane) &&
+        (parentLaneIds === undefined || (lane.senior.kind === "lane" &&
+            lane.senior.id !== undefined &&
+            parentLaneIds.has(lane.senior.id))) &&
+        !isTerminalLaneState(lane.state))
+        .sort((a, b) => a.lane_id.localeCompare(b.lane_id));
+    if (candidates.length === 0)
+        return result;
+    const enabledByCompany = new Map();
+    const enabledCandidates = [];
+    for (const lane of candidates) {
+        const companyKey = JSON.stringify([lane.company?.uid ?? null, lane.company?.slug ?? null]);
+        let enabled = enabledByCompany.get(companyKey);
+        if (enabled === undefined) {
+            enabled = await readLanesRegistryFlag(LANE_REMOTE_MIRROR_SYNC_FLAG, {
+                company: lane.company,
+                env: ctx.env,
+            });
+            enabledByCompany.set(companyKey, enabled);
+        }
+        if (enabled)
+            enabledCandidates.push(lane);
+    }
+    if (enabledCandidates.length === 0)
+        return result;
+    const byOutpost = new Map();
+    for (const lane of enabledCandidates) {
+        const group = byOutpost.get(lane.host.id) ?? [];
+        group.push(lane);
+        byOutpost.set(lane.host.id, group);
+    }
+    for (const [outpostId, group] of byOutpost) {
+        const batch = group.slice(0, REMOTE_MIRROR_REFRESH_BATCH_SIZE);
+        const overflow = group.slice(REMOTE_MIRROR_REFRESH_BATCH_SIZE);
+        if (overflow.length > 0) {
+            const ids = overflow.map((lane) => lane.lane_id);
+            for (const lane of overflow) {
+                result.unverifiedRemote.set(lane.lane_id, "refresh_batch_limit");
+            }
+            process.stderr.write(`hq lanes: unverified remote mirrors from Outpost ${outpostId} remain counted; refresh batch limit left lanes ${ids.join(", ")} unread\n`);
+        }
+        let ownerRecords;
+        try {
+            ownerRecords = await readOutpostLaneRecords(ctx, outpostId, {
+                laneIds: batch.map((lane) => lane.lane_id),
+                snapshot: true,
+                strictSnapshot: true,
+            });
+        }
+        catch (error) {
+            const detail = isLanesError(error)
+                ? `${error.error}: ${error.message}`
+                : dispatchErrorMessage(error);
+            for (const lane of batch)
+                result.unverifiedRemote.set(lane.lane_id, detail);
+            process.stderr.write(`hq lanes: unverified remote mirrors from Outpost ${outpostId} remain counted: ${detail}; lanes ${batch.map((lane) => lane.lane_id).join(", ")}\n`);
+            continue;
+        }
+        for (const mirror of batch) {
+            const matches = ownerRecords.filter((lane) => lane.lane_id === mirror.lane_id);
+            const owner = matches[0];
+            const ownerIsHostedByOutpost = owner !== undefined && ((owner.host.kind === "outpost" && owner.host.id === outpostId) ||
+                (owner.host.kind === "local" && owner.host.id.trim() !== ""));
+            if (matches.length !== 1 ||
+                owner === undefined ||
+                !ownerIsHostedByOutpost ||
+                (owner.company?.uid ?? null) !== (mirror.company?.uid ?? null) ||
+                (owner.company?.slug ?? null) !== (mirror.company?.slug ?? null)) {
+                const detail = matches.length === 0
+                    ? "owner did not return the requested lane"
+                    : matches.length > 1
+                        ? "owner returned duplicate lane rows"
+                        : "owner lane identity did not match its mirror";
+                result.unverifiedRemote.set(mirror.lane_id, detail);
+                process.stderr.write(`hq lanes: unverified remote mirror ${mirror.lane_id} from Outpost ${outpostId} remains counted: ${detail}\n`);
+                continue;
+            }
+            const endedAt = isTerminalLaneState(owner.state)
+                ? owner.last_envelope?.at ?? owner.updated_at
+                : undefined;
+            const envelopeSummary = isTerminalLaneState(owner.state)
+                ? owner.envelope_summary
+                : undefined;
+            const before = readLane(hqRoot, mirror.lane_id);
+            if (before.host.kind !== "outpost" || before.host.id !== outpostId ||
+                !originMatchesThisPrimary(before) || isTerminalLaneState(before.state)) {
+                result.updated.set(mirror.lane_id, before);
+                continue;
+            }
+            const needsUpdate = before.state !== owner.state ||
+                before.queued_reason !== (owner.state === "queued" ? owner.queued_reason : undefined) ||
+                before.ended_at !== endedAt ||
+                before.envelope_summary !== envelopeSummary ||
+                (isTerminalLaneState(owner.state) && (JSON.stringify(before.last_envelope) !== JSON.stringify(owner.last_envelope) ||
+                    before.story_complete !== owner.story_complete ||
+                    before.story_complete_reason !== owner.story_complete_reason ||
+                    before.story_status !== owner.story_status ||
+                    before.terminal_reason !== owner.terminal_reason));
+            if (!needsUpdate) {
+                result.updated.set(mirror.lane_id, before);
+                continue;
+            }
+            const updated = retryUpdateLane(hqRoot, mirror.lane_id, "reconcile", (current) => {
+                if (current.host.kind !== "outpost" || current.host.id !== outpostId ||
+                    !originMatchesThisPrimary(current) || isTerminalLaneState(current.state))
+                    return current;
+                return {
+                    ...current,
+                    state: owner.state,
+                    queued_reason: owner.state === "queued" ? owner.queued_reason : undefined,
+                    ended_at: endedAt,
+                    envelope_summary: envelopeSummary,
+                    ...(isTerminalLaneState(owner.state) ? {
+                        last_envelope: owner.last_envelope,
+                        story_complete: owner.story_complete,
+                        story_complete_reason: owner.story_complete_reason,
+                        story_status: owner.story_status,
+                        terminal_reason: owner.terminal_reason,
+                        terminal_details: owner.terminal_details,
+                    } : {}),
+                };
+            });
+            result.updated.set(mirror.lane_id, updated);
+        }
+    }
+    return result;
+}
 async function resolveCommandLaneTarget(ctx, laneId, options = {}) {
     try {
         return { lane: readLane(ctx.hqRoot(), laneId), remoteOnly: false };
@@ -1119,17 +1312,34 @@ async function resolveCommandLaneTarget(ctx, laneId, options = {}) {
     if (!hostSuffix || sanitizeHostComponent(hostSuffix) !== hostSuffix) {
         throw commandLaneNotFound(laneId, options.outpostHint === true);
     }
-    let rawOutpostIds;
+    let rawOutpostRoutes;
     try {
-        rawOutpostIds = await ctx.listOutpostIds();
+        rawOutpostRoutes = await ctx.listOutpostRoutes();
     }
     catch (err) {
         throw new LanesError("outpost_list_unavailable", `Could not resolve registered Outposts for lane ${laneId}: ${dispatchErrorMessage(err)}`, { lane_id: laneId });
     }
-    if (!Array.isArray(rawOutpostIds)) {
+    if (!Array.isArray(rawOutpostRoutes)) {
         throw new LanesError("outpost_list_invalid", "Registered Outpost list is not an array", { lane_id: laneId });
     }
-    const outpostIds = rawOutpostIds.map((id) => typeof id === "string" ? id.trim() : "");
+    const outpostRoutes = rawOutpostRoutes.map((raw, index) => {
+        if (raw === null || typeof raw !== "object" || Array.isArray(raw) ||
+            typeof raw.outpostId !== "string" ||
+            !raw.outpostId ||
+            (raw.instanceName !== undefined &&
+                typeof raw.instanceName !== "string")) {
+            throw new LanesError("outpost_list_invalid", `Registered Outpost row ${index} is malformed`, {
+                lane_id: laneId,
+                index,
+            });
+        }
+        const row = raw;
+        return {
+            outpostId: row.outpostId.trim(),
+            ...(typeof row.instanceName === "string" ? { instanceName: row.instanceName.trim() } : {}),
+        };
+    });
+    const outpostIds = outpostRoutes.map(({ outpostId }) => outpostId);
     if (outpostIds.length > MAX_PLACEMENT_OUTPOSTS ||
         outpostIds.some((id) => id === "") ||
         new Set(outpostIds).size !== outpostIds.length) {
@@ -1142,9 +1352,23 @@ async function resolveCommandLaneTarget(ctx, laneId, options = {}) {
     if (requestedOutpostId !== undefined && !outpostIds.includes(requestedOutpostId)) {
         throw new LanesError("outpost_not_registered", `Outpost ${requestedOutpostId} is not registered`, { lane_id: laneId, outpost_id: requestedOutpostId });
     }
+    const hostRoutes = outpostRoutes.filter((route) => outpostRouteMatchesHost(route, hostSuffix));
+    const identity = ctx.readOutpostIdentity();
+    const localHostRoutes = outpostRoutes.filter((route) => outpostRouteMatchesHost(route, ctx.hostname()));
+    if (localHostRoutes.length > 1 || (identity.kind === "id" && localHostRoutes.some((route) => route.outpostId !== identity.id))) {
+        throw new LanesError("outpost_host_ambiguous", "Registered Outpost host identity conflicts with this host's identity", { lane_id: laneId, local_outpost_id: identity.kind === "id" ? identity.id : undefined });
+    }
+    const localOutpostId = identity.kind === "id" ? identity.id : localHostRoutes[0]?.outpostId;
+    const hostOutpostIds = hostRoutes.map(({ outpostId }) => outpostId);
+    const hostOutpostIdSet = new Set(hostOutpostIds);
     const matches = [];
     const failedOutpostIds = [];
-    const lookupOutpostIds = requestedOutpostId === undefined ? outpostIds : [requestedOutpostId];
+    const lookupOutpostIds = requestedOutpostId !== undefined
+        ? [requestedOutpostId]
+        : [
+            ...hostOutpostIds.filter((id) => id !== localOutpostId),
+            ...outpostIds.filter((id) => id !== localOutpostId && !hostOutpostIdSet.has(id)),
+        ];
     for (const outpostId of lookupOutpostIds) {
         let ownerLanes;
         try {
@@ -1156,6 +1380,8 @@ async function resolveCommandLaneTarget(ctx, laneId, options = {}) {
         catch (err) {
             if (requestedOutpostId !== undefined)
                 throw err;
+            if (isLanesError(err) && err.error === "outpost_wait_invalid")
+                throw err;
             failedOutpostIds.push(outpostId);
             continue;
         }
@@ -2964,6 +3190,9 @@ async function runCreate(ctx, opts) {
                 : {}),
             attribution_history: [],
         };
+        if (senior.kind === "lane" && senior.id) {
+            await refreshRemoteLaneMirrors(ctx, hqRoot, loadAllLanes(hqRoot), new Set([senior.id]));
+        }
         const lane = senior.kind === "lane"
             ? withHireGrantAdmission(hqRoot, senior.id, ({ parent, children, parentGrant, availableChildGrant }) => {
                 if (isTerminalLaneState(parent.state)) {
@@ -3547,6 +3776,7 @@ async function dispatchOutpostLaneCommand(ctx, lane, action, options, behavior =
         throw new LanesError("outpost_dispatch_failed", `Lane ${lane.lane_id} has no Outpost host to dispatch to`, { lane_id: lane.lane_id });
     }
     const outpostId = lane.host.id;
+    const waitMs = outpostSingleLaneWaitMs(ctx.env);
     const profileRepinContext = action === "resume" &&
         options.worker !== undefined &&
         callerMatchesSenior(ctx, lane.senior)
@@ -3583,6 +3813,8 @@ async function dispatchOutpostLaneCommand(ctx, lane, action, options, behavior =
     try {
         const dispatchCommand = (contexts) => ctx.dispatchOutpostExec({
             outpostId,
+            timeoutSeconds: Math.ceil(waitMs / 1000),
+            waitMs,
             command: buildOutpostLaneCommand({
                 action: action === "grant"
                     ? "grant-target"
@@ -3636,7 +3868,10 @@ async function dispatchOutpostLaneCommand(ctx, lane, action, options, behavior =
         }
     }
     catch (err) {
-        throw new LanesError("outpost_dispatch_failed", `Could not dispatch ${action} for lane ${lane.lane_id} to Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, { lane_id: lane.lane_id, outpost_id: outpostId });
+        const message = dispatchErrorMessage(err);
+        throw new LanesError("outpost_dispatch_failed", /timed out waiting for outpost pickup/i.test(message)
+            ? outpostPickupTimeoutMessage(outpostId, waitMs, `dispatching ${action} for lane ${lane.lane_id}`)
+            : `Could not dispatch ${action} for lane ${lane.lane_id} to Outpost ${outpostId}: ${message}`, { lane_id: lane.lane_id, outpost_id: outpostId, wait_ms: waitMs, wait_env: OUTPOST_SINGLE_LANE_WAIT_ENV });
     }
     if (grantContextRejected) {
         throw new LanesError("outpost_cli_upgrade_required", `Outpost ${outpostId} needs an hq-cli release containing this fix before it can resume lane ${lane.lane_id} under its primary-hosted senior`, {
@@ -3834,6 +4069,7 @@ function parseReparentDescendantIds(value, laneId, outpostId) {
     return ids;
 }
 async function readOutpostLaneSnapshot(ctx, outpostId, laneId) {
+    const waitMs = outpostSingleLaneWaitMs(ctx.env);
     let dispatched;
     try {
         dispatched = await ctx.dispatchOutpostExec({
@@ -3843,12 +4079,15 @@ async function readOutpostLaneSnapshot(ctx, outpostId, laneId) {
                 laneId,
                 hqBinary: outpostCliOverride(ctx, outpostId),
             }),
-            timeoutSeconds: OUTPOST_HIRE_SUMMARY_TIMEOUT_SECONDS,
-            waitMs: OUTPOST_HIRE_SUMMARY_WAIT_MS,
+            timeoutSeconds: Math.ceil(waitMs / 1000),
+            waitMs,
         });
     }
     catch (err) {
-        throw new LanesError("outpost_lane_sync_unavailable", `Could not refresh descendant lane ${laneId} from Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, { lane_id: laneId, outpost_id: outpostId });
+        const message = dispatchErrorMessage(err);
+        throw new LanesError("outpost_lane_sync_unavailable", /timed out waiting for outpost pickup/i.test(message)
+            ? outpostPickupTimeoutMessage(outpostId, waitMs, `reading lane ${laneId}`)
+            : `Could not refresh descendant lane ${laneId} from Outpost ${outpostId}: ${message}`, { lane_id: laneId, outpost_id: outpostId });
     }
     if (dispatched.done !== true || dispatched.status !== "Success" || dispatched.exitCode !== 0) {
         throw new LanesError("outpost_lane_sync_unavailable", `Outpost ${outpostId} did not confirm the snapshot for descendant lane ${laneId}`, { lane_id: laneId, outpost_id: outpostId, command_id: dispatched.commandId });
@@ -4147,7 +4386,7 @@ async function runList(ctx, opts) {
     const hierarchyIds = opts.hierarchy === undefined
         ? undefined
         : new Set(selectOutpostHireGrantHierarchy(opts.hierarchy, laneSource).map((lane) => lane.lane_id));
-    const selectedLanes = laneSource
+    let selectedLanes = laneSource
         .filter((lane) => {
         if (requestedLaneIds.length > 0 && !requestedIds.has(lane.lane_id))
             return false;
@@ -4173,9 +4412,27 @@ async function runList(ctx, opts) {
     })
         .sort(compareLaneQueueOrder);
     if (opts.snapshot) {
-        printJson({ ok: true, action: "list", lanes: selectedLanes });
+        printJson({
+            ok: true,
+            action: "list",
+            lanes: selectedLanes.map((lane) => {
+                if (!isTerminalLaneState(lane.state))
+                    return lane;
+                const envelope = readLatestEnvelopeRecord(hqRoot, lane.lane_id)?.envelope;
+                return envelope?.summary ? { ...lane, envelope_summary: envelope.summary } : lane;
+            }),
+        });
         return;
     }
+    const remoteRefresh = await refreshRemoteLaneMirrors(ctx, hqRoot, laneSource, new Set(selectedLanes
+        .filter((lane) => !isTerminalLaneState(lane.state))
+        .map((lane) => lane.lane_id)));
+    for (const [laneId, updated] of remoteRefresh.updated) {
+        const index = laneSource.findIndex((lane) => lane.lane_id === laneId);
+        if (index >= 0)
+            laneSource[index] = updated;
+    }
+    selectedLanes = selectedLanes.map((lane) => remoteRefresh.updated.get(lane.lane_id) ?? lane);
     const now = ctx.now();
     const host = reconcileHostFromCtx(ctx);
     const allLanes = laneSource;
@@ -4232,6 +4489,7 @@ async function runList(ctx, opts) {
         return {
             ...lane,
             ...hireByLane.get(lane.lane_id),
+            ...(remoteRefresh.unverifiedRemote.has(lane.lane_id) ? { unverified_remote: true } : {}),
             stories: laneStories(lane),
             story_ids: laneStories(lane).map((story) => story.story_id),
             no_story_reason: lane.no_story_reason ?? null,
@@ -4268,6 +4526,9 @@ async function runList(ctx, opts) {
         ok: true,
         action: "list",
         lanes,
+        ...(remoteRefresh.unverifiedRemote.size > 0
+            ? { unverified_remote_lanes: [...remoteRefresh.unverifiedRemote.keys()] }
+            : {}),
         ...(host_capacity !== undefined ? { host_capacity } : {}),
     };
     if (opts.human)
@@ -4687,6 +4948,13 @@ async function applyHireGrant(ctx, laneId, hireGrant, authorization, grantContex
             ? [initial.senior.id]
             : []),
     ];
+    if (authorization === "senior") {
+        const parentLaneIds = new Set([initial.lane_id]);
+        if (initial.senior.kind === "lane" && initial.senior.id) {
+            parentLaneIds.add(initial.senior.id);
+        }
+        await refreshRemoteLaneMirrors(ctx, hqRoot, loadAllLanes(hqRoot), parentLaneIds);
+    }
     const updated = ctx.withGrantHireLocks(hqRoot, lockedLaneIds, () => {
         const current = readLane(hqRoot, laneId);
         const currentCallerAuthorization = authorization === "senior"
@@ -6140,6 +6408,12 @@ async function reparentOnOwner(ctx, laneId, opts) {
     const nextSenior = parseSeniorRef(opts.senior);
     assertSeniorExists(hqRoot, nextSenior, ctx);
     const initial = readLane(hqRoot, laneId);
+    const refreshParents = new Set();
+    if (initial.senior.kind === "lane" && initial.senior.id)
+        refreshParents.add(initial.senior.id);
+    if (nextSenior.kind === "lane" && nextSenior.id)
+        refreshParents.add(nextSenior.id);
+    await refreshRemoteLaneMirrors(ctx, hqRoot, loadAllLanes(hqRoot), refreshParents);
     const lockIds = [
         laneId,
         ...(initial.senior.kind === "lane" && initial.senior.id ? [initial.senior.id] : []),
@@ -6299,12 +6573,58 @@ const CANONICAL_LOG_STREAMS = [
 ];
 async function runLogs(ctx, laneId, opts) {
     const hqRoot = ctx.hqRoot();
-    readLane(hqRoot, laneId);
-    const logsDir = path.join(runDir(hqRoot, laneId), "logs");
+    const lane = readLane(hqRoot, laneId);
     const tail = parseOptionalInt(opts.tail, "--tail");
     if (tail === 0) {
         throw new LanesError("invalid_integer", "--tail must be a positive integer", { flag: "--tail", value: opts.tail });
     }
+    if (lane.host.kind === "outpost" &&
+        !laneRunsHere(lane, reconcileHostFromCtx(ctx)) &&
+        await readLanesRegistryFlag(LANE_REMOTE_MIRROR_SYNC_FLAG, {
+            company: lane.company,
+            env: ctx.env,
+        })) {
+        const outpostId = lane.host.id;
+        const waitMs = outpostSingleLaneWaitMs(ctx.env);
+        let dispatched;
+        try {
+            dispatched = await ctx.dispatchOutpostExec({
+                outpostId,
+                command: buildOutpostLaneCommand({
+                    action: "logs",
+                    laneId,
+                    hqBinary: outpostCliOverride(ctx, outpostId),
+                    ...(tail === undefined ? {} : { tail: String(tail) }),
+                    json: true,
+                }),
+                timeoutSeconds: Math.ceil(waitMs / 1000),
+                waitMs,
+            });
+        }
+        catch (error) {
+            throw new LanesError("outpost_lane_logs_unavailable", `Could not read logs for lane ${laneId} from Outpost ${outpostId}: ${dispatchErrorMessage(error)}`, { lane_id: laneId, outpost_id: outpostId, wait_ms: waitMs, wait_env: OUTPOST_SINGLE_LANE_WAIT_ENV });
+        }
+        if (dispatched.done !== true || dispatched.status !== "Success" || dispatched.exitCode !== 0) {
+            throw new LanesError("outpost_lane_logs_unavailable", `Outpost ${outpostId} did not return logs for lane ${laneId}`, { lane_id: laneId, outpost_id: outpostId, status: dispatched.status, exit_code: dispatched.exitCode });
+        }
+        let body;
+        try {
+            body = JSON.parse(dispatched.stdout);
+        }
+        catch (error) {
+            throw new LanesError("outpost_lane_logs_invalid", `Outpost ${outpostId} returned invalid logs JSON for lane ${laneId}: ${dispatchErrorMessage(error)}`, { lane_id: laneId, outpost_id: outpostId });
+        }
+        if (body === null || typeof body !== "object" || Array.isArray(body) ||
+            body.ok !== true ||
+            body.action !== "logs" ||
+            body.lane_id !== laneId ||
+            !Array.isArray(body.streams)) {
+            throw new LanesError("outpost_lane_logs_invalid", `Outpost ${outpostId} returned a malformed logs payload for lane ${laneId}`, { lane_id: laneId, outpost_id: outpostId });
+        }
+        printJson(body);
+        return;
+    }
+    const logsDir = path.join(runDir(hqRoot, laneId), "logs");
     const names = new Set(CANONICAL_LOG_STREAMS);
     if (fs.existsSync(logsDir)) {
         for (const name of fs.readdirSync(logsDir)) {
@@ -6373,22 +6693,27 @@ function parseRemoteCancelledQuestionIds(value, laneId, outpostId, commandId) {
     }
     return value;
 }
-async function readOutpostTerminalLane(ctx, laneId, outpostId, stopCommandId) {
+async function readOutpostTerminalLane(ctx, laneId, outpostId, stopCommandId, waitMs) {
     let dispatched;
     try {
         dispatched = await ctx.dispatchOutpostExec({
             outpostId,
             command: buildOutpostLaneCommand({ action: "show", laneId }),
-            timeoutSeconds: 120,
-            waitMs: 120_000,
+            timeoutSeconds: Math.ceil(waitMs / 1000),
+            waitMs,
         });
     }
     catch (err) {
-        throw new LanesError("outpost_delivery_unconfirmed", `Could not read terminal lane ${laneId} from Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, {
+        const message = dispatchErrorMessage(err);
+        throw new LanesError("outpost_delivery_unconfirmed", /timed out waiting for outpost pickup/i.test(message)
+            ? outpostPickupTimeoutMessage(outpostId, waitMs, `confirming terminal lane ${laneId}`)
+            : `Could not read terminal lane ${laneId} from Outpost ${outpostId}: ${message}`, {
             lane_id: laneId,
             outpost_id: outpostId,
             command_id: stopCommandId,
             sync_command_id: null,
+            wait_ms: waitMs,
+            wait_env: OUTPOST_SINGLE_LANE_WAIT_ENV,
         });
     }
     const commandId = dispatched.commandId?.trim();
@@ -6457,17 +6782,21 @@ async function dispatchOutpostLaneStop(ctx, lane, reason, quiet = false) {
         throw new LanesError("outpost_dispatch_failed", `Lane ${lane.lane_id} has no Outpost host to dispatch stop to`, { lane_id: lane.lane_id });
     }
     const outpostId = lane.host.id;
+    const waitMs = outpostSingleLaneWaitMs(ctx.env);
     let dispatched;
     try {
         dispatched = await ctx.dispatchOutpostExec({
             outpostId,
             command: buildOutpostLaneCommand({ action: "stop", laneId: lane.lane_id, reason }),
-            timeoutSeconds: 120,
-            waitMs: 120_000,
+            timeoutSeconds: Math.ceil(waitMs / 1000),
+            waitMs,
         });
     }
     catch (err) {
-        throw new LanesError("outpost_dispatch_failed", `Could not dispatch stop for lane ${lane.lane_id} to Outpost ${outpostId}: ${dispatchErrorMessage(err)}`, { lane_id: lane.lane_id, outpost_id: outpostId });
+        const message = dispatchErrorMessage(err);
+        throw new LanesError("outpost_dispatch_failed", /timed out waiting for outpost pickup/i.test(message)
+            ? outpostPickupTimeoutMessage(outpostId, waitMs, `stopping lane ${lane.lane_id}`)
+            : `Could not dispatch stop for lane ${lane.lane_id} to Outpost ${outpostId}: ${message}`, { lane_id: lane.lane_id, outpost_id: outpostId, wait_ms: waitMs, wait_env: OUTPOST_SINGLE_LANE_WAIT_ENV });
     }
     if (reason !== undefined && outpostRejectedStopReasonOption(dispatched)) {
         throw new LanesError("outpost_cli_upgrade_required", `Outpost ${outpostId} needs an hq-cli release containing stop reason support before it can stop lane ${lane.lane_id}`, {
@@ -6515,7 +6844,7 @@ async function dispatchOutpostLaneStop(ctx, lane, reason, quiet = false) {
         }
         state = remote.state;
         alreadyTerminal = true;
-        const owner = await readOutpostTerminalLane(ctx, lane.lane_id, outpostId, commandId);
+        const owner = await readOutpostTerminalLane(ctx, lane.lane_id, outpostId, commandId, waitMs);
         if (owner.lane.state !== state) {
             throw new LanesError("outpost_delivery_unconfirmed", `Outpost ${outpostId} returned a different terminal state for lane ${lane.lane_id}`, {
                 lane_id: lane.lane_id,
@@ -6969,6 +7298,9 @@ function writeAnswerDeliveryFailed(hqRoot, laneId, questionId, err, at) {
 async function runReconcile(ctx, opts, recoverQueuedMessages) {
     const fromEnv = ctx.env.HQ_ROOT?.trim();
     const hqRoot = fromEnv && ctx.existsSync(fromEnv) ? fromEnv : ctx.hqRoot();
+    const mirrorRefresh = opts.dryRun
+        ? { updated: new Map(), unverifiedRemote: new Map() }
+        : await refreshRemoteLaneMirrors(ctx, hqRoot, loadAllLanes(hqRoot));
     const summary = await runReconcilePass(hqRoot, {
         now: ctx.now,
         host: reconcileHostFromCtx(ctx),
@@ -7084,7 +7416,12 @@ async function runReconcile(ctx, opts, recoverQueuedMessages) {
             }
         },
     });
-    printJson(summary);
+    printJson({
+        ...summary,
+        ...(mirrorRefresh.unverifiedRemote.size > 0
+            ? { unverified_remote_lanes: [...mirrorRefresh.unverifiedRemote.keys()] }
+            : {}),
+    });
     if (!summary.ok) {
         process.exit(1);
     }