@indigoai-us/hq-cli 5.286.0 → 5.288.0

package/dist/lib/checkpoint-ontology/plan.js

@@ -25,99 +25,12 @@ export const ONTOLOGY_FLAG = "checkpoint.ontology";
  * 6.18.7 or later; see ./sync-client.ts.
  */
 export const ONTOLOGY_SYNC_GATED_FLAG = "checkpoint.ontology.sync-gated";
-export const COMPANY_BRIEF_FLAG = "checkpoint.ontology.company-brief";
-/**
- * Applies only when the payload's sibling backend is grok. On gold-v2, Claude
- * with stripped inputs lost 0.139 recall; Grok with stripped inputs gained
- * precision without losing recall. A machine that falls back from grok keeps
- * the annotated inputs.
- */
-export const IGNORE_ANNOTATIONS_FLAG = "checkpoint.ontology.ignore-annotations";
-/**
- * With `--backend auto`, `hq core checkpoint` tries grok first for this
- * company. Read here, in the detached sibling, and recorded in the company's
- * state directory, so the foreground checkpoint makes no network call.
- */
-export const GROK_BACKEND_FLAG = "checkpoint.ontology.grok-backend";
 /**
  * Several writers in one company vault (design section 20): record written
  * entity bytes in the outbox, merge back set-aside versions, and report
  * duplicate entities.
  */
 export const MULTI_WRITER_FLAG = "checkpoint.ontology.multi-writer";
