@indigoai-us/hq-cli 5.108.21 → 5.108.22

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [5.108.22] — 2026-09-07
+
+### Fixed
+
+- Work Mesh registrations now retain the runtime harness in the durable outbox
+  and send it to the server, including a compatible fallback for older queued
+  operations. Fleet sessions discover their company from the standard agent
+  identity file without requiring a launcher environment variable, and transcript
+  registration uses the shared company precedence and conflict rules.
+
 ## [5.108.21] — 2026-09-07
 
 ### Fixed

package/dist/lib/doctor/checks/runtime-probe.js

@@ -300,7 +300,7 @@ export function checkRuntimeProbe(context) {
                 status: "PASS",
                 checkId,
                 target,
-                message: `Host platform is agents-v2 (hermes fleet): the on-box adapter wrote the ` +
+                message: `Host platform is the Agents v2 runtime: the on-box adapter wrote the ` +
                     `policy-trigger ledger through the same .claude hooks, so hook dispatch was ` +
                     `observed this session — the ledger has an entry${scope}.`,
             },

package/dist/lib/mesh/client.js

@@ -24,6 +24,8 @@ export function createWorkSessionDeliverer(opts) {
             contractVersion: 1,
             companyUid,
             sessionId: op.sessionId,
+            // Pre-upgrade outbox records have no harness; do not invent a provider.
+            harness: op.harness?.trim() || "unknown",
             clientOperationId: op.clientOperationId,
             operationId: op.operationId,
             digest: op.digest,

package/dist/lib/mesh/live/daemon/transcript-watch.d.ts

@@ -219,10 +219,11 @@ export declare function isTranscriptHookCovered(sessionId: string, opts: {
 }): boolean;
 /**
  * Resolve local registration for a transcript session. Never asks, never
- * creates a project. Uses deterministic cwd/remote mapping only.
+ * creates a project. Shares reconcile's company precedence and conflict rules.
  */
 export declare function resolveTranscriptRegistration(input: {
     sessionId: string;
+    env?: NodeJS.ProcessEnv;
     cwd?: string;
     hqRoot?: string;
     workContextRoot: string;

package/dist/lib/mesh/live/daemon/transcript-watch.js

@@ -29,8 +29,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { CLI_VERSION } from "../../../../cli-version.js";
-import { companySlugFromCwd, projectIdFromCwd, resolveDeterministicCompany, } from "../../../work-context/company.js";
-import { getDefaultCompany } from "../../../work-context/config.js";
+import { companySlugFromCwd, projectIdFromCwd, resolveCompany, } from "../../../work-context/company.js";
 import { WORK_CONTEXT_CONTRACT_VERSION } from "../../../work-context/contract.js";
 import { reconcileObservation, } from "../../../work-context/reconcile.js";
 import { deriveRemoteOwnerSlug } from "../../../work-context/repo-remote.js";
@@ -441,7 +440,7 @@ export function isTranscriptHookCovered(sessionId, opts) {
 }
 /**
  * Resolve local registration for a transcript session. Never asks, never
- * creates a project. Uses deterministic cwd/remote mapping only.
+ * creates a project. Shares reconcile's company precedence and conflict rules.
  */
 export function resolveTranscriptRegistration(input) {
     const now = input.now ?? (() => new Date());
@@ -449,33 +448,26 @@ export function resolveTranscriptRegistration(input) {
     const remoteOwnerSlug = input.cwd
         ? deriveRemoteOwnerSlug({ cwd: input.cwd, hqRoot: input.hqRoot })
         : null;
-    const deterministic = resolveDeterministicCompany({
+    const resolution = resolveCompany({
+        root: input.workContextRoot,
+        sessionId: input.sessionId,
+        env: input.env,
         cwd: input.cwd,
         hqRoot: input.hqRoot,
         remoteOwnerSlug,
     });
-    const projectId = projectIdFromCwd(input.cwd, input.hqRoot);
-    // Prefer company slug from deterministic evidence; optionally adopt uid when
-    // the enabled device default names the same slug (no conflict ask).
-    const companySlug = deterministic?.slug ?? companySlugFromCwd(input.cwd, input.hqRoot);
-    let companyUid;
-    const device = getDefaultCompany({ root: input.workContextRoot });
-    if (companySlug &&
-        device?.enabled &&
-        device.slug &&
-        device.slug.toLowerCase() === companySlug.toLowerCase()) {
-        companyUid = device.uid;
-    }
-    let contextStatus;
-    if (!companySlug) {
-        contextStatus = "needs_company";
-    }
-    else if (projectId) {
-        contextStatus = "needs_task";
-    }
-    else {
-        contextStatus = "unresolved";
-    }
+    const company = resolution.status === "resolved" ? resolution.company : undefined;
+    const companySlug = company?.slug;
+    const companyUid = company?.uid;
+    // A cwd project belongs to its cwd company, never to a higher-precedence
+    // identity or explicit scope naming another (or not-yet-mapped) company.
+    const cwdCompany = companySlugFromCwd(input.cwd, input.hqRoot);
+    const projectId = companySlug && cwdCompany?.toLowerCase() === companySlug.toLowerCase()
+        ? projectIdFromCwd(input.cwd, input.hqRoot)
+        : undefined;
+    const contextStatus = resolution.status === "company_conflict"
+        ? "company_conflict"
+        : !company ? "needs_company" : projectId ? "needs_task" : "unresolved";
     const state = {
         contractVersion: WORK_CONTEXT_CONTRACT_VERSION,
         sessionId: input.sessionId,

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

@@ -58,9 +58,11 @@ export interface CompanyResolveInput {
 }
 /** Env naming the on-box identity.json (fleet agent boxes). */
 export declare const HQ_AGENT_IDENTITY_FILE_ENV = "HQ_AGENT_IDENTITY_FILE";
+export declare const DEFAULT_AGENT_IDENTITY_FILE = "/var/lib/hq-agent/identity.json";
 /**
  * Read `companyUid` from the agent identity file when
- * `HQ_AGENT_IDENTITY_FILE` is set. Missing/unreadable/malformed → undefined
+ * `HQ_AGENT_IDENTITY_FILE` is set, or the conventional fleet path otherwise.
+ * Missing/unreadable/malformed → undefined
  * (never throws; never logs file contents).
  */
 export declare function readAgentIdentityCompanyUid(env?: NodeJS.ProcessEnv): string | undefined;

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

@@ -26,6 +26,7 @@ export function companyCorrectionPath(sessionId) {
 const SLUG_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 /** Env naming the on-box identity.json (fleet agent boxes). */
 export const HQ_AGENT_IDENTITY_FILE_ENV = "HQ_AGENT_IDENTITY_FILE";
+export const DEFAULT_AGENT_IDENTITY_FILE = "/var/lib/hq-agent/identity.json";
 function normalizeSlug(value) {
     if (!value)
         return undefined;
@@ -36,11 +37,14 @@ function normalizeSlug(value) {
 }
 /**
  * Read `companyUid` from the agent identity file when
- * `HQ_AGENT_IDENTITY_FILE` is set. Missing/unreadable/malformed → undefined
+ * `HQ_AGENT_IDENTITY_FILE` is set, or the conventional fleet path otherwise.
+ * Missing/unreadable/malformed → undefined
  * (never throws; never logs file contents).
  */
 export function readAgentIdentityCompanyUid(env = process.env) {
-    const file = env[HQ_AGENT_IDENTITY_FILE_ENV]?.trim();
+    // An explicit override (including empty/missing paths) never falls back to
+    // another identity. This prevents accidental attribution to a different box.
+    const file = (env[HQ_AGENT_IDENTITY_FILE_ENV] ?? DEFAULT_AGENT_IDENTITY_FILE).trim();
     if (!file)
         return undefined;
     try {

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

@@ -5,7 +5,7 @@
 import type { DeliveryState } from "./contract.js";
 import { WORK_CONTEXT_CONTRACT_VERSION } from "./contract.js";
 /** Fields allowed on a durable outbox operation (privacy allowlist). */
-export declare const OUTBOX_ALLOWLIST: readonly ["contractVersion", "operationId", "clientOperationId", "sessionId", "companyUid", "companySlug", "projectId", "taskId", "kind", "digest", "delivery", "createdAt", "updatedAt", "attemptCount", "lastErrorCode", "receiptId", "destinationCompanyUid", "destinationCompanySlug", "nextAttemptAt"];
+export declare const OUTBOX_ALLOWLIST: readonly ["contractVersion", "operationId", "clientOperationId", "sessionId", "harness", "companyUid", "companySlug", "projectId", "taskId", "kind", "digest", "delivery", "createdAt", "updatedAt", "attemptCount", "lastErrorCode", "receiptId", "destinationCompanyUid", "destinationCompanySlug", "nextAttemptAt"];
 /** Base delay for outbox retry backoff (attempt 1 → 30s). */
 export declare const OUTBOX_RETRY_BASE_MS = 30000;
 /** Cap for outbox retry backoff (6 hours). */
@@ -20,6 +20,7 @@ export interface OutboxOperation {
     operationId: string;
     clientOperationId: string;
     sessionId: string;
+    harness?: string;
     companyUid?: string;
     companySlug?: string;
     projectId?: string;
@@ -41,6 +42,7 @@ export interface OutboxOperation {
 export interface OutboxEnqueueInput {
     clientOperationId: string;
     sessionId: string;
+    harness?: string;
     companyUid?: string;
     companySlug?: string;
     projectId?: string;
@@ -54,6 +56,7 @@ export declare function clearOutboxListCache(): void;
 export declare function stableOperationId(clientOperationId: string, sessionId: string): string;
 export declare function digestOperation(parts: {
     sessionId: string;
+    harness?: string;
     clientOperationId: string;
     companyUid?: string;
     companySlug?: string;

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

@@ -15,6 +15,7 @@ export const OUTBOX_ALLOWLIST = [
     "operationId",
     "clientOperationId",
     "sessionId",
+    "harness",
     "companyUid",
     "companySlug",
     "projectId",
@@ -59,6 +60,7 @@ export function digestOperation(parts) {
     const canonical = JSON.stringify({
         v: 1,
         sessionId: parts.sessionId,
+        ...(parts.harness ? { harness: parts.harness } : {}),
         clientOperationId: parts.clientOperationId,
         companyUid: parts.companyUid ?? null,
         companySlug: parts.companySlug ?? null,
@@ -83,6 +85,8 @@ function projectOutbox(op) {
         updatedAt: op.updatedAt,
         attemptCount: op.attemptCount,
     };
+    if (op.harness)
+        out.harness = op.harness;
     if (op.companyUid)
         out.companyUid = op.companyUid;
     if (op.companySlug)
@@ -132,6 +136,7 @@ export function enqueueOutbox(input, root) {
     }
     const digest = digestOperation({
         sessionId: input.sessionId,
+        harness: input.harness,
         clientOperationId: input.clientOperationId,
         companyUid: input.companyUid,
         companySlug: input.companySlug,
@@ -144,7 +149,14 @@ export function enqueueOutbox(input, root) {
     const now = (input.now ?? (() => new Date()))().toISOString();
     const existing = readOutboxOperation(operationId, root);
     if (existing) {
-        if (existing.digest !== digest) {
+        // A pre-upgrade operation has no harness in its digest. Preserve its
+        // original receipt identity when the same observation is enqueued again.
+        const legacyReplay = !existing.harness && input.harness && existing.digest === digestOperation({
+            ...input,
+            harness: undefined,
+            kind,
+        });
+        if (existing.digest !== digest && !legacyReplay) {
             throw new NotTrackingError(`Idempotency conflict for ${operationId}`, "IdempotencyConflictError");
         }
         return existing;
@@ -154,6 +166,7 @@ export function enqueueOutbox(input, root) {
         operationId,
         clientOperationId: input.clientOperationId,
         sessionId: input.sessionId,
+        harness: input.harness,
         companyUid: input.companyUid,
         companySlug: input.companySlug,
         projectId: input.projectId,

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

@@ -4,7 +4,7 @@
  */
 import * as fs from "node:fs";
 import { InvalidSessionIdentityError, normalizeSessionIdentity, } from "../mesh/live/session-identity.js";
-import { companyCorrectionPath, resolveCompany, } from "./company.js";
+import { companyCorrectionPath, companySlugFromCwd, resolveCompany, } from "./company.js";
 import { WORK_CONTEXT_CONTRACT_VERSION, normalizeTaskId, } from "./contract.js";
 import { EXIT_INVALID_IDENTITY, EXIT_NOT_TRACKING, EXIT_OK, InvalidDecisionOriginError, NotTrackingError, } from "./errors.js";
 import { decisionFromCandidates, } from "./organize.js";
@@ -385,7 +385,7 @@ export async function reconcileObservation(obs, deps) {
         }
     }
     // Company resolved — resolve project/task (US-007B order).
-    const projectResolved = resolveProjectTask({
+    let projectResolved = resolveProjectTask({
         sessionId,
         env,
         trusted,
@@ -393,6 +393,14 @@ export async function reconcileObservation(obs, deps) {
         hqRoot,
         existingState: prior,
     });
+    // Deterministic cwd projects belong to the cwd company. A higher-precedence
+    // identity UID must not adopt a project from an unrelated/unverified slug.
+    if (projectResolved?.source === "deterministic_cwd") {
+        const cwdCompany = companySlugFromCwd(cwd, hqRoot);
+        if (!resolvedCompany.slug || cwdCompany?.toLowerCase() !== resolvedCompany.slug.toLowerCase()) {
+            projectResolved = null;
+        }
+    }
     const projectId = projectResolved?.projectId;
     const taskId = projectResolved?.taskId;
     // Trusted / deterministic auto-bind never asks.
@@ -475,6 +483,7 @@ export async function reconcileObservation(obs, deps) {
         outboxOp = enqueueOutbox({
             clientOperationId: obs.clientOperationId,
             sessionId,
+            harness: obs.identity.harness,
             companyUid: resolvedCompany.uid,
             companySlug: resolvedCompany.slug,
             projectId,

package/package.json

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