@indigoai-us/hq-cli 5.250.0 → 5.251.0

package/CHANGELOG.md

@@ -2,10 +2,13 @@
 
 ## [Unreleased]
 
+## [5.251.0] — 2026-09-27
+
 ## [5.250.0] — 2026-09-27
 
 ### Fixed
 
+- A Work Mesh session bound to a project and task keeps the binding episode the
 - An enrolled agent that sets `HQ_AGENT_DIR` now acts as that agent in every
   command, not only under `hq agent`. `hq dm` and `hq secrets` used to look
   for a person's session instead, find none, and open a browser sign-in. On
@@ -37,7 +40,6 @@
   host key is missing, instead of passing on a cached token and leaving the
   agent to fail at its next refresh.
 
-
 ## [5.249.1] — 2026-09-27
 
 ## [5.249.0] — 2026-09-27

package/dist/lib/work-context/outbox.js

@@ -8,7 +8,7 @@ import * as path from "node:path";
 import { WORK_CONTEXT_CONTRACT_VERSION } from "./contract.js";
 import { atomicWriteJson, ensureOwnerDir } from "./atomic.js";
 import { NotTrackingError } from "./errors.js";
-import { readSessionState, writeAcknowledgedRegisterBinding, } from "./state.js";
+import { readSessionState, stripRegisterReceiptEpisodes, updateSessionState, writeAcknowledgedRegisterBinding, } from "./state.js";
 import { isSafeWorkContextSegment, workContextOutboxDir, workContextOutboxPath, } from "./paths.js";
 /** Fields allowed on a durable outbox operation (privacy allowlist). */
 export const OUTBOX_ALLOWLIST = [
@@ -285,7 +285,35 @@ export function writeAckedRegisterState(op, root, receiptId, now = () => new Dat
 /** Repair older unresolved session projections from acknowledged registrations. */
 export function repairAckedRegisterStates(root, sessionIds, now = () => new Date()) {
     let repaired = 0;
-    for (const op of listOutboxOperations(root)) {
+    const operations = listOutboxOperations(root);
+    // A stored bindingEpisodeId that is a register receipt makes the server drop
+    // every batch. Clear it even when the register operation that produced it is
+    // no longer in the outbox: the id shape identifies it. This runs for every
+    // requested session, whatever its company or tracking status.
+    const receiptsBySession = new Map();
+    for (const op of operations) {
+        if (op.kind !== "register" || !op.receiptId)
+            continue;
+        const receipts = receiptsBySession.get(op.sessionId) ?? [];
+        receipts.push(op.receiptId);
+        receiptsBySession.set(op.sessionId, receipts);
+    }
+    for (const sessionId of sessionIds ?? receiptsBySession.keys()) {
+        if (!isSafeWorkContextSegment(sessionId))
+            continue;
+        const known = receiptsBySession.get(sessionId) ?? [];
+        // Take the lock only for a session that needs the repair.
+        const observed = readSessionState(sessionId, root);
+        if (!observed || stripRegisterReceiptEpisodes(observed, known) === observed)
+            continue;
+        updateSessionState(sessionId, root, (current) => {
+            if (!current)
+                return null;
+            const next = stripRegisterReceiptEpisodes(current, known);
+            return next === current ? null : next;
+        });
+    }
+    for (const op of operations) {
         if (op.delivery !== "acked" ||
             !op.receiptId ||
             op.kind !== "register" ||

package/dist/lib/work-context/reconcile.js

@@ -15,7 +15,7 @@ import { rebindNeedsProjectOnPrompt } from "./prompt-rebind.js";
 import { resolveProjectTask, shouldAskAfter } from "./project.js";
 import { deriveRemoteOwnerSlug, deriveRepoIdentityKey } from "./repo-remote.js";
 import { enqueueOutbox, listOutboxOperations, markOutboxAcked, markOutboxQuarantined, markOutboxQueued, replayOutbox, writeAckedRegisterState, } from "./outbox.js";
-import { mergeLocalSessionFields, readSessionState, writeSessionState, } from "./state.js";
+import { mergeLocalSessionFields, isRegisterReceiptEpisodeId, readSessionState, stripRegisterReceiptEpisodes, writeSessionState, } from "./state.js";
 function resultOf(parts) {
     const out = {
         contractVersion: WORK_CONTEXT_CONTRACT_VERSION,
@@ -174,7 +174,22 @@ export async function reconcileObservation(obs, deps) {
         }
     }
     // Already untracked locally — stay untracked until explicit opt-in (no backfill).
-    const prior = readSessionState(sessionId, deps.root);
+    const observedPrior = readSessionState(sessionId, deps.root);
+    // Acked register operations for this session. A register response never
+    // carries a binding episode, so an already acknowledged binding is
+    // identified by its company / project / task, never by comparing the
+    // register receipt with the session's bindingEpisodeId.
+    const ackedRegisters = observedPrior
+        ? listOutboxOperations(deps.root).filter((operation) => operation.kind === "register" &&
+            operation.delivery === "acked" &&
+            operation.sessionId === sessionId &&
+            Boolean(operation.receiptId))
+        : [];
+    // Older clients stored a register receipt as the episode. Work from a
+    // projection with those cleared so no later write carries one forward.
+    const prior = observedPrior
+        ? stripRegisterReceiptEpisodes(observedPrior, ackedRegisters.map((operation) => operation.receiptId))
+        : observedPrior;
     if (prior?.contextStatus === "untracked" && prior.untrackedReceipt?.origin === "user") {
         return {
             result: resultOf({
@@ -690,15 +705,6 @@ export async function reconcileObservation(obs, deps) {
         registerClassification = "needs_project";
         diagnostics.push(`company rebind to ${resolvedCompany.slug ?? resolvedCompany.uid}; cleared project`);
     }
-    // Acked register operations for this session. A register that did not come
-    // back bound yields no binding episode, so its receipt (not the session's
-    // bindingEpisodeId) is what identifies an already acknowledged binding.
-    const ackedRegisters = prior
-        ? listOutboxOperations(deps.root).filter((operation) => operation.kind === "register" &&
-            operation.delivery === "acked" &&
-            operation.sessionId === sessionId &&
-            Boolean(operation.receiptId))
-        : [];
     const stateClassification = registerClassification === "unresolved" &&
         prior?.contextStatus === "needs_project" &&
         prior.companyUid === resolvedCompany.uid &&
@@ -711,22 +717,26 @@ export async function reconcileObservation(obs, deps) {
     // into a second semantic register operation: the prior receipt is the stable
     // identity for this exact company/project/task binding.
     const priorBindingIsBound = Boolean(projectId && taskId);
+    // A state that is not an acknowledged binding (for example one quarantined
+    // as company_conflict) must register again even when its fields still match.
+    const priorIsAcknowledgedBinding = prior?.contextStatus === "bound" ||
+        prior?.contextStatus === "needs_task" ||
+        prior?.contextStatus === "needs_project" ||
+        prior?.contextStatus === "unresolved";
     const acknowledgedReceipt = prior &&
+        priorIsAcknowledgedBinding &&
         prior.companyUid === resolvedCompany.uid &&
         prior.companySlug === resolvedCompany.slug &&
         prior.projectId === projectId &&
         prior.taskId === taskId
-        ? ackedRegisters.find((operation) => (priorBindingIsBound
-            ? operation.receiptId === prior.bindingEpisodeId
-            : !prior.bindingEpisodeId || operation.receiptId === prior.bindingEpisodeId) &&
-            operation.companyUid === resolvedCompany.uid &&
+        ? ackedRegisters.find((operation) => operation.companyUid === resolvedCompany.uid &&
             operation.companySlug === resolvedCompany.slug &&
             operation.projectId === projectId &&
             operation.taskId === taskId)?.receiptId
         : undefined;
     const acknowledgedPrior = acknowledgedReceipt ? prior : null;
     if (acknowledgedPrior) {
-        // A partial (not bound) acknowledged register carries no server episode.
+        // Only a bound session holds a server episode (issued by bind / organize).
         const retainedEpisodeId = priorBindingIsBound
             ? acknowledgedPrior.bindingEpisodeId
             : undefined;
@@ -895,10 +905,9 @@ export async function reconcileObservation(obs, deps) {
         // the true computed classification into durable session state; otherwise
         // the emitter and mesh presence lose the tenant the server already
         // acknowledged. projectId / taskId are written only when genuinely
-        // resolved, and a fresh bindingEpisodeId only when the session is bound —
-        // never fabricated on a partial path. (writeAckedRegisterState above may
-        // have already recorded a receipt-derived episode for a resolved partial
-        // binding; the default merge preserves that when the binding still matches.)
+        // resolved. A register ack never yields a bindingEpisodeId, bound or not:
+        // the server issues episodes only on bind / organize. The default merge
+        // keeps an episode the session already holds when the binding still matches.
         if (resolvedCompany.uid) {
             const bound = registerClassification === "bound";
             // A server ack of the company makes it authoritative: the durable status
@@ -919,7 +928,6 @@ export async function reconcileObservation(obs, deps) {
                 contextStatus: bound ? "bound" : ackedClassification,
                 ...(projectId ? { projectId } : {}),
                 ...(taskId ? { taskId } : {}),
-                ...(bound ? { bindingEpisodeId: delivered.receiptId } : {}),
                 updatedAt: nowFn().toISOString(),
                 startedAt,
                 ...(typeof toolWrites === "number" ? { toolWrites } : {}),
@@ -939,6 +947,12 @@ export async function reconcileObservation(obs, deps) {
                 : registerClassification === "needs_project"
                     ? "needs_project"
                     : "queued";
+        // Report the episode the session actually holds, never the receipt.
+        const ackedState = readSessionState(sessionId, deps.root);
+        const ackedEpisodeId = ackedState &&
+            !isRegisterReceiptEpisodeId(ackedState.bindingEpisodeId, [delivered.receiptId])
+            ? ackedState.bindingEpisodeId
+            : undefined;
         return {
             result: resultOf({
                 kind: kind === "queued" ? "queued" : kind,
@@ -950,7 +964,7 @@ export async function reconcileObservation(obs, deps) {
                 companySlug: resolvedCompany.slug,
                 projectId,
                 taskId,
-                bindingEpisodeId: delivered.receiptId,
+                ...(ackedEpisodeId ? { bindingEpisodeId: ackedEpisodeId } : {}),
                 ...bindResultFields,
             }),
             exitCode: EXIT_OK,

package/dist/lib/work-context/state.d.ts

@@ -158,6 +158,22 @@ export declare function mergeLocalSessionFields(next: SessionStateFile, prior: S
     preserveBindingEpisode?: boolean;
     preserveCompanyBinding?: boolean;
 }): SessionStateFile;
+/**
+ * True when a stored bindingEpisodeId is a register receipt, not an episode.
+ *
+ * The server mints binding episodes as UUIDs, and only on bind / organize. A
+ * register response carries no episode: its receipt is the operation id the
+ * client generated (`op_...`). An id is treated as a receipt when it has that
+ * shape or when it equals a receipt the caller knows about. A UUID is never
+ * treated as a receipt by shape.
+ */
+export declare function isRegisterReceiptEpisodeId(id: string | undefined, knownReceiptIds?: Iterable<string | undefined>): boolean;
+/**
+ * Clear register receipts stored as a binding episode, on the session itself
+ * and on its pending presenceLeave. Returns the same object when nothing
+ * changed, so callers can detect a repair by identity.
+ */
+export declare function stripRegisterReceiptEpisodes(state: SessionStateFile, knownReceiptIds?: Iterable<string | undefined>): SessionStateFile;
 /**
  * Upgrade the local projection after the server acknowledges a register.
  *
@@ -165,6 +181,9 @@ export declare function mergeLocalSessionFields(next: SessionStateFile, prior: S
  * erase an explicit untracked choice, a conflicting existing company, or a
  * more specific binding for the same company. This is also used to repair
  * state files created by older clients before this write-back existed.
+ *
+ * The read and the write happen under the session state lock, so a concurrent
+ * writer (for example bind-project) is never overwritten from a stale snapshot.
  */
 export declare function writeAcknowledgedRegisterBinding(binding: AcknowledgedRegisterBinding, root: string, now?: () => Date): SessionStateFile | null;
 /** True when a durable state file was written by the hook / reconcile path. */

package/dist/lib/work-context/state.js

@@ -342,6 +342,47 @@ function bindingStrength(state) {
         return 1;
     return 0;
 }
+const SERVER_EPISODE_SHAPE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/**
+ * True when a stored bindingEpisodeId is a register receipt, not an episode.
+ *
+ * The server mints binding episodes as UUIDs, and only on bind / organize. A
+ * register response carries no episode: its receipt is the operation id the
+ * client generated (`op_...`). An id is treated as a receipt when it has that
+ * shape or when it equals a receipt the caller knows about. A UUID is never
+ * treated as a receipt by shape.
+ */
+export function isRegisterReceiptEpisodeId(id, knownReceiptIds = []) {
+    if (!id)
+        return false;
+    for (const receiptId of knownReceiptIds) {
+        if (receiptId && receiptId === id)
+            return true;
+    }
+    if (SERVER_EPISODE_SHAPE.test(id))
+        return false;
+    return id.startsWith("op_");
+}
+/**
+ * Clear register receipts stored as a binding episode, on the session itself
+ * and on its pending presenceLeave. Returns the same object when nothing
+ * changed, so callers can detect a repair by identity.
+ */
+export function stripRegisterReceiptEpisodes(state, knownReceiptIds = []) {
+    const known = [...knownReceiptIds];
+    const ownIsReceipt = isRegisterReceiptEpisodeId(state.bindingEpisodeId, known);
+    const leaveIsReceipt = isRegisterReceiptEpisodeId(state.presenceLeave?.bindingEpisodeId, known);
+    if (!ownIsReceipt && !leaveIsReceipt)
+        return state;
+    const out = { ...state };
+    if (ownIsReceipt)
+        out.bindingEpisodeId = undefined;
+    if (leaveIsReceipt && state.presenceLeave) {
+        const { bindingEpisodeId: _receipt, ...leave } = state.presenceLeave;
+        out.presenceLeave = leave;
+    }
+    return out;
+}
 /**
  * Upgrade the local projection after the server acknowledges a register.
  *
@@ -349,60 +390,68 @@ function bindingStrength(state) {
  * erase an explicit untracked choice, a conflicting existing company, or a
  * more specific binding for the same company. This is also used to repair
  * state files created by older clients before this write-back existed.
+ *
+ * The read and the write happen under the session state lock, so a concurrent
+ * writer (for example bind-project) is never overwritten from a stale snapshot.
  */
 export function writeAcknowledgedRegisterBinding(binding, root, now = () => new Date()) {
     const acknowledged = acknowledgedStatus(binding);
     if (!acknowledged || !isSafeWorkContextSegment(binding.sessionId))
         return null;
-    const prior = readSessionState(binding.sessionId, root);
-    // Reconcile always writes the local projection before network delivery. Do
-    // not manufacture session files when replay sees an orphaned legacy outbox
-    // record with no corresponding tracked session.
-    if (!prior)
-        return null;
-    if (prior.contextStatus === "untracked" ||
-        (prior.companyUid && prior.companyUid !== binding.companyUid)) {
-        return prior;
-    }
-    const acknowledgementStrength = acknowledged === "bound" ? 3 : acknowledged === "needs_task" ? 2 : 1;
-    const priorStrength = bindingStrength(prior);
-    const preservePriorBinding = Boolean(prior.companyUid === binding.companyUid && priorStrength > acknowledgementStrength);
-    // The server issues no binding episode for a register that did not come
-    // back bound (unresolved / needs_project / needs_task). Its receipt must
-    // never stand in for one: session-event batches carry bindingEpisodeId and
-    // the server drops batches whose episode it does not recognise. Older
-    // clients stored that receipt here, so also repair a prior value that is
-    // exactly this partial register's receipt.
-    const receiptEpisode = acknowledged === "bound" ? binding.receiptId : undefined;
-    const priorEpisode = acknowledged !== "bound" && prior.bindingEpisodeId === binding.receiptId
-        ? undefined
-        : prior.bindingEpisodeId;
-    const sameBindingAsPrior = prior.companyUid === binding.companyUid &&
-        prior.projectId === binding.projectId &&
-        prior.taskId === binding.taskId;
-    const next = mergeLocalSessionFields({
-        contractVersion: WORK_CONTEXT_CONTRACT_VERSION,
-        sessionId: binding.sessionId,
-        companyUid: binding.companyUid,
-        companySlug: binding.companySlug ?? prior.companySlug,
-        contextStatus: preservePriorBinding ? prior.contextStatus : acknowledged,
-        projectId: preservePriorBinding ? prior.projectId : binding.projectId,
-        taskId: preservePriorBinding ? prior.taskId : binding.taskId,
-        bindingEpisodeId: preservePriorBinding
-            ? priorEpisode ?? receiptEpisode
-            : receiptEpisode ?? (sameBindingAsPrior ? priorEpisode : undefined),
-        updatedAt: now().toISOString(),
-    }, prior, { preserveBindingEpisode: false });
-    if (prior.companyUid === next.companyUid &&
-        prior.companySlug === next.companySlug &&
-        prior.contextStatus === next.contextStatus &&
-        prior.projectId === next.projectId &&
-        prior.taskId === next.taskId &&
-        prior.bindingEpisodeId === next.bindingEpisodeId) {
-        return prior;
-    }
-    writeSessionState(next, root);
-    return next;
+    let result = null;
+    updateSessionState(binding.sessionId, root, (current) => {
+        // Reconcile always writes the local projection before network delivery. Do
+        // not manufacture session files when replay sees an orphaned legacy outbox
+        // record with no corresponding tracked session.
+        if (!current)
+            return null;
+        // A register response never carries a server episode, bound or not. The
+        // server mints episodes only on bind / organize, and drops session-event
+        // batches whose episode it does not recognise. Older clients stored the
+        // register receipt as the episode, so clear it wherever it is found. This
+        // repair is independent of the binding decision below and therefore also
+        // applies to untracked and different-company states.
+        const prior = stripRegisterReceiptEpisodes(current, [binding.receiptId]);
+        const repaired = prior !== current;
+        if (prior.contextStatus === "untracked" ||
+            (prior.companyUid && prior.companyUid !== binding.companyUid)) {
+            result = prior;
+            return repaired ? prior : null;
+        }
+        const acknowledgementStrength = acknowledged === "bound" ? 3 : acknowledged === "needs_task" ? 2 : 1;
+        const priorStrength = bindingStrength(prior);
+        const preservePriorBinding = Boolean(prior.companyUid === binding.companyUid && priorStrength > acknowledgementStrength);
+        const sameBindingAsPrior = prior.companyUid === binding.companyUid &&
+            prior.projectId === binding.projectId &&
+            prior.taskId === binding.taskId;
+        const next = mergeLocalSessionFields({
+            contractVersion: WORK_CONTEXT_CONTRACT_VERSION,
+            sessionId: binding.sessionId,
+            companyUid: binding.companyUid,
+            companySlug: binding.companySlug ?? prior.companySlug,
+            contextStatus: preservePriorBinding ? prior.contextStatus : acknowledged,
+            projectId: preservePriorBinding ? prior.projectId : binding.projectId,
+            taskId: preservePriorBinding ? prior.taskId : binding.taskId,
+            // Keep a server-issued episode only while the binding it was issued
+            // for is unchanged. Never derive one from the receipt.
+            bindingEpisodeId: preservePriorBinding || sameBindingAsPrior
+                ? prior.bindingEpisodeId
+                : undefined,
+            updatedAt: now().toISOString(),
+        }, prior, { preserveBindingEpisode: false });
+        if (prior.companyUid === next.companyUid &&
+            prior.companySlug === next.companySlug &&
+            prior.contextStatus === next.contextStatus &&
+            prior.projectId === next.projectId &&
+            prior.taskId === next.taskId &&
+            prior.bindingEpisodeId === next.bindingEpisodeId) {
+            result = prior;
+            return repaired ? prior : null;
+        }
+        result = next;
+        return next;
+    });
+    return result;
 }
 /** True when a durable state file was written by the hook / reconcile path. */
 export function isHookWrittenSessionState(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.250.0",
+  "version": "5.251.0",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {