@primitive.ai/prim 0.1.0-alpha.94 → 0.1.0-alpha.97

package/dist/index.js

@@ -19,24 +19,25 @@ import {
   resolveRepositoryBinding,
   uninstallGitHookAtPath,
   uninstallProjectGitHook
-} from "./chunk-WUXFLE7X.js";
-import {
-  POST_COMMIT_GRACE_MS,
-  clearHooksWired,
-  inspectPostCommitFiring,
-  recordHooksWired
-} from "./chunk-FXF4JWK2.js";
+} from "./chunk-7KABYYWG.js";
 import {
   requireDurableIngestAcknowledgement
-} from "./chunk-TYAHC25F.js";
+} from "./chunk-2MBV7ZMV.js";
 import {
   checkAffectedDecisions,
   daemonOrDirectGet,
   formatDecisionsWarning
-} from "./chunk-UKUAAAXE.js";
+} from "./chunk-27ADT6FQ.js";
 import {
   fetchFeedbackCapability
-} from "./chunk-OH3EZXYX.js";
+} from "./chunk-UO2U6IKF.js";
+import {
+  POST_COMMIT_GRACE_MS,
+  clearHooksWired,
+  inspectPostCommitFiring,
+  lastConversationCaptured,
+  recordHooksWired
+} from "./chunk-XEDJ5N3M.js";
 import {
   isUnattended,
   unattendedEnv
@@ -55,7 +56,7 @@ import {
   rotationIdentity,
   sweepOrphanedDrainProgress,
   writeDrainCheckpoint
-} from "./chunk-DXJQR4QI.js";
+} from "./chunk-4GHANPWQ.js";
 import {
   MS_PER_SECOND,
   deliveryBacklogState,
@@ -64,13 +65,12 @@ import {
   formatStatusline,
   formatTeammates,
   repositoryBindingDiagnosticLabel
-} from "./chunk-ZU563PQI.js";
+} from "./chunk-FBPZ4YUD.js";
 import {
   bold,
   boundedHealthError,
   color,
   colorForArea,
-  decisionIngestionStatus,
   dim,
   fetchAndCacheCollectScope,
   isCliErrorResponse,
@@ -83,14 +83,8 @@ import {
   isGitHubInstallIntentStartResponse,
   isGitHubInstallIntentStatusResponse,
   isMoveIngestRequest,
-  isRepoActiveForCapture,
-  isValidRepoSyncId,
-  repoActiveFlag,
-  repoSyncId,
-  repositoryBindingState,
-  setRepoActive,
   stripAnsi
-} from "./chunk-DSWT6BCC.js";
+} from "./chunk-ZYK3TBEW.js";
 import {
   CliManagementResponseError,
   HttpError,
@@ -107,7 +101,7 @@ import {
   setStoredToken,
   stripControlChars,
   terminalSafeLine
-} from "./chunk-G2VMA2QO.js";
+} from "./chunk-LY6NJ7KL.js";
 import {
   MANAGED_GIT_HOOK_NAMES,
   assertOwnedHookRuntime,
@@ -139,16 +133,24 @@ import {
   stableNodePath,
   stageHookRuntime,
   stripCommand
-} from "./chunk-AXQQMX2U.js";
+} from "./chunk-Y5W4TZM7.js";
 import {
   canonicalGitRoot,
   canonicalRepositoryPath,
-  gitToplevel
-} from "./chunk-H4UNYFUC.js";
+  decisionIngestionStatus,
+  gitToplevel,
+  isRepoActiveForCapture,
+  isValidRepoSyncId,
+  mainWorktreeRoot,
+  repoActiveFlag,
+  repoSyncId,
+  repositoryBindingState,
+  setRepoActive
+} from "./chunk-DHOQGHKQ.js";
 import {
   daemonIsLive,
   daemonRequest
-} from "./chunk-OTHKG76J.js";
+} from "./chunk-35FMRWJH.js";
 import {
   REFRESH_TOKEN_PATH,
   TOKEN_FILE_PATH,
@@ -163,7 +165,7 @@ import {
   syncDirectory,
   withFileLock,
   withFileLockSync
-} from "./chunk-2GP5UFV7.js";
+} from "./chunk-DWRSEC34.js";
 
 // src/index.ts
 import { readFileSync as readFileSync10 } from "fs";