-/**
- * A candidate that links to an existing entity adds no aliases to it; the plan
- * carries `link_aliases: false` and apply honours it. CO-42: most aliases
- * written through links on the CO-41 runs were other things the text named
- * next to the entity (`Publisher` on indigo, `Stripe Connect` on Stripe), and
- * entity-hints multiplied them (22 aliases on a flag-off run, 45 and 125 on two
- * hinted runs).
- */
-export const NO_LINK_ALIASES_FLAG = "checkpoint.ontology.no-link-aliases";
-/**
- * A person the input and the company's entities give only a first name for is
- * named by that first name instead of being left out. CO-44: on the CO-41
- * grok-4.6 runs the model read "not a first name alone" as "skip them", and
- * dropped people such as Amir and Sebastian, whose own entities carry only a
- * first name. People were 24 of the 138 missed gold entities over three runs.
- * The plan carries `first_name_people: true`, and apply then defers a one-word
- * person whose word starts an existing person's fuller name or alias, since
- * the model cannot see that `John Smith` already exists.
- */
-export const FIRST_NAME_PEOPLE_FLAG = "checkpoint.ontology.first-name-people";
-/**
- * A knowledge input does not link to a concept entity whose canonical name is
- * also the canonical name of an entity of another type (`concept/hq-secrets`
- * beside `project/hq-secrets`). The plan carries
- * `skip_ambiguous_concept_links: true`, and apply rejects the link as
- * `ambiguous_type`. CO-46: 34 of the 73 false positives on the knowledge
- * fixtures were such concept links; skipping them raised precision from 0.733
- * to 0.803 and cost recall 0.023 on a replay of six runs.
- */
-export const SKIP_AMBIGUOUS_CONCEPT_LINKS_FLAG = "checkpoint.ontology.skip-ambiguous-concept-links";
-/**
- * A knowledge link to the weaker of two entities that share a canonical name
- * across types is redirected to the sibling other entity files link to
- * (`project/build-your-own-agi` beside `concept/build-your-own-agi`, or
- * `project/hq-core 2` beside `project/hq-core` when a concept also holds the
- * name). The plan carries `dominant_sibling_link: true`, and apply reports
- * the move in `dominant_sibling_redirects` without writing the entity files.
- * CO-60: a replay of six runs raised knowledge precision from 0.725 to 0.754
- * and recall from 0.784 to 0.816, and never changed a create.
- */
-export const DOMINANT_SIBLING_LINK_FLAG = "checkpoint.ontology.dominant-sibling-link";
-/**
- * A knowledge link to a non-person entity that 50 or more
- * other entity files link to is rejected as `hub_under_mentioned` when the
- * input names it fewer than 2 times (whole word, any case, canonical name
- * only). The plan carries `hub_mention_floor: true`. CO-62: a replay of six
- * runs raised knowledge precision from 0.753 to 0.781 at the same recall.
- */
-export const HUB_MENTION_FLOOR_FLAG = "checkpoint.ontology.hub-mention-floor";
-/**
- * A knowledge concept candidate whose name is an alias of more than one
- * entity, and which apply would defer as `ambiguous_alias`, links instead to
- * the one project whose canonical name it is (`HQ` typed as a concept beside
- * `project/HQ` and several concepts aliased `HQ`). The plan carries
- * `concept_project_link: true`. CO-51: over six runs of the shipping config
- * the model typed HQ as a concept in some runs and not others, and the
- * deferral lost 61 gold links; a replay of this rule raised recall from 0.639
- * to 0.709 at precision 0.747 to 0.731 (61 of the 63 added links are HQ).
- */
-export const CONCEPT_PROJECT_LINK_FLAG = "checkpoint.ontology.concept-project-link";
-/**
- * A knowledge link to the company's own company entity, or a
- * concept-project-link redirect, needs evidence that names the entity as a
- * word: the candidate name or one of its aliases, not inside a path, domain,
- * handle, tag or identifier (`indigoai-us/hq`, `getindigo.ai`,
- * `scope: company:indigo`). The plan carries `named_evidence: true`, and apply
- * rejects such a link as `unnamed_in_evidence`. CO-57: on the six CO-52 runs,
- * 67 of 143 false positives were links to company/indigo and project/HQ, most
- * on evidence that only held the name inside an identifier; a replay of this
- * rule raised precision on the concept-project-link arm from 0.705 to 0.750
- * and lost no gold link.
- */
-export const NAMED_EVIDENCE_FLAG = "checkpoint.ontology.named-evidence";
 /**
  * CO-59: consume the files touched by company checkpoints that were queued
  * behind a busy sibling (see queued-touches.ts). On, the plan adds the
@@ -139,7 +52,6 @@ export const BUDGET = {
     chunkTokens: 12_000,
 };
 export const READ_PATH_INSTRUCTION = "When an input has read_path, read that file (relative to the run directory) instead of path, with the same line range. It is the same text with an older annotator's entity lists and entity links removed.";
-export const PERSON_NAME_INSTRUCTION = "Name a person by the full name the input or the company's entities give, not a first name alone.";
 export const FIRST_NAME_PEOPLE_INSTRUCTION = "Name a person by the full name the input or the company's entities give. When neither gives more than a first name, name the person by that first name; do not leave them out.";
 const CANDIDATE_INSTRUCTIONS = [
     `Write ${CANDIDATES_FILE} in the run directory as {"schema":"${CANDIDATES_SCHEMA}","candidates":[...]} and nothing else.`,
@@ -317,17 +229,18 @@ export async function planOntologyRun(options) {
         fs.rmSync(backendPreferencePath(hqRoot, company), { force: true });
         return { status: "skipped", reason: syncClient && !syncClient.ok ? syncClient.reason : "flag off" };
     }
-    const briefOn = await options.readFlag(COMPANY_BRIEF_FLAG, company);
-    const ignoreAnnotations = (await options.readFlag(IGNORE_ANNOTATIONS_FLAG, company)) && payload.backend === "grok";
-    recordBackendPreference(hqRoot, company, await options.readFlag(GROK_BACKEND_FLAG, company));
+    // Was checkpoint.ontology.ignore-annotations, always on since CO-68.
+    // Applies only when the payload's sibling backend is grok. On gold-v2, Claude
+    // with stripped inputs lost 0.139 recall; Grok with stripped inputs gained
+    // precision without losing recall. A machine that falls back from grok keeps
+    // the annotated inputs.
+    const ignoreAnnotations = payload.backend === "grok";
+    // Was checkpoint.ontology.grok-backend, always on since CO-68.
+    // With `--backend auto`, `hq core checkpoint` tries grok first for this
+    // company. Read here, in the detached sibling, and recorded in the company's
+    // state directory, so the foreground checkpoint makes no network call.
+    recordBackendPreference(hqRoot, company, true);
     const multiWriterOn = await options.readFlag(MULTI_WRITER_FLAG, company);
-    const noLinkAliases = await options.readFlag(NO_LINK_ALIASES_FLAG, company);
-    const firstNamePeople = await options.readFlag(FIRST_NAME_PEOPLE_FLAG, company);
-    const skipAmbiguousConceptLinks = await options.readFlag(SKIP_AMBIGUOUS_CONCEPT_LINKS_FLAG, company);
-    const dominantSiblingLink = await options.readFlag(DOMINANT_SIBLING_LINK_FLAG, company);
-    const hubMentionFloor = await options.readFlag(HUB_MENTION_FLOOR_FLAG, company);
-    const conceptProjectLink = await options.readFlag(CONCEPT_PROJECT_LINK_FLAG, company);
-    const namedEvidence = await options.readFlag(NAMED_EVIDENCE_FLAG, company);
     const queuedTouchesOn = borrowed || (await options.readFlag(QUEUED_TOUCHES_FLAG, company));
     // A borrowed company's run belongs to another session: its own files and
     // session text are not this company's input.
@@ -343,7 +256,8 @@ export async function planOntologyRun(options) {
     // a plan still merges set-aside versions and records the brief; the brief
     // follows merge-back so its counts include merged entities.
     const multiWriter = multiWriterOn ? startMultiWriterRun(hqRoot, company, options.now ?? new Date()) : undefined;
-    const companyBrief = briefOn ? writeCompanyBrief(hqRoot, company, options.now ?? new Date()) : undefined;
+    // Was checkpoint.ontology.company-brief, always on since CO-68.
+    const companyBrief = writeCompanyBrief(hqRoot, company, options.now ?? new Date());
     const pending = Object.entries(ledger.entries)
         .filter(([, entry]) => entry.state === "pending" && entry.reason === "session-touched")
         .sort(([aRel, a], [bRel, b]) => a.mtime_ms - b.mtime_ms || aRel.localeCompare(bRel));
@@ -446,13 +360,72 @@ export async function planOntologyRun(options) {
             }
             : {}),
         ...(multiWriter ? { multi_writer: multiWriter } : {}),
-        ...(noLinkAliases ? { link_aliases: false } : {}),
-        ...(firstNamePeople ? { first_name_people: true } : {}),
-        ...(skipAmbiguousConceptLinks ? { skip_ambiguous_concept_links: true } : {}),
-        ...(dominantSiblingLink ? { dominant_sibling_link: true } : {}),
-        ...(hubMentionFloor ? { hub_mention_floor: true } : {}),
-        ...(conceptProjectLink ? { concept_project_link: true } : {}),
-        ...(namedEvidence ? { named_evidence: true } : {}),
+        // Was checkpoint.ontology.no-link-aliases, always on since CO-68.
+        // A candidate that links to an existing entity adds no aliases to it; the plan
+        // carries `link_aliases: false` and apply honours it. CO-42: most aliases
+        // written through links on the CO-41 runs were other things the text named
+        // next to the entity (`Publisher` on indigo, `Stripe Connect` on Stripe), and
+        // entity-hints multiplied them (22 aliases on a flag-off run, 45 and 125 on two
+        // hinted runs).
+        link_aliases: false,
+        // Was checkpoint.ontology.first-name-people, always on since CO-68.
+        // A person the input and the company's entities give only a first name for is
+        // named by that first name instead of being left out. CO-44: on the CO-41
+        // grok-4.6 runs the model read "not a first name alone" as "skip them", and
+        // dropped people such as Amir and Sebastian, whose own entities carry only a
+        // first name. People were 24 of the 138 missed gold entities over three runs.
+        // The plan carries `first_name_people: true`, and apply then defers a one-word
+        // person whose word starts an existing person's fuller name or alias, since
+        // the model cannot see that `John Smith` already exists.
+        first_name_people: true,
+        // Was checkpoint.ontology.skip-ambiguous-concept-links, always on since CO-68.
+        // A knowledge input does not link to a concept entity whose canonical name is
+        // also the canonical name of an entity of another type (`concept/hq-secrets`
+        // beside `project/hq-secrets`). The plan carries
+        // `skip_ambiguous_concept_links: true`, and apply rejects the link as
+        // `ambiguous_type`. CO-46: 34 of the 73 false positives on the knowledge
+        // fixtures were such concept links; skipping them raised precision from 0.733
+        // to 0.803 and cost recall 0.023 on a replay of six runs.
+        skip_ambiguous_concept_links: true,
+        // Was checkpoint.ontology.dominant-sibling-link, always on since CO-68.
+        // A knowledge link to the weaker of two entities that share a canonical name
+        // across types is redirected to the sibling other entity files link to
+        // (`project/build-your-own-agi` beside `concept/build-your-own-agi`, or
+        // `project/hq-core 2` beside `project/hq-core` when a concept also holds the
+        // name). The plan carries `dominant_sibling_link: true`, and apply reports
+        // the move in `dominant_sibling_redirects` without writing the entity files.
+        // CO-60: a replay of six runs raised knowledge precision from 0.725 to 0.754
+        // and recall from 0.784 to 0.816, and never changed a create.
+        dominant_sibling_link: true,
+        // Was checkpoint.ontology.hub-mention-floor, always on since CO-68.
+        // A knowledge link to a non-person entity that 50 or more
+        // other entity files link to is rejected as `hub_under_mentioned` when the
+        // input names it fewer than 2 times (whole word, any case, canonical name
+        // only). The plan carries `hub_mention_floor: true`. CO-62: a replay of six
+        // runs raised knowledge precision from 0.753 to 0.781 at the same recall.
+        hub_mention_floor: true,
+        // Was checkpoint.ontology.concept-project-link, always on since CO-68.
+        // A knowledge concept candidate whose name is an alias of more than one
+        // entity, and which apply would defer as `ambiguous_alias`, links instead to
+        // the one project whose canonical name it is (`HQ` typed as a concept beside
+        // `project/HQ` and several concepts aliased `HQ`). The plan carries
+        // `concept_project_link: true`. CO-51: over six runs of the shipping config
+        // the model typed HQ as a concept in some runs and not others, and the
+        // deferral lost 61 gold links; a replay of this rule raised recall from 0.639
+        // to 0.709 at precision 0.747 to 0.731 (61 of the 63 added links are HQ).
+        concept_project_link: true,
+        // Was checkpoint.ontology.named-evidence, always on since CO-68.
+        // A knowledge link to the company's own company entity, or a
+        // concept-project-link redirect, needs evidence that names the entity as a
+        // word: the candidate name or one of its aliases, not inside a path, domain,
+        // handle, tag or identifier (`indigoai-us/hq`, `getindigo.ai`,
+        // `scope: company:indigo`). The plan carries `named_evidence: true`, and apply
+        // rejects such a link as `unnamed_in_evidence`. CO-57: on the six CO-52 runs,
+        // 67 of 143 false positives were links to company/indigo and project/HQ, most
+        // on evidence that only held the name inside an identifier; a replay of this
+        // rule raised precision on the concept-project-link arm from 0.705 to 0.750
+        // and lost no gold link.
+        named_evidence: true,
         inputs,
         session_text: sessionText,
         pending_after_run: remaining,
@@ -466,7 +439,7 @@ export async function planOntologyRun(options) {
         instructions: [
             ...CANDIDATE_INSTRUCTIONS.slice(0, 3),
             ...(inputs.some((input) => input.read_path) ? [READ_PATH_INSTRUCTION] : []),
-            `${CANDIDATE_INSTRUCTIONS[3]} ${firstNamePeople ? FIRST_NAME_PEOPLE_INSTRUCTION : PERSON_NAME_INSTRUCTION}`,
+            `${CANDIDATE_INSTRUCTIONS[3]} ${FIRST_NAME_PEOPLE_INSTRUCTION}`,
             ...CANDIDATE_INSTRUCTIONS.slice(4),
         ],
     };

package/dist/lib/core-utils/sentry-report.js

@@ -44,9 +44,6 @@ const HOOK_TIMEOUT_EXCEEDED_TYPE = "hook_timeout_exceeded";
 const HOOK_LATE_FINISH_TYPE = "hook_late_finish";
 const HOOK_TIMEOUT_WARNING_METRIC = "hq.hook_timeout_warning";
 const HOOK_TIMEOUT_EXCEEDED_METRIC = "hq.hook_timeout_exceeded";
-const HOOK_TIMEOUT_EXCEEDED_FINGERPRINT = "hook-timeout-exceeded";
-const HOOK_TIMEOUT_WARNING_FINGERPRINT = "hook-timeout";
-const HOOK_TIMEOUT_MACHINE_WIDE_FINGERPRINT = "hq-hook-slow";
 const MAX_HOOK_SEQUENCE_ENTRIES = 20;
 const MAX_HOOK_TIMEOUT_DEBUG_PHASES = 24;
 const MAX_HOOK_TIMEOUT_DEBUG_MS = 86_400_000;
@@ -580,10 +577,9 @@ function hookTimeoutDebugContextTags(context) {
 }
 function safeSlowChild(metadata) {
     const value = metadata.slow_child;
-    if (typeof value !== "string" || value.length === 0)
+    if (typeof value !== "string" || !SAFE_HOOK_SCRIPT.test(value))
         return "other";
-    const script = basenameFromPath(value);
-    return KNOWN_HOOK_SCRIPTS.has(script) ? script : "other";
+    return value;
 }
 function isMachineWideHookSlowness(metadata) {
     const spawnMs = metadata.spawn_ms;
@@ -621,6 +617,7 @@ function hookTimeoutTags(event) {
     const loadAverage = parsedLoadAverage(metadata);
     const slowChildMs = metadata.slow_child_ms;
     return {
+        hook_timeout_kind: hookTimeoutKind(event),
         hook_event: hookEvent(metadata),
         hook_script: hookScript(metadata),
         elapsed_bucket: elapsedBucket(elapsedMs),
@@ -680,37 +677,13 @@ function scrubbedSentryEnvelope(event, overrides, additionalTags = {}) {
         ...sentryEnvelope(event, overrides, additionalTags),
     }, {});
 }
-/**
- * Keep timeout faults visible at warning level while grouping them by the
- * hook event and installation-independent script basename. A genuine
- * exceeded or late-finish payload gets its own stable condition group.
- */
+/** Keep all hook-timeout conditions together by script while retaining tags for triage. */
 function hookTimeoutExceededOverrides(event) {
-    const eventName = hookEvent(event.metadata);
     if (!isHookTimeoutEvent(event))
         return undefined;
-    const kind = hookTimeoutKind(event);
-    if (isMachineWideHookSlowness(event.metadata)) {
-        return {
-            level: "warning",
-            fingerprint: [
-                HOOK_TIMEOUT_MACHINE_WIDE_FINGERPRINT,
-                "machine-wide",
-                operatingSystemName(event.metadata),
-                eventName,
-                kind,
-            ],
-        };
-    }
-    if (kind === "warning") {
-        return {
-            level: "warning",
-            fingerprint: [HOOK_TIMEOUT_WARNING_FINGERPRINT, eventName, hookScript(event.metadata)],
-        };
-    }
     return {
         level: "warning",
-        fingerprint: [HOOK_TIMEOUT_EXCEEDED_FINGERPRINT, eventName, hookScript(event.metadata)],
+        fingerprint: ["hook-timeout", hookScript(event.metadata)],
     };
 }
 /**

package/dist/lib/core-utils/worktree-resume.d.ts

@@ -0,0 +1,18 @@
+/** Native TypeScript ports of the Wave 2 worktree and resume helpers. */
+export declare const WORKTREE_GC_ASSET = "core/scripts/worktree-gc.sh";
+export declare const CLEAN_HANDOFF_ASSET = "core/scripts/clean-worktree-reconcile-handoff.sh";
+export declare const RESUME_LOCK_ASSET = "core/scripts/resume-thread-lock.sh";
+export declare const VERIFY_DELIVERABLES_ASSET = "core/scripts/verify-story-deliverables.sh";
+export type CoreIo = {
+    stdout?: (value: string) => void;
+    stderr?: (value: string) => void;
+    env?: NodeJS.ProcessEnv;
+    cwd?: string;
+    now?: () => Date;
+};
+export declare function worktreeGcPathKey(value: string): string;
+export declare function runWorktreeGc(args: readonly string[], hqRoot: string, io?: CoreIo): number;
+export declare function runCleanWorktreeReconcileHandoff(args: readonly string[], io?: CoreIo): number;
+export declare function runResumeThreadLock(args: readonly string[], hqRoot: string, io?: CoreIo): number;
+export declare function runVerifyStoryDeliverables(args: readonly string[], hqRoot: string, io?: CoreIo): Promise<number>;
+//# sourceMappingURL=worktree-resume.d.ts.map