@indigoai-us/hq-cli 5.343.0 → 5.344.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [5.344.0] — 2026-10-04
+- Include a bounded reason in sync-failure client-health reports.
+- Add an explicit opt-in to count usage from HQ sessions with no company toward the default company: `hq mesh context default set` asks in a terminal (default No), takes `--count-usage` / `--no-count-usage`, and writes `usageAttribution` (company and signed-in person) to the work-context config. Changing or clearing the default, logging out, or signing in as another account withdraws it; `get` shows it; an automatic default never opts in.
+
+## [5.343.1] — 2026-10-04
+
+- Include the bounded hq-cli version in `cli_feature_used` telemetry so feature-use rows can be grouped by release.
+
+- Release the HQ CLI package-use lease before hq daemon call waits for its daemon response, after preloading the request protocol.
+- Release the package-use lease after Outpost lane message and resume requests are submitted and their result-wait imports are preloaded.
+- Preserve human, agent, and both audience tags when CLI tools and local bots post or reply in channels.
+- Wait for a live installer to finish before retrying a failed CLI import when the install tree is still in flight.
+- Preserve bounded master-hook slow-phase and per-phase timeout attribution in Sentry reports.
+
 ## [5.343.0] — 2026-10-04
 - `hq company --company <slug> settings set --work-registry-enabled <true|false>` and `--work-mesh-live-enabled <true|false>` let a company owner turn work tracking on or off. Work tracking needs both switches; after either is set the command says whether work tracking is on and prints the exact command for the switch that is still off. `hq company --company <slug> settings get` now also shows both switches for an owner or admin.
 - `hq mesh context requeue` now also re-sends, by default, sessions that were refused while work tracking was off. `hq doctor` and `hq mesh daemon doctor` explain those refusals in plain words.

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

@@ -3204,7 +3204,7 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly hidden: false;
         }, {
             readonly flags: "--audience <human|agent|both>";
-            readonly description: "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both (1:1 DMs only)";
+            readonly description: "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both";
             readonly hidden: false;
         }];
         readonly subcommands: readonly [];
@@ -9678,7 +9678,7 @@ export declare const COMMAND_CATALOG: readonly [{
             readonly options: readonly [];
             readonly subcommands: readonly [{
                 readonly name: "get";
-                readonly description: "Show the device default company (never activeCompany)";
+                readonly description: "Show the device default company (never activeCompany) and whether usage is counted toward it";
                 readonly aliases: readonly [];
                 readonly hidden: false;
                 readonly helpOption: true;
@@ -9700,7 +9700,10 @@ export declare const COMMAND_CATALOG: readonly [{
                 readonly helpOption: true;
                 readonly helpCommand: false;
                 readonly usage: "[options] <slug>";
-                readonly helpText: readonly [];
+                readonly helpText: readonly [{
+                    readonly position: "after";
+                    readonly text: "\nWith neither --count-usage nor --no-count-usage, an interactive terminal asks (default No);\notherwise an existing opt-in is kept only when it is for the same company.\nChanging to a different company always stops counting usage toward the old one.";
+                }];
                 readonly arguments: readonly [{
                     readonly name: "slug";
                     readonly required: true;
@@ -9715,6 +9718,14 @@ export declare const COMMAND_CATALOG: readonly [{
                     readonly flags: "--repair-held-with-default";
                     readonly description: "Persist opt-in for lower-confidence historical held-session repair";
                     readonly hidden: false;
+                }, {
+                    readonly flags: "--count-usage";
+                    readonly description: "Count usage from HQ sessions with no company toward this company (its owner and admins can see it)";
+                    readonly hidden: false;
+                }, {
+                    readonly flags: "--no-count-usage";
+                    readonly description: "Do not count usage from HQ sessions with no company toward this company";
+                    readonly hidden: false;
                 }, {
                     readonly flags: "--company <slug|uid>";
                     readonly description: "Deprecated no-op; the selected company is verified directly";
@@ -9727,7 +9738,7 @@ export declare const COMMAND_CATALOG: readonly [{
                 readonly subcommands: readonly [];
             }, {
                 readonly name: "clear";
-                readonly description: "Clear the device default company";
+                readonly description: "Clear the device default company and any opt-in to count usage toward it";
                 readonly aliases: readonly [];
                 readonly hidden: false;
                 readonly helpOption: true;

package/dist/command-catalog.generated.js

@@ -3874,7 +3874,7 @@ export const COMMAND_CATALOG = [
                     },
                     {
                         "flags": "--audience <human|agent|both>",
-                        "description": "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both (1:1 DMs only)",
+                        "description": "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both",
                         "hidden": false
                     }
                 ],
@@ -11737,7 +11737,7 @@ export const COMMAND_CATALOG = [
                         "subcommands": [
                             {
                                 "name": "get",
-                                "description": "Show the device default company (never activeCompany)",
+                                "description": "Show the device default company (never activeCompany) and whether usage is counted toward it",
                                 "aliases": [],
                                 "hidden": false,
                                 "helpOption": true,
@@ -11762,7 +11762,12 @@ export const COMMAND_CATALOG = [
                                 "helpOption": true,
                                 "helpCommand": false,
                                 "usage": "[options] <slug>",
-                                "helpText": [],
+                                "helpText": [
+                                    {
+                                        "position": "after",
+                                        "text": "\nWith neither --count-usage nor --no-count-usage, an interactive terminal asks (default No);\notherwise an existing opt-in is kept only when it is for the same company.\nChanging to a different company always stops counting usage toward the old one."
+                                    }
+                                ],
                                 "arguments": [
                                     {
                                         "name": "slug",
@@ -11782,6 +11787,16 @@ export const COMMAND_CATALOG = [
                                         "description": "Persist opt-in for lower-confidence historical held-session repair",
                                         "hidden": false
                                     },
+                                    {
+                                        "flags": "--count-usage",
+                                        "description": "Count usage from HQ sessions with no company toward this company (its owner and admins can see it)",
+                                        "hidden": false
+                                    },
+                                    {
+                                        "flags": "--no-count-usage",
+                                        "description": "Do not count usage from HQ sessions with no company toward this company",
+                                        "hidden": false
+                                    },
                                     {
                                         "flags": "--company <slug|uid>",
                                         "description": "Deprecated no-op; the selected company is verified directly",
@@ -11797,7 +11812,7 @@ export const COMMAND_CATALOG = [
                             },
                             {
                                 "name": "clear",
-                                "description": "Clear the device default company",
+                                "description": "Clear the device default company and any opt-in to count usage toward it",
                                 "aliases": [],
                                 "hidden": false,
                                 "helpOption": true,

package/dist/commands/cloud.js

@@ -20,7 +20,7 @@ import { share, sync, getStateDir, listJournals, VaultClient, computePersonalVau
 import { DEFAULT_HQ_ROOT, ensureCognitoToken, buildVaultConfig, loadCachedTokens, } from "../utils/cognito-session.js";
 import { resolveUploadAuthor } from "../utils/upload-author.js";
 import { companyFolderExceedsThreshold, emitNarrowHint, isStrictRefusal, resolveBannerLevel, resolveNarrowHintPresentationLevel, resolveNarrowHintMinBytes, } from "../lib/narrow-hint-banner.js";
-import { beginSyncHealthReport, } from "../utils/client-health.js";
+import { beginSyncHealthReport, classifySyncFailure, } from "../utils/client-health.js";
 import { companySlugFromSyncPaths, warnAboutInvalidOntologyEntities, } from "../lib/sync-invalid-entity-warning.js";
 import { isWorkBearingSyncResult, recordFirstWorkBearingSync, } from "../lib/first-sync-next-step.js";
 import { maybeShowCliInviteNudge } from "../lib/cli-invite-nudge.js";
@@ -125,7 +125,7 @@ export async function withSyncHealthReport(run) {
             await health.succeeded();
         }
         else {
-            await health.failed();
+            await health.failed(classifySyncFailure(err));
         }
         if (err instanceof SyncExitError)
             process.exit(err.code);

package/dist/commands/daemon.js

@@ -29,6 +29,7 @@ import { MACHINE_TYPE_MARKER_PATH, detectMachineType, homeFromPasswd, } from "..
 import { daemonPaths } from "../lib/daemon/paths.js";
 import { processCommandLine } from "../lib/daemon/lock.js";
 import { writeControlRequest } from "../lib/daemon/requests.js";
+import { runDaemonCall } from "../lib/daemon/command-call.js";
 import { isSyncRunnerCommandLine, readWatchRunnerOwnerStatus, watchRunnerOwnerStatusPath } from "../lib/daemon/sync-runner.js";
 import { getSyncModeForCompany, setSyncMode } from "./sync-mode.js";
 import { requireAnywhereRuntime } from "./anywhere-runtime-flag.js";
@@ -857,17 +858,7 @@ export function registerDaemonCommand(program, over = {}) {
         const timeoutMs = Number(opts.timeout ?? (op === "policy.check" ? "40000" : "20000"));
         if (!Number.isFinite(timeoutMs) || timeoutMs <= 0)
             throw new Error("--timeout must be a positive number of milliseconds");
-        const { hqdRequest, hqdSocketPath, HqdClientError } = await import("../lib/daemon/protocol.js");
-        try {
-            const result = await hqdRequest(op, args, { socketPath: hqdSocketPath(d.home, d.env), timeoutMs });
-            d.out(JSON.stringify(result, null, 2));
-        }
-        catch (err) {
-            if (!(err instanceof HqdClientError))
-                throw err;
-            d.out(JSON.stringify({ error: { code: err.code, message: err.message } }, null, 2));
-            process.exitCode = 1;
-        }
+        await runResidentCommandWithPackageLease("daemon-call", () => runDaemonCall(op, args, timeoutMs, d));
     }));
     daemon
         .command("status")

package/dist/commands/dm.js

@@ -614,11 +614,20 @@ async function runChannelSend(channelName, message, opts) {
         // Send the human-readable form: the quotes only existed for parsing.
         if (mentions.length > 0)
             body = stripMentionQuotes(body);
+        let audience;
+        if (opts.audience !== undefined && opts.audience !== "") {
+            if (!DM_AUDIENCE_VALUES.includes(opts.audience)) {
+                throw new Error(`Invalid --audience '${opts.audience}': must be human, agent, or both.`);
+            }
+            audience = opts.audience;
+        }
         const payload = { body };
         if (mentions.length > 0)
             payload.mentions = mentions;
         if (rootEventId)
             payload.rootEventId = rootEventId;
+        if (audience)
+            payload.audience = audience;
         const sendRes = await vaultApiFetch({
             token,
             path: `/v1/notify/channels/${encodeURIComponent(channel.channelId)}/messages`,
@@ -1327,7 +1336,7 @@ export function registerDmCommand(program) {
         .option("--details-file <path>", "Read the details from a file (1:1 DMs only)")
         .option("--at <iso>", "Schedule delivery at an ISO8601 time (store-and-forward; delivered within ~60s of the time; 1:1 DMs only)")
         .option("--in <duration>", "Schedule delivery after a relative delay: 30s, 10m, 2h, 1d (1:1 DMs only)")
-        .option("--audience <human|agent|both>", "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both (1:1 DMs only)")
+        .option("--audience <human|agent|both>", "Tag who this message is for: human (a person must read it), agent (progress/status, hidden from humans by default), or both")
         .action(async (recipient, message, opts) => {
         await runDmSend(recipient, message, opts);
     });

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

@@ -272,6 +272,7 @@ export interface Ctx {
         command: string;
         timeoutSeconds?: number;
         waitMs?: number;
+        beforeWait?: () => Promise<void>;
     }) => Promise<OutpostDispatchResult>;
     backfillOutpostIdentity: (expectedId: string) => "created" | "unchanged";
     fetchText: (url: string) => Promise<string>;

package/dist/commands/lanes.d.ts

@@ -86,6 +86,7 @@ export interface LanesCommandDeps {
         command: string;
         timeoutSeconds?: number;
         waitMs?: number;
+        beforeWait?: () => Promise<void>;
     }) => Promise<OutpostDispatchResult>;
     /** Test seam for the atomic, non-overwriting marker repair. */
     backfillOutpostIdentity?: (expectedId: string) => "created" | "unchanged";

package/dist/commands/lanes.js

@@ -4317,11 +4317,22 @@ async function dispatchOutpostLaneCommand(ctx, lane, action, options, behavior =
     let dispatched;
     let grantContextRejected = false;
     let failedResumeOptionRejected = false;
+    let outpostWaitLeasePreparationStarted = false;
     try {
         const dispatchCommand = (contexts) => ctx.dispatchOutpostExec({
             outpostId,
             timeoutSeconds: Math.ceil(waitMs / 1000),
             waitMs,
+            ...(action === "message" || action === "resume"
+                ? {
+                    beforeWait: async () => {
+                        if (outpostWaitLeasePreparationStarted)
+                            return;
+                        outpostWaitLeasePreparationStarted = true;
+                        await runResidentCommandWithPackageLease("outpost-wait", async () => undefined);
+                    },
+                }
+                : {}),
             command: buildOutpostLaneCommand({
                 action: action === "grant"
                     ? "grant-target"

package/dist/commands/login.js

@@ -8,7 +8,8 @@ import { browserLogin, loadCachedTokens, isExpiring } from '@indigoai-us/hq-clou
 import { cognitoConfigForLoginProvider } from '../utils/login-provider.js';
 import * as readline from "node:readline/promises";
 import { listActiveMembershipCompanies } from "../lib/mesh/api.js";
-import { setDefaultCompany } from "../lib/work-context/config.js";
+import { retainUsageAttributionForPerson, setDefaultCompany } from "../lib/work-context/config.js";
+import { personUidFromTokens } from "../lib/work-context/person-identity.js";
 import { ensureDefaultCompany } from "../lib/work-context/default-company.js";
 import { workContextRoot } from "../lib/work-context/paths.js";
 function peekIdToken(idToken) {
@@ -62,6 +63,16 @@ export function registerLoginCommand(program) {
             process.exitCode = 1;
             return;
         }
+        try {
+            // The usage-attribution opt-in belongs to the person who gave it. A
+            // different (or unknown) account signing in on this OS user drops it.
+            retainUsageAttributionForPerson(personUidFromTokens(loadCachedTokens()), {
+                root: workContextRoot(),
+            });
+        }
+        catch {
+            /* fail closed below: readers also require the signed-in person to match */
+        }
         try {
             const root = workContextRoot();
             const activation = await ensureDefaultCompany({

package/dist/commands/logout.js

@@ -3,6 +3,8 @@
  */
 import chalk from 'chalk';
 import { clearCachedTokens, loadCachedTokens } from '@indigoai-us/hq-cloud';
+import { retainUsageAttributionForPerson } from '../lib/work-context/config.js';
+import { workContextRoot } from '../lib/work-context/paths.js';
 export function registerLogoutCommand(program) {
     program
         .command('logout')
@@ -11,6 +13,14 @@ export function registerLogoutCommand(program) {
         try {
             const { clearMcpOAuthCaches } = await import('../lib/daemon/mcp-oauth.js');
             clearMcpOAuthCaches();
+            // Signing out withdraws the opt-in to count no-company usage toward the
+            // default company; the next account must opt in for itself.
+            try {
+                retainUsageAttributionForPerson(null, { root: workContextRoot() });
+            }
+            catch (error) {
+                console.error(chalk.yellow('Could not withdraw the usage opt-in:'), error instanceof Error ? error.message : 'Unknown error');
+            }
             const existing = loadCachedTokens();
             if (!existing) {
                 console.log(chalk.yellow('No cached HQ session'));

package/dist/commands/mesh.d.ts

@@ -10,6 +10,30 @@ import { type MeshCompany, type MeshThread } from "../lib/mesh/api.js";
 import { type DaemonInstallPlatform, type InstallPaths } from "../lib/mesh/live/daemon/index.js";
 import { type RunCommand } from "../lib/service-manager/launchd.js";
 export declare function formatCheckLines(threads: MeshThread[], company: MeshCompany, projectId?: string): string[];
+/** Test seam for the usage-attribution question asked by `default set`. */
+export interface DefaultCompanyPromptDeps {
+    /** True when stdin and stdout are a terminal (a person can answer). */
+    isInteractive?: () => boolean;
+    /** Ask a yes/no question; resolves true only for an explicit yes. */
+    confirm?: (question: string) => Promise<boolean>;
+}
+export declare function usageOptInExplainer(company: string): string;
+export declare function usageOptInQuestion(company: string): string;
+export declare function usageCountedLine(company: string): string;
+export declare function usageNotCountedLine(company: string): string;
+/** Only "y" or "yes" (any case, surrounding space ignored) is a yes. EOF (null) is no. */
+export declare function parseYesNoAnswer(answer: string | null): boolean;
+/** A person can answer only when both stdin and stdout are a terminal. */
+export declare function isInteractiveTerminal(stdin?: {
+    isTTY?: boolean;
+}, stdout?: {
+    isTTY?: boolean;
+}): boolean;
+/** Ask one yes/no question. Resolves false on EOF or a closed input. */
+export declare function askYesNo(question: string, io?: {
+    input?: NodeJS.ReadableStream;
+    output?: NodeJS.WritableStream;
+}): Promise<boolean>;
 /** Injectable confirmation seam for `hq mesh context correct` (stubbed in tests). */
 export type MeshConfirmFn = (message: string) => Promise<boolean>;
 /** Exported for confirmation-gate unit tests (US-017B). */
@@ -25,7 +49,9 @@ export declare function runContextCorrect(opts: {
 }, deps?: {
     confirm?: MeshConfirmFn;
 }): Promise<void>;
-export declare function registerMeshCommand(program: Command): void;
+export declare function registerMeshCommand(program: Command, deps?: {
+    defaultCompanyPrompt?: DefaultCompanyPromptDeps;
+}): void;
 export declare function runDaemonStatus(opts: {
     json?: boolean;
 }, deps?: {

package/dist/commands/mesh.js

@@ -18,9 +18,10 @@ import { closeSupersededProjectThread, ensureMissingBoardStories, ensureProjectB
 import { mapSourceStoryStatus } from "../lib/mesh/story-status.js";
 import { buildPreflightFixtures } from "../lib/work-context/preflight-contract.js";
 import { createCandidatesFetcher, createMigratePoster, createOrganizePoster, createWorkSessionDeliverer, fetchCompanyLive, formatCompanyLiveTable, openMeshTransport, probeMigrationCapabilityForMemberships, requireToken, } from "../lib/mesh/client.js";
-import { clearDefaultCompany, isDefaultCompanyDisabled, readDeviceConfig, recordMigrationCapabilitySnapshot, setRepairHeldWithDefault, setDefaultCompany, } from "../lib/work-context/config.js";
+import { clearDefaultCompany, effectiveUsageAttribution, isDefaultCompanyDisabled, readDeviceConfig, recordMigrationCapabilitySnapshot, setRepairHeldWithDefault, setDefaultCompany, setUsageAttribution, } from "../lib/work-context/config.js";
 import { ensureDefaultCompany } from "../lib/work-context/default-company.js";
-import { DefaultCompanyUnavailableError, } from "../lib/work-context/errors.js";
+import { personUidFromTokens } from "../lib/work-context/person-identity.js";
+import { DefaultCompanyUnavailableError, WorkContextError, } from "../lib/work-context/errors.js";
 import { isValidSessionId } from "../lib/mesh/live/session-identity.js";
 import { CLI_KIND_TO_SCHEMA, resolveEnqueueSessionId, } from "../lib/mesh/live/index.js";
 import { flushSessionEvents } from "../lib/mesh/live/flush.js";
@@ -1170,6 +1171,58 @@ async function runContextBackfillHeld(opts) {
             "the mesh daemon's held retry will re-attribute and post those events.");
     }
 }
+export function usageOptInExplainer(company) {
+    return `Opting in counts usage from HQ sessions started with no company toward ${company}. Sessions bound to a company count toward that company either way.`;
+}
+export function usageOptInQuestion(company) {
+    return `Count usage from HQ sessions with no company toward ${company}? Your company's owner and admins will see that usage, including tokens, models, and the repo and branch you worked in. [y/N] `;
+}
+export function usageCountedLine(company) {
+    return `Usage from HQ sessions with no company is counted toward ${company}.`;
+}
+export function usageNotCountedLine(company) {
+    return `Usage from HQ sessions with no company is not counted toward ${company}. To opt in, run: hq mesh context default set ${company} --count-usage`;
+}
+/** Only "y" or "yes" (any case, surrounding space ignored) is a yes. EOF (null) is no. */
+export function parseYesNoAnswer(answer) {
+    return answer !== null && /^y(es)?$/i.test(answer.trim());
+}
+/** A person can answer only when both stdin and stdout are a terminal. */
+export function isInteractiveTerminal(stdin = process.stdin, stdout = process.stdout) {
+    return stdin.isTTY === true && stdout.isTTY === true;
+}
+/** Ask one yes/no question. Resolves false on EOF or a closed input. */
+export async function askYesNo(question, io = {}) {
+    const rl = readline.createInterface({
+        input: io.input ?? process.stdin,
+        output: io.output ?? process.stderr,
+        terminal: false,
+    });
+    const closed = new Promise((resolve) => rl.once("close", () => resolve(null)));
+    try {
+        const answer = await Promise.race([
+            rl.question(question).catch(() => null),
+            closed,
+        ]);
+        return parseYesNoAnswer(answer);
+    }
+    finally {
+        rl.close();
+    }
+}
+/** The signed-in person's prs_ uid from the cached Cognito session, or null. */
+function currentPersonUid() {
+    try {
+        return personUidFromTokens(loadCachedTokens());
+    }
+    catch {
+        return null;
+    }
+}
+function usageAttributionJson(cfg, personUid) {
+    const effective = effectiveUsageAttribution(cfg, personUid);
+    return { countUsage: effective !== null, usageAttribution: effective };
+}
 async function runContextDefaultGet(opts) {
     const root = workContextHomeRoot();
     const cfg = readDeviceConfig({ root });
@@ -1189,6 +1242,7 @@ async function runContextDefaultGet(opts) {
             needsChoice: !current && !disabled && memberships.length > 1,
             memberships,
             repairHeldWithDefault: cfg.repairHeldWithDefault === true,
+            ...usageAttributionJson(cfg, currentPersonUid()),
         }, null, 2));
         return;
     }
@@ -1201,10 +1255,20 @@ async function runContextDefaultGet(opts) {
         return;
     }
     console.log(`Default company: ${current.slug}${current.uid ? ` (${current.uid})` : ""} enabled=${current.enabled} source=${source}`);
+    console.log(effectiveUsageAttribution(cfg, currentPersonUid())
+        ? usageCountedLine(current.slug)
+        : usageNotCountedLine(current.slug));
 }
-async function runContextDefaultSet(slug, opts) {
+async function runContextDefaultSet(slug, opts, promptDeps = {}) {
     const root = workContextHomeRoot();
     void opts.company; // retained for CLI compatibility
+    const usageChoice = opts.countUsage === true
+        ? "opt-in"
+        : opts.countUsage === false
+            ? "opt-out"
+            : "keep-if-same";
+    const personUid = currentPersonUid();
+    const priorOptIn = effectiveUsageAttribution(readDeviceConfig({ root }), personUid);
     let token;
     try {
         token = await requireToken();
@@ -1244,6 +1308,8 @@ async function runContextDefaultSet(slug, opts) {
         const cfg = await setDefaultCompany(slug, {
             root,
             migrationCapability,
+            usageAttribution: usageChoice,
+            personUid,
             validateMembership: async (candidate) => {
                 if (!token) {
                     throw new DefaultCompanyUnavailableError(`Cannot verify membership for company "${candidate}" (no Cognito session; offline or not logged in)`);
@@ -1261,19 +1327,55 @@ async function runContextDefaultSet(slug, opts) {
                 return { uid: membership.companyUid };
             },
         });
-        const configured = opts.repairHeldWithDefault
+        let configured = opts.repairHeldWithDefault
             ? setRepairHeldWithDefault(true, { root })
             : cfg;
+        const stored = configured.defaultCompany;
+        const company = stored?.slug ?? slug;
         if (opts.json) {
-            console.log(JSON.stringify({ ok: true, config: configured, migrationWarning }, null, 2));
+            // Machine output never prompts; the opt-in changes only with a flag.
+            console.log(JSON.stringify({
+                ok: true,
+                config: configured,
+                migrationWarning,
+                ...usageAttributionJson(configured, personUid),
+            }, null, 2));
             return;
         }
-        const stored = configured.defaultCompany;
-        console.log(`Default company set to ${stored?.slug ?? slug}${stored?.uid ? ` (${stored.uid})` : ""}`);
+        console.log(`Default company set to ${company}${stored?.uid ? ` (${stored.uid})` : ""}`);
+        if (priorOptIn && priorOptIn.companyUid !== stored?.uid) {
+            console.log("Usage is no longer counted toward the previous default company.");
+        }
+        const interactive = (promptDeps.isInteractive ??
+            (() => isInteractiveTerminal()))();
+        if (usageChoice === "keep-if-same" &&
+            interactive &&
+            personUid &&
+            !effectiveUsageAttribution(configured, personUid) &&
+            stored?.uid?.startsWith("cmp_")) {
+            console.error(usageOptInExplainer(company));
+            let yes = false;
+            try {
+                yes = await (promptDeps.confirm ?? askYesNo)(usageOptInQuestion(company));
+            }
+            catch {
+                yes = false;
+            }
+            if (yes)
+                configured = setUsageAttribution({ companyUid: stored.uid, personUid }, { root });
+        }
+        console.log(effectiveUsageAttribution(configured, personUid)
+            ? usageCountedLine(company)
+            : usageNotCountedLine(company));
         if (migrationWarning)
             console.error(chalk.yellow(migrationWarning));
     }
     catch (err) {
+        if (err instanceof WorkContextError && err.code === "UsageAttributionUnavailable") {
+            console.error(chalk.red(`${err.code}: ${err.message}`));
+            process.exitCode = 1;
+            return;
+        }
         if (err instanceof DefaultCompanyUnavailableError) {
             console.error(chalk.red(`${err.code}: ${err.message}`));
             process.exitCode = 1;
@@ -1396,12 +1498,16 @@ export async function runContextCorrect(opts, deps = {}) {
 }
 async function runContextDefaultClear(opts) {
     const root = workContextHomeRoot();
+    const hadOptIn = readDeviceConfig({ root }).usageAttribution !== undefined;
     const cfg = clearDefaultCompany({ root });
     if (opts.json) {
-        console.log(JSON.stringify({ ok: true, config: cfg }, null, 2));
+        console.log(JSON.stringify({ ok: true, config: cfg, ...usageAttributionJson(cfg, currentPersonUid()) }, null, 2));
         return;
     }
     console.log("Default company cleared.");
+    if (hadOptIn) {
+        console.log("Usage from HQ sessions with no company is no longer counted toward any company.");
+    }
 }
 async function runContextRequeue(opts) {
     const root = workContextHomeRoot();
@@ -1854,7 +1960,7 @@ function addSharedFlags(cmd) {
         .option("--thread-id <id>", "Explicit work thread id")
         .option("--json", "Print machine-readable JSON");
 }
-export function registerMeshCommand(program) {
+export function registerMeshCommand(program, deps = {}) {
     const mesh = program
         .command("mesh")
         .description("Work mesh — register project work, report progress, and warm ~/.hq/work-mesh/cache");
@@ -2030,7 +2136,7 @@ export function registerMeshCommand(program) {
         .description("Manage the device-local default company preference");
     def
         .command("get")
-        .description("Show the device default company (never activeCompany)")
+        .description("Show the device default company (never activeCompany) and whether usage is counted toward it")
         .option("--json", "Print machine-readable JSON")
         .action((opts) => wrap(() => runContextDefaultGet(opts))());
     def
@@ -2039,12 +2145,17 @@ export function registerMeshCommand(program) {
         .argument("<slug>", "Company slug")
         .option("--allow-without-migration", "Deprecated compatibility no-op; selected-company membership is always verified")
         .option("--repair-held-with-default", "Persist opt-in for lower-confidence historical held-session repair")
+        .option("--count-usage", "Count usage from HQ sessions with no company toward this company (its owner and admins can see it)")
+        .option("--no-count-usage", "Do not count usage from HQ sessions with no company toward this company")
         .option("--company <slug|uid>", "Deprecated no-op; the selected company is verified directly")
         .option("--json", "Print machine-readable JSON")
-        .action((slug, opts) => wrap(() => runContextDefaultSet(slug, opts))());
+        .addHelpText("after", "\nWith neither --count-usage nor --no-count-usage, an interactive terminal asks (default No);\n" +
+        "otherwise an existing opt-in is kept only when it is for the same company.\n" +
+        "Changing to a different company always stops counting usage toward the old one.")
+        .action((slug, opts) => wrap(() => runContextDefaultSet(slug, opts, deps.defaultCompanyPrompt))());
     def
         .command("clear")
-        .description("Clear the device default company")
+        .description("Clear the device default company and any opt-in to count usage toward it")
         .option("--json", "Print machine-readable JSON")
         .action((opts) => wrap(() => runContextDefaultClear(opts))());
     context

package/dist/lib/agent-kit/mcp/tools.js

@@ -237,7 +237,7 @@ export function buildAgentMcpTools(clients) {
                     const token = await clients.getToken();
                     const res = await clients.apiJson(token, `/v1/notify/channels/${encodeURIComponent(to)}/messages`, {
                         method: "POST",
-                        body: { body: message },
+                        body: { body: message, ...(audience ? { audience } : {}) },
                     });
                     if (res.status < 200 || res.status >= 300) {
                         return errorResult(`Channel send failed (${res.status}): ${describeError(res.body)}`);

package/dist/lib/bot/api.d.ts

@@ -239,6 +239,7 @@ export declare class BotApi {
         channelId: string;
         body: string;
         rootEventId?: string;
+        audience?: "human" | "agent" | "both";
     }): Promise<{
         eventId?: string;
         createdAt?: string;

package/dist/lib/bot/api.js

@@ -195,6 +195,8 @@ export class BotApi {
         const payload = { body: input.body };
         if (input.rootEventId)
             payload.rootEventId = input.rootEventId;
+        if (input.audience)
+            payload.audience = input.audience;
         const { body } = await this.call(`/v1/notify/channels/${encodeURIComponent(input.channelId)}/messages`, { method: "POST", body: payload });
         return body;
     }