@@ -2221,22 +2223,32 @@ function performStatus3() {
   };
   return { user: statusFor(USER_SCOPE_PATH), project: statusFor(projectScopePath()) };
 }
+function uncoveredWorktreeHooks(status) {
+  if (status.user.present || status.project.present) return null;
+  const main = mainWorktreeRoot();
+  if (main === null) return null;
+  const path = join2(main, ".codex", "hooks.json");
+  return hasAnyHookRegistration(readSettings(path)) ? path : null;
+}
+function uncoveredWorktreeAdvice(path) {
+  return `prim Codex hooks in ${path} don't load in this worktree \u2014 run \`prim codex install\`, then \`prim codex uninstall --scope project\` in that checkout`;
+}
 function resolveScope(input) {
-  if (input === void 0 || input === "project") {
-    return "project";
-  }
-  if (input === "user") {
+  if (input === void 0 || input === "user") {
     return "user";
   }
+  if (input === "project") {
+    return "project";
+  }
   console.error(`[prim] unknown --scope "${input}" (expected: user or project)`);
   process.exit(1);
 }
 var TRUST_NOTICE = "[prim] Codex requires hook trust: run `/hooks` in Codex to review and trust these hooks (or start Codex with --dangerously-bypass-hook-trust). Until trusted, the hooks will not fire.";
 function registerCodexCommands(program2) {
   const codex = program2.command("codex").description("Manage the prim Codex integration (capture, gate, ingest, presence)");
-  codex.command("install").description("Register the prim hooks in Codex's hooks.json (project scope by default)").option(
+  codex.command("install").description("Register the prim hooks in Codex's hooks.json (user scope by default)").option(
     "--scope <scope>",
-    "project (default, the repo's .codex/hooks.json) or user (~/.codex/hooks.json)"
+    "user (default, ~/.codex/hooks.json) or project (this checkout's .codex/hooks.json)"
   ).option("--force", "Replace any drifted prim hook entries").action((opts) => {
     const scope = resolveScope(opts.scope);
     const result = performInstall(scope, opts.force ?? false);
@@ -2250,7 +2262,7 @@ function registerCodexCommands(program2) {
   });
   codex.command("uninstall").description("Remove all prim hooks from Codex's hooks.json").option(
     "--scope <scope>",
-    "project (default, the repo's .codex/hooks.json) or user (~/.codex/hooks.json)"
+    "user (default, ~/.codex/hooks.json) or project (this checkout's .codex/hooks.json)"
   ).action((opts) => {
     const scope = resolveScope(opts.scope);
     const result = performUninstall(scope);
@@ -2267,6 +2279,9 @@ function registerCodexCommands(program2) {
     const line = (label, s) => `[prim] ${label}: gate ${mark(s.gate)} \xB7 capture ${mark(s.capture)} (${s.path})`;
     console.error(`${line("user", result.user)}
 ${line("project", result.project)}`);
+    const uncovered = uncoveredWorktreeHooks(result);
+    if (uncovered !== null)
+      console.error(`[prim] warning: ${uncoveredWorktreeAdvice(uncovered)}`);
     console.log(JSON.stringify(result, null, JSON_INDENT));
   });
 }
@@ -4879,8 +4894,6 @@ var DECISION_NOT_FOUND_MESSAGE = "Decision not found";
 var REPLACEMENT_NOT_FOUND_MESSAGE = "Replacement decision not found";
 var SELF_REPLACEMENT_MESSAGE = "A decision cannot supersede itself";
 var OLD_SERVER_NOT_FOUND_MESSAGE = "Not found";
-var FEATURE_DISABLED_MESSAGE = "feature_disabled";
-var FEATURE_CHECK_UNAVAILABLE_MESSAGE = "feature_check_unavailable";
 var STAGE_NAME = "(?:draft|provisional|adopted|superseded|abandoned)";
 var IMMUTABLE_MESSAGE = new RegExp(
   `^An ${STAGE_NAME} decision is immutable \u2014 supersede it to change it$`,
@@ -4957,12 +4970,6 @@ function classifyHttpError2(error) {
   if (error.status === 403 && message === NOT_AUTHOR_MESSAGE) {
     return failure2("not_author", DECISION_LIFECYCLE_EXIT.rejected, error.status);
   }
-  if (error.status === 403 && message === FEATURE_DISABLED_MESSAGE) {
-    return failure2("feature_disabled", DECISION_LIFECYCLE_EXIT.rejected, error.status);
-  }
-  if (error.status === 503 && message === FEATURE_CHECK_UNAVAILABLE_MESSAGE) {
-    return failure2("feature_check_unavailable", DECISION_LIFECYCLE_EXIT.server, error.status);
-  }
   if (error.status === 409 && message === AMBIGUOUS_MESSAGE) {
     return failure2("ambiguous_identifier", DECISION_LIFECYCLE_EXIT.rejected, error.status);
   }
@@ -5022,10 +5029,6 @@ function formatFailureHuman(operation, result) {
       return `[prim] ${verb} rejected: Decision not found.`;
     case "replacement_not_found":
       return "[prim] supersede rejected: replacement Decision not found.";
-    case "feature_disabled":
-      return `[prim] ${verb} rejected: manual lifecycle actions are not enabled for this account.`;
-    case "feature_check_unavailable":
-      return `[prim] ${verb} unavailable: the server could not verify feature availability; retry shortly.`;
     case "unsupported_server":
       return `[prim] ${verb} unavailable: this Primitive server does not support this Decision lifecycle operation; upgrade the server before retrying.`;
     case "rejected":
@@ -7748,9 +7751,16 @@ function classifyClaudeHooks(statuses) {
   }
   return { name: "feedback-hooks", status: "ok", detail: "complete Claude lifecycle ready" };
 }
-function classifyCodexHooks(statuses) {
+function classifyCodexHooks(statuses, uncoveredWorktree = null, capturedAt) {
   const installed = statuses.filter((status) => status.present);
   if (installed.length === 0) {
+    if (uncoveredWorktree !== null) {
+      return {
+        name: "codex-hooks",
+        status: "warn",
+        detail: uncoveredWorktreeAdvice(uncoveredWorktree)
+      };
+    }
     return { name: "codex-hooks", status: "ok", detail: "not installed" };
   }
   if (installed.some((status) => !status.complete)) {
@@ -7762,8 +7772,8 @@ function classifyCodexHooks(statuses) {
   }
   return {
     name: "codex-hooks",
-    status: "warn",
-    detail: "installed; Codex trust is not machine-readable \u2014 verify with `/hooks`"
+    status: capturedAt === void 0 ? "warn" : "ok",
+    detail: capturedAt === void 0 ? "installed; conversation capture unverified; Codex trust unknown \u2014 verify with `/hooks`" : `installed; conversation capture observed ${new Date(capturedAt).toISOString()}; current trust unknown`
   };
 }
 function classifyCursorHooks(statuses) {
@@ -7815,7 +7825,13 @@ function checkAgentHooks() {
   const checks = [];
   try {
     const status = performStatus3();
-    checks.push(classifyCodexHooks([status.project, status.user]));
+    checks.push(
+      classifyCodexHooks(
+        [status.project, status.user],
+        uncoveredWorktreeHooks(status),
+        lastConversationCaptured(process.cwd(), "codex")
+      )
+    );
   } catch (error) {
     const detail = boundedHealthError(error instanceof Error ? error.message : String(error));
     checks.push({
@@ -7967,7 +7983,7 @@ function parseMovesStatus(value) {
   }
   const status = value;
   const nullableNumber = (candidate) => candidate === null || typeof candidate === "number" && Number.isFinite(candidate);
-  if (status.captureState !== "enabled" && status.captureState !== "disabled" || !nullableNumber(status.latestIngestAt) || !nullableNumber(status.latestClassificationAt) || !nullableNumber(status.highWaterMark) || typeof status.pendingSessionCount !== "number" || !Number.isInteger(status.pendingSessionCount) || status.pendingSessionCount < 0 || typeof status.sampled !== "boolean") {
+  if (status.captureState !== "enabled" || !nullableNumber(status.latestIngestAt) || !nullableNumber(status.latestClassificationAt) || !nullableNumber(status.highWaterMark) || typeof status.pendingSessionCount !== "number" || !Number.isInteger(status.pendingSessionCount) || status.pendingSessionCount < 0 || typeof status.sampled !== "boolean") {
     throw new Error("moves status returned an invalid response");
   }
   if (status.oldestPendingAt !== void 0 && !nullableNumber(status.oldestPendingAt) || status.oldestPendingAgeMs !== void 0 && !nullableNumber(status.oldestPendingAgeMs) || typeof status.oldestPendingAgeMs === "number" && status.oldestPendingAgeMs < 0 || status.pendingCommitCorrelationCount !== void 0 && (!Number.isInteger(status.pendingCommitCorrelationCount) || status.pendingCommitCorrelationCount < 0)) {
@@ -7976,10 +7992,10 @@ function parseMovesStatus(value) {
   return status;
 }
 function classifyMovesStatus(status) {
-  const capture = status.captureState === "enabled" ? { name: "capture", status: "ok", detail: "enabled; ingest endpoint durable" } : {
+  const capture = {
     name: "capture",
-    status: "fail",
-    detail: "disabled for the current organization; local Moves are retained"
+    status: "ok",
+    detail: "enabled; ingest endpoint durable"
   };
   const correlation = status.pendingCommitCorrelationCount === void 0 ? void 0 : status.pendingCommitCorrelationCount > 0 ? {
     name: "commit-correlation",
@@ -8868,7 +8884,7 @@ var SESSION_LABELS = {
 };
 function planSetupSteps(opts) {
   const scopeArgs = opts.scope === "user" ? ["--scope", "user"] : [];
-  const sessionArgs = opts.agent === "hermes" ? [opts.agent, "install"] : [opts.agent, "install", ...scopeArgs];
+  const sessionArgs = opts.agent === "hermes" ? [opts.agent, "install"] : [opts.agent, "install", "--scope", opts.scope];
   const steps = [
     {
       key: "session",
@@ -9652,14 +9668,17 @@ function startDriftHeal(options) {
   if (!runsConfigRoot()) return false;
   const primEntry = options.primEntry === void 0 ? binFile("prim") : options.primEntry;
   if (!primEntry) return false;
-  const attempt = {
-    attemptedAt: (options.nowMs ?? Date.now)(),
-    fromVersion: launcher.runtimeVersion,
-    toVersion
-  };
   const claimed = withFileLockSync(
     daemonDriftHealClaimPath(paths),
-    () => claimAttempt(daemonDriftHealMarkerPath(paths), attempt),
+    () => (
+      // Sample after acquiring the claim: an earlier timestamp from a delayed
+      // command must not make the previous winner look like a clock rollback.
+      claimAttempt(daemonDriftHealMarkerPath(paths), {
+        attemptedAt: (options.nowMs ?? Date.now)(),
+        fromVersion: launcher.runtimeVersion,
+        toVersion
+      })
+    ),
     { timeoutMs: 0, sleep: claimHeld }
   );
   if (!claimed) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitive.ai/prim",
-  "version": "0.1.0-alpha.94",
+  "version": "0.1.0-alpha.97",
   "description": "CLI for Primitive's decision graph — passive decision capture, conflict gate, and team presence",
   "type": "module",
   "license": "MIT",