@indigoai-us/hq-cli 5.123.0 → 5.123.1

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

@@ -112,10 +112,12 @@ export declare function writeSessionState(state: SessionStateFile, root: string)
 /** Strip any non-allowlisted fields before durable write. */
 export declare function projectSessionState(state: SessionStateFile): SessionStateFile;
 /**
- * Merge prior local-only counters into a new state write so PostToolUse bumps
- * and reconcile updates do not clobber each other.
+ * Merge prior local fields into a new state write so PostToolUse bumps and
+ * reconcile updates do not clobber an acknowledged company binding.
  */
-export declare function mergeLocalSessionFields(next: SessionStateFile, prior: SessionStateFile | null): SessionStateFile;
+export declare function mergeLocalSessionFields(next: SessionStateFile, prior: SessionStateFile | null, options?: {
+    preserveBindingEpisode?: boolean;
+}): SessionStateFile;
 /**
  * Upgrade the local projection after the server acknowledges a register.
  *

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

@@ -103,13 +103,30 @@ export function projectSessionState(state) {
     return out;
 }
 /**
- * Merge prior local-only counters into a new state write so PostToolUse bumps
- * and reconcile updates do not clobber each other.
+ * Merge prior local fields into a new state write so PostToolUse bumps and
+ * reconcile updates do not clobber an acknowledged company binding.
  */
-export function mergeLocalSessionFields(next, prior) {
+export function mergeLocalSessionFields(next, prior, options = {}) {
     if (!prior)
         return next;
     const out = { ...next };
+    // Hook observations commonly carry only tool-write/session metadata. Those
+    // writes must not erase a company that an acknowledged register already
+    // projected locally; losing it causes held events and repeat registrations.
+    // A caller that carries either company field is intentionally changing the
+    // binding and remains authoritative.
+    if (!out.companyUid && !out.companySlug && (prior.companyUid || prior.companySlug)) {
+        out.companyUid = prior.companyUid;
+        out.companySlug = prior.companySlug;
+        out.contextStatus = prior.contextStatus;
+        if (!out.projectId && prior.projectId)
+            out.projectId = prior.projectId;
+        if (!out.taskId && prior.taskId)
+            out.taskId = prior.taskId;
+        if (out.version === undefined && prior.version !== undefined) {
+            out.version = prior.version;
+        }
+    }
     if (out.toolWrites === undefined && typeof prior.toolWrites === "number") {
         out.toolWrites = prior.toolWrites;
     }
@@ -131,7 +148,14 @@ export function mergeLocalSessionFields(next, prior) {
     if (!out.transcriptMarker && prior.transcriptMarker) {
         out.transcriptMarker = prior.transcriptMarker;
     }
-    if (!out.bindingEpisodeId && prior.bindingEpisodeId) {
+    const sameBinding = prior.companyUid === out.companyUid &&
+        prior.companySlug === out.companySlug &&
+        prior.projectId === out.projectId &&
+        prior.taskId === out.taskId;
+    if (options.preserveBindingEpisode !== false &&
+        !out.bindingEpisodeId &&
+        prior.bindingEpisodeId &&
+        sameBinding) {
         out.bindingEpisodeId = prior.bindingEpisodeId;
     }
     return out;

package/dist/utils/self-update.d.ts

@@ -57,6 +57,7 @@
  * version-check), `hq rescue --no-self-update`, and the re-exec guard env.
  */
 import { type RunningInstall, type UpdateResult } from "./version-gate.js";
+import { type RestartDaemonResult } from "../lib/mesh/live/daemon/install.js";
 /**
  * Set on the re-exec'd child so it can never self-update (and re-exec) again.
  * One update + one re-exec per user invocation, ever.
@@ -153,6 +154,8 @@ export interface SelfUpdateDeps {
      * underneath themselves: hooks, scripts, agents, cron, CI.
      */
     interactive?: boolean;
+    /** Best-effort daemon kick after the CLI install converges (tests). */
+    restartDaemon?: () => RestartDaemonResult | void;
 }
 /**
  * Startup path: the running CLI is behind npm `latest`, so update in place and

package/dist/utils/self-update.js

@@ -63,6 +63,7 @@ import { CLI_NAME, CLI_VERSION } from "../cli-version.js";
 import { buildBunInstallArgv, buildPnpmInstallArgv, buildPrefixedInstallArgv, buildSpawnPlan, checkUpdateConvergence, isLocalDependencyInstall, isPrefixWritable, nonWritablePrefixNote, openInstallOutput, pnpmUpdateEnv, resolveRunningInstall, runUpdateCommand, runSupervisedUpdateCommand, } from "./version-gate.js";
 import { acquireUpdateLock as acquireSharedUpdateLock } from "./update-lock.js";
 import { markLatestIneffective } from "./version-check.js";
+import { restartDaemonServiceIfInstalled } from "../lib/mesh/live/daemon/install.js";
 /**
  * Set on the re-exec'd child so it can never self-update (and re-exec) again.
  * One update + one re-exec per user invocation, ever.
@@ -278,6 +279,16 @@ async function updateAndReexec(argv, flavor, known, deps) {
         console.error(chalk.dim(`  Continuing the ${flavor.noun} on ${current}.`));
         return { action: "update-ineffective", latest };
     }
+    // A resident mesh daemon keeps the old JS loaded after a global install.
+    // Service restart is best-effort and cannot turn a successful update red.
+    try {
+        const restart = (deps.restartDaemon ?? restartDaemonServiceIfInstalled)();
+        if (restart?.message)
+            console.error(chalk.yellow(`  ${restart.message}`));
+    }
+    catch {
+        // Defensive only; the default helper already absorbs manager failures.
+    }
     const childEnv = { ...env, [REEXEC_GUARD_ENV]: "1" };
     const status = (deps.reexec ?? reexecHq)([...argv.slice(2)], childEnv);
     if (status === null) {

package/package.json

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