@primitive.ai/prim 0.1.0-alpha.28 → 0.1.0-alpha.30

package/dist/{chunk-JZGWQDM5.js → chunk-C4UYMR7X.js}

@@ -1,3 +1,7 @@
+import {
+  getSiteUrl
+} from "./chunk-26VA3ADF.js";
+
 // src/journal.ts
 import {
   appendFileSync,
@@ -10,9 +14,15 @@ import {
 import { homedir } from "os";
 import { dirname, join } from "path";
 var JOURNAL_DIR = join(homedir(), ".config", "prim", "moves");
-var LEGACY_JOURNAL_PATH = join(JOURNAL_DIR, "journal.ndjson");
 var UNBOUND_BUCKET = "_unbound";
 var JOURNAL_BASENAME = "journal.ndjson";
+function envSlug(apiUrl) {
+  const slug = apiUrl.replace(/^https?:\/\//, "").replace(/[^a-zA-Z0-9._-]/g, "_").replace(/^_+|_+$/g, "").toLowerCase();
+  return slug.length > 0 ? slug : "default";
+}
+function currentEnvDir() {
+  return join(JOURNAL_DIR, envSlug(getSiteUrl()));
+}
 var DIR_MODE = 448;
 var FILE_MODE = 384;
 var SAFE_BUCKET = /^[A-Za-z0-9_-]+$/;
@@ -27,7 +37,7 @@ function appendMoveToPath(path, move) {
 }
 function bucketDir(orgId) {
   const safe = orgId !== void 0 && SAFE_BUCKET.test(orgId) && !RESERVED_BUCKETS.has(orgId);
-  return join(JOURNAL_DIR, safe ? orgId : UNBOUND_BUCKET);
+  return join(currentEnvDir(), safe ? orgId : UNBOUND_BUCKET);
 }
 function journalPath(orgId) {
   return join(bucketDir(orgId), JOURNAL_BASENAME);
@@ -54,23 +64,63 @@ function readMovesFromPath(path) {
 }
 function listBuckets() {
   const out = [];
-  if (existsSync(LEGACY_JOURNAL_PATH)) {
-    out.push({ bucket: "_legacy", path: LEGACY_JOURNAL_PATH });
-  }
-  if (!existsSync(JOURNAL_DIR)) {
+  const envDir = currentEnvDir();
+  if (!existsSync(envDir)) {
     return out;
   }
-  for (const entry of readdirSync(JOURNAL_DIR, { withFileTypes: true })) {
+  for (const entry of readdirSync(envDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) {
       continue;
     }
-    const path = join(JOURNAL_DIR, entry.name, JOURNAL_BASENAME);
+    const path = join(envDir, entry.name, JOURNAL_BASENAME);
     if (existsSync(path)) {
       out.push({ bucket: entry.name, path });
     }
   }
   return out;
 }
+var FLUSHING_PREFIX = `${JOURNAL_BASENAME}.flushing.`;
+function parseFlushingPid(name) {
+  const segments = name.slice(FLUSHING_PREFIX.length).split(".");
+  const last = segments.length >= 2 ? segments[segments.length - 1] : void 0;
+  return last !== void 0 && /^[0-9]+$/.test(last) ? Number(last) : void 0;
+}
+function listFlushingInDir(dir, bucket) {
+  if (!existsSync(dir)) {
+    return [];
+  }
+  const out = [];
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    if (!entry.isFile() || !entry.name.startsWith(FLUSHING_PREFIX)) {
+      continue;
+    }
+    const path = join(dir, entry.name);
+    const stat = statSync(path);
+    const lineCount = readFileSync(path, "utf-8").split("\n").filter((l) => l.length > 0).length;
+    out.push({
+      bucket,
+      path,
+      pid: parseFlushingPid(entry.name),
+      sizeBytes: stat.size,
+      mtimeMs: stat.mtimeMs,
+      lineCount
+    });
+  }
+  return out;
+}
+function listFlushing() {
+  const envDir = currentEnvDir();
+  if (!existsSync(envDir)) {
+    return [];
+  }
+  const out = [];
+  for (const entry of readdirSync(envDir, { withFileTypes: true })) {
+    if (entry.isDirectory()) {
+      out.push(...listFlushingInDir(join(envDir, entry.name), entry.name));
+    }
+  }
+  return out;
+}
 function bucketStats() {
   return listBuckets().map(({ bucket, path }) => {
     const stat = statSync(path);
@@ -193,6 +243,7 @@ export {
   appendMove,
   readMovesFromPath,
   listBuckets,
+  listFlushing,
   bucketStats,
   SESSIONS_DIR,
   resolveOrg

package/dist/{chunk-E5UZXMZL.js → chunk-UWAJCF7P.js}

@@ -1,5 +1,6 @@
 import {
-  getClient
+  getClient,
+  getSiteUrl
 } from "./chunk-26VA3ADF.js";
 import {
   daemonRequest
@@ -9,9 +10,11 @@ import {
 var DAEMON_HTTP_TIMEOUT_MS = 1e4;
 var DAEMON_PROBE_TIMEOUT_MS = 250;
 async function daemonOrDirect(method, params, direct) {
-  const fromDaemon = await daemonRequest(method, params, {
-    timeoutMs: DAEMON_PROBE_TIMEOUT_MS
-  });
+  const fromDaemon = await daemonRequest(
+    method,
+    { ...params, callerEnv: getSiteUrl() },
+    { timeoutMs: DAEMON_PROBE_TIMEOUT_MS }
+  );
   if (fromDaemon !== null) {
     return fromDaemon;
   }

package/dist/daemon/server.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import {
   getClient,
+  getSiteUrl,
   getTokenExpiresAt,
   refreshToken
 } from "../chunk-26VA3ADF.js";
@@ -10,6 +11,24 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "
 import { createServer } from "net";
 import { homedir } from "os";
 import { join } from "path";
+
+// src/daemon/env-binding.ts
+function normalizeApiUrl(url) {
+  return url.trim().replace(/\/+$/, "");
+}
+function apiUrlsMatch(a, b) {
+  return normalizeApiUrl(a) === normalizeApiUrl(b);
+}
+function isCrossEnv(callerEnv, boundEnv) {
+  return typeof callerEnv === "string" && !apiUrlsMatch(callerEnv, boundEnv);
+}
+function assertCallerEnvMatches(callerEnv, boundEnv) {
+  if (isCrossEnv(callerEnv, boundEnv)) {
+    throw new Error(`env mismatch: daemon is bound to ${boundEnv}, caller targets ${callerEnv}`);
+  }
+}
+
+// src/daemon/server.ts
 var CONFIG_DIR = join(homedir(), ".config", "prim");
 var SOCK_PATH = join(CONFIG_DIR, "sock");
 var PID_PATH = join(CONFIG_DIR, "daemon.pid");
@@ -94,6 +113,7 @@ async function ensureTokenFresh() {
   }
 }
 async function handleConflictCheck(params) {
+  assertCallerEnvMatches(params.callerEnv, getSiteUrl());
   if (typeof params.file !== "string") {
     throw new Error("conflict_check requires `file: string`");
   }
@@ -111,18 +131,31 @@ function assertEndpointPath(path, endpoint) {
   }
 }
 async function proxyGet(params, allowedPrefix) {
+  assertCallerEnvMatches(params.callerEnv, getSiteUrl());
   const path = pathParam(params);
   assertEndpointPath(path, allowedPrefix);
   return await client.get(path, { signal: AbortSignal.timeout(HTTP_PROXY_TIMEOUT_MS) });
 }
-function handleStatusSnapshot() {
-  const presenceFresh = lastOkAtLocal !== void 0 && Date.now() - lastOkAtLocal < PRESENCE_FRESH_WINDOW_MS;
-  const presenceStale = lastOkAtLocal !== void 0 && !presenceFresh;
-  return {
+function handleStatusSnapshot(params) {
+  const base = {
     pid: process.pid,
     uptimeMs: Date.now() - startedAt,
     sessionId: activeSessionId,
-    lastHeartbeatAt,
+    lastHeartbeatAt
+  };
+  if (isCrossEnv(params.callerEnv, getSiteUrl())) {
+    return {
+      ...base,
+      onlineCount: void 0,
+      onlineNames: void 0,
+      presenceStale: false,
+      envMismatch: true
+    };
+  }
+  const presenceFresh = lastOkAtLocal !== void 0 && Date.now() - lastOkAtLocal < PRESENCE_FRESH_WINDOW_MS;
+  const presenceStale = lastOkAtLocal !== void 0 && !presenceFresh;
+  return {
+    ...base,
     // Withhold a frozen count/names once they're no longer fresh; the
     // statusline shows "presence: stale" rather than a confident, wrong list.
     onlineCount: presenceFresh ? lastOnlineCount : void 0,
@@ -166,7 +199,7 @@ async function dispatchRequest(req) {
         return { id, ok: true, result: { ack: true } };
       }
       case "status_snapshot":
-        return { id, ok: true, result: handleStatusSnapshot() };
+        return { id, ok: true, result: handleStatusSnapshot(req.params ?? {}) };
       case "ping":
         return { id, ok: true, result: { pong: true } };
       default:

package/dist/hooks/post-commit.js

@@ -2,10 +2,11 @@
 import {
   appendMove,
   resolveOrg
-} from "../chunk-JZGWQDM5.js";
+} from "../chunk-C4UYMR7X.js";
 import {
   toCommitMove
 } from "../chunk-7GHOFNJ2.js";
+import "../chunk-26VA3ADF.js";
 
 // src/hooks/post-commit.ts
 import { execSync, spawn } from "child_process";

package/dist/hooks/post-tool-use.js

@@ -3,9 +3,6 @@ import {
   bold,
   color
 } from "../chunk-4QJOQIY6.js";
-import {
-  getClient
-} from "../chunk-26VA3ADF.js";
 import {
   scrubFromCwd
 } from "../chunk-6LAQVM26.js";
@@ -15,6 +12,9 @@ import {
 import {
   parseAgent
 } from "../chunk-7YRBACIE.js";
+import {
+  getClient
+} from "../chunk-26VA3ADF.js";
 
 // src/hooks/post-tool-use.ts
 import { readFileSync } from "fs";

package/dist/hooks/pre-commit.js

@@ -2,7 +2,7 @@
 import {
   checkAffectedDecisions,
   formatDecisionsWarning
-} from "../chunk-E5UZXMZL.js";
+} from "../chunk-UWAJCF7P.js";
 import "../chunk-26VA3ADF.js";
 import "../chunk-UTKQTZHL.js";
 

package/dist/hooks/pre-tool-use.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
-import {
-  getClient
-} from "../chunk-26VA3ADF.js";
 import {
   parseAgent
 } from "../chunk-7YRBACIE.js";
+import {
+  getClient,
+  getSiteUrl
+} from "../chunk-26VA3ADF.js";
 import {
   daemonRequest
 } from "../chunk-UTKQTZHL.js";
@@ -199,7 +200,9 @@ function emit(output) {
 async function checkOneFile(file) {
   const fromDaemon = await daemonRequest(
     "conflict_check",
-    { file },
+    // callerEnv lets a staging-bound daemon refuse a prod-context gate check
+    // (and vice versa) so we fall through to a direct call against our own env.
+    { file, callerEnv: getSiteUrl() },
     { timeoutMs: DAEMON_TIMEOUT_MS }
   );
   if (fromDaemon) {

package/dist/hooks/prim-hook.js

@@ -2,7 +2,7 @@
 import {
   appendMove,
   resolveOrg
-} from "../chunk-JZGWQDM5.js";
+} from "../chunk-C4UYMR7X.js";
 import {
   scrubFromCwd
 } from "../chunk-6LAQVM26.js";
@@ -13,6 +13,7 @@ import {
 import {
   parseAgent
 } from "../chunk-7YRBACIE.js";
+import "../chunk-26VA3ADF.js";
 
 // src/hooks/prim-hook.ts
 import { spawn } from "child_process";

package/dist/hooks/session-start.js

@@ -2,6 +2,9 @@
 import {
   parseAgent
 } from "../chunk-7YRBACIE.js";
+import {
+  getSiteUrl
+} from "../chunk-26VA3ADF.js";
 import {
   daemonRequest
 } from "../chunk-UTKQTZHL.js";
@@ -71,7 +74,9 @@ async function main() {
   if (parseAgent(process.argv) === "codex") {
     const snapshot = await daemonRequest(
       "status_snapshot",
-      {},
+      // callerEnv: a cross-env daemon withholds onlineCount, so a prod Codex
+      // session never gets a staging daemon's team count injected.
+      { callerEnv: getSiteUrl() },
       { timeoutMs: DAEMON_TIMEOUT_MS }
     );
     if (snapshot && !snapshot.presenceStale && typeof snapshot.onlineCount === "number") {

package/dist/index.js

@@ -10,7 +10,15 @@ import {
   checkAffectedDecisions,
   daemonOrDirectGet,
   formatDecisionsWarning
-} from "./chunk-E5UZXMZL.js";
+} from "./chunk-UWAJCF7P.js";
+import {
+  JOURNAL_DIR,
+  SESSIONS_DIR,
+  bucketStats,
+  listBuckets,
+  listFlushing,
+  readMovesFromPath
+} from "./chunk-C4UYMR7X.js";
 import {
   HttpError,
   REFRESH_TOKEN_PATH,
@@ -22,13 +30,6 @@ import {
   getTokenExpiresAt,
   saveTokenExpiry
 } from "./chunk-26VA3ADF.js";
-import {
-  JOURNAL_DIR,
-  SESSIONS_DIR,
-  bucketStats,
-  listBuckets,
-  readMovesFromPath
-} from "./chunk-JZGWQDM5.js";
 import {
   daemonIsLive,
   daemonRequest
@@ -851,7 +852,7 @@ ${line("project", result.project)}`);
 
 // src/commands/daemon.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync4, unlinkSync } from "fs";
+import { closeSync as closeSync2, existsSync as existsSync4, mkdirSync as mkdirSync3, openSync as openSync2, readFileSync as readFileSync4, unlinkSync } from "fs";
 import { homedir as homedir3 } from "os";
 import { join as join4 } from "path";
 
@@ -871,8 +872,12 @@ function formatTeammates(names, cap) {
 
 // src/commands/daemon.ts
 var DAEMON_BIN = "prim-daemon-server";
-var PID_PATH = join4(homedir3(), ".config", "prim", "daemon.pid");
-var SOCK_PATH = join4(homedir3(), ".config", "prim", "sock");
+var CONFIG_DIR = join4(homedir3(), ".config", "prim");
+var PID_PATH = join4(CONFIG_DIR, "daemon.pid");
+var SOCK_PATH = join4(CONFIG_DIR, "sock");
+var LOG_PATH = join4(CONFIG_DIR, "daemon.log");
+var CONFIG_DIR_MODE = 448;
+var LOG_FILE_MODE = 384;
 var STOP_TIMEOUT_MS = 5e3;
 var STOP_POLL_MS = 100;
 var STATUS_PROBE_TIMEOUT_MS = 500;
@@ -921,6 +926,12 @@ function spawnDaemon(options) {
   const file = binFile(DAEMON_BIN);
   return file ? spawn(process.execPath, [file], options) : spawn(DAEMON_BIN, [], options);
 }
+function openDaemonLog(configDir = CONFIG_DIR) {
+  if (!existsSync4(configDir)) {
+    mkdirSync3(configDir, { recursive: true, mode: CONFIG_DIR_MODE });
+  }
+  return openSync2(join4(configDir, "daemon.log"), "a", LOG_FILE_MODE);
+}
 async function waitForReady() {
   const deadline = Date.now() + READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
@@ -949,8 +960,20 @@ async function daemonStart(opts) {
     });
     return;
   }
-  const child = spawnDaemon({ detached: true, stdio: ["ignore", "ignore", "ignore"] });
+  let logFd;
+  try {
+    logFd = openDaemonLog();
+  } catch {
+    logFd = void 0;
+  }
+  const child = spawnDaemon({
+    detached: true,
+    stdio: logFd === void 0 ? ["ignore", "ignore", "ignore"] : ["ignore", logFd, logFd]
+  });
   child.unref();
+  if (logFd !== void 0) {
+    closeSync2(logFd);
+  }
   const live = await waitForReady();
   if (live) {
     const after = readPidfile();
@@ -962,7 +985,7 @@ async function daemonStart(opts) {
     return;
   }
   process.stderr.write(
-    `[prim] \u2717 daemon start: spawned but the socket did not respond within ${READY_TIMEOUT_MS}ms (check that \`${DAEMON_BIN}\` resolves, and see its log)
+    `[prim] \u2717 daemon start: spawned but the socket did not respond within ${READY_TIMEOUT_MS}ms (check that \`${DAEMON_BIN}\` resolves, and see ${LOG_PATH})
 `
   );
   console.log(JSON.stringify({ started: false }, null, 2));
@@ -1860,9 +1883,124 @@ function registerDecisionsCommands(program2) {
   });
 }
 
+// src/commands/doctor.ts
+import { existsSync as existsSync5 } from "fs";
+var DAEMON_PROBE_TIMEOUT_MS = 500;
+var CONNECTIVITY_TIMEOUT_MS = 3e3;
+var MS_PER_SECOND = 1e3;
+var STALE_PENDING_MS = 6e4;
+var EXIT_UNHEALTHY = 1;
+function classifyDoctor(checks) {
+  const status = checks.some((c) => c.status === "fail") ? "fail" : checks.some((c) => c.status === "warn") ? "warn" : "ok";
+  return {
+    json: { ok: status !== "fail", status, checks },
+    exitCode: status === "fail" ? EXIT_UNHEALTHY : 0
+  };
+}
+function checkAuth() {
+  if (!getAuthToken()) {
+    return { name: "auth", status: "fail", detail: "no token \u2014 run `prim auth login`" };
+  }
+  const expiresAt = getTokenExpiresAt();
+  const hasRefresh = existsSync5(REFRESH_TOKEN_PATH);
+  if (expiresAt !== void 0 && Date.now() >= expiresAt) {
+    return hasRefresh ? { name: "auth", status: "warn", detail: "access token expired (refresh available)" } : {
+      name: "auth",
+      status: "fail",
+      detail: "token expired, no refresh \u2014 run `prim auth login`"
+    };
+  }
+  if (!hasRefresh) {
+    return { name: "auth", status: "warn", detail: "no refresh token \u2014 capture stops at expiry" };
+  }
+  const detail = expiresAt !== void 0 ? `valid (${String(Math.round((expiresAt - Date.now()) / MS_PER_SECOND))}s left)` : "valid";
+  return { name: "auth", status: "ok", detail };
+}
+async function checkDaemon() {
+  const live = await daemonIsLive(DAEMON_PROBE_TIMEOUT_MS);
+  return live ? { name: "daemon", status: "ok", detail: "live" } : {
+    name: "daemon",
+    status: "warn",
+    detail: "down \u2014 capture still journals; drains on next `prim` invocation"
+  };
+}
+function checkJournal() {
+  const stats = bucketStats();
+  const pending = stats.reduce((n, s) => n + s.lineCount, 0);
+  if (pending === 0) {
+    return { name: "journal", status: "ok", detail: "no pending moves" };
+  }
+  const oldestMs = Math.max(...stats.map((s) => Date.now() - s.mtimeMs));
+  const oldestS = Math.round(oldestMs / MS_PER_SECOND);
+  if (oldestMs > STALE_PENDING_MS) {
+    return {
+      name: "journal",
+      status: "warn",
+      detail: `${String(pending)} pending, oldest ${String(oldestS)}s \u2014 drain may be stalled`
+    };
+  }
+  return { name: "journal", status: "ok", detail: `${String(pending)} pending, draining` };
+}
+function checkStranded() {
+  const stranded = listFlushing();
+  if (stranded.length === 0) {
+    return { name: "stranded", status: "ok", detail: "none" };
+  }
+  const moves = stranded.reduce((n, f) => n + f.lineCount, 0);
+  return {
+    name: "stranded",
+    status: "warn",
+    detail: `${String(moves)} move(s) in ${String(stranded.length)} file(s) \u2014 run \`prim moves flush\``
+  };
+}
+async function checkConnectivity() {
+  try {
+    await getClient().get("/api/cli/decisions/recent?limit=1", {
+      signal: AbortSignal.timeout(CONNECTIVITY_TIMEOUT_MS)
+    });
+    return { name: "connectivity", status: "ok", detail: "server reachable" };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const status = message.includes("Authentication") ? "fail" : "warn";
+    return { name: "connectivity", status, detail: message.slice(0, 80) };
+  }
+}
+async function collectChecks() {
+  return [
+    checkAuth(),
+    await checkDaemon(),
+    checkJournal(),
+    checkStranded(),
+    await checkConnectivity()
+  ];
+}
+function icon(status) {
+  return status === "ok" ? "\u2713" : status === "warn" ? "\u26A0" : "\u2717";
+}
+async function runDoctor() {
+  const checks = await collectChecks();
+  const { json, exitCode } = classifyDoctor(checks);
+  const headline = json.status === "ok" ? "\u2713 healthy" : json.status === "warn" ? "\u26A0 degraded" : "\u2717 unhealthy";
+  process.stderr.write(`[prim] doctor: ${headline}
+`);
+  for (const c of checks) {
+    process.stderr.write(`  ${icon(c.status)} ${c.name.padEnd(13)} ${c.detail}
+`);
+  }
+  console.log(JSON.stringify(json, null, 2));
+  if (exitCode !== 0 && !process.exitCode) {
+    process.exitCode = exitCode;
+  }
+}
+function registerDoctorCommands(program2) {
+  program2.command("doctor").description("Check capture-pipeline health end to end (auth, daemon, journal, server)").action(async () => {
+    await runDoctor();
+  });
+}
+
 // src/commands/hooks.ts
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
 import { resolve } from "path";
 import { Option } from "commander";
 var PRE_COMMIT = { hookName: "pre-commit", binName: "prim-pre-commit" };
@@ -1905,11 +2043,11 @@ function getGitRoot() {
 }
 function detectHusky(gitRoot) {
   const huskyDir = resolve(gitRoot, ".husky");
-  if (!existsSync5(huskyDir)) return false;
-  if (existsSync5(resolve(huskyDir, "_"))) return true;
-  if (existsSync5(resolve(huskyDir, "pre-commit"))) return true;
+  if (!existsSync6(huskyDir)) return false;
+  if (existsSync6(resolve(huskyDir, "_"))) return true;
+  if (existsSync6(resolve(huskyDir, "pre-commit"))) return true;
   const pkgPath = resolve(gitRoot, "package.json");
-  if (existsSync5(pkgPath)) {
+  if (existsSync6(pkgPath)) {
     try {
       const pkg2 = JSON.parse(readFileSync5(pkgPath, "utf-8"));
       const scripts = pkg2.scripts ?? {};
@@ -1938,7 +2076,7 @@ async function askConfirmation(question) {
 }
 function installToHusky(gitRoot, spec = PRE_COMMIT) {
   const hookPath = resolve(gitRoot, ".husky", spec.hookName);
-  if (existsSync5(hookPath)) {
+  if (existsSync6(hookPath)) {
     const existing = readFileSync5(hookPath, "utf-8");
     if (containsPrimHook(existing, spec.binName)) {
       console.log(`Prim ${spec.hookName} hook is already installed in .husky/${spec.hookName}.`);
@@ -1963,10 +2101,10 @@ ${huskyBlock(spec)}
 function installToDotGit(gitRoot, spec = PRE_COMMIT) {
   const hooksDir = resolve(gitRoot, ".git", "hooks");
   const hookPath = resolve(hooksDir, spec.hookName);
-  if (!existsSync5(hooksDir)) {
-    mkdirSync3(hooksDir, { recursive: true });
+  if (!existsSync6(hooksDir)) {
+    mkdirSync4(hooksDir, { recursive: true });
   }
-  if (existsSync5(hookPath)) {
+  if (existsSync6(hookPath)) {
     const existing = readFileSync5(hookPath, "utf-8");
     if (containsPrimHook(existing, spec.binName)) {
       console.log(`Prim ${spec.hookName} hook is already installed at ${hookPath}.`);
@@ -2030,7 +2168,7 @@ function registerHooksCommands(program2) {
     const gitRoot = getGitRoot();
     for (const spec of HOOKS) {
       const hookPath = resolve(gitRoot, ".git", "hooks", spec.hookName);
-      if (!existsSync5(hookPath)) {
+      if (!existsSync6(hookPath)) {
         console.log(`No ${spec.hookName} hook found.`);
         continue;
       }
@@ -2045,7 +2183,7 @@ function registerHooksCommands(program2) {
 }
 
 // src/commands/moves.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync4, unlinkSync as unlinkSync4, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, unlinkSync as unlinkSync4, writeFileSync as writeFileSync4 } from "fs";
 import { join as join5 } from "path";
 
 // src/flusher.ts
@@ -2053,35 +2191,70 @@ import { renameSync as renameSync2, unlinkSync as unlinkSync3 } from "fs";
 var BATCH_SIZE = 500;
 var HTTP_TIMEOUT_MS = 1e4;
 var OPPORTUNISTIC_FLUSH_AFTER_MS = 6e4;
-async function drainPath(path) {
-  const tmpPath = `${path}.flushing.${String(Date.now())}.${String(process.pid)}`;
-  try {
-    renameSync2(path, tmpPath);
-  } catch (err) {
-    if (err.code === "ENOENT") {
-      return 0;
-    }
-    throw err;
+var ORPHAN_QUARANTINE_MS = 6e4;
+function batchMoves(moves, size = BATCH_SIZE) {
+  const batches = [];
+  for (let i = 0; i < moves.length; i += size) {
+    batches.push(moves.slice(i, i + size));
   }
-  const moves = readMovesFromPath(tmpPath);
+  return batches;
+}
+async function drainFlushingPath(flushingPath) {
+  const moves = readMovesFromPath(flushingPath);
   if (moves.length === 0) {
-    unlinkSync3(tmpPath);
+    unlinkSync3(flushingPath);
     return 0;
   }
   const client = getClient();
-  for (let i = 0; i < moves.length; i += BATCH_SIZE) {
-    const batch = moves.slice(i, i + BATCH_SIZE);
+  for (const batch of batchMoves(moves)) {
     await client.post(
       "/api/cli/moves/ingest",
       { batch },
       { signal: AbortSignal.timeout(HTTP_TIMEOUT_MS) }
     );
   }
-  unlinkSync3(tmpPath);
+  unlinkSync3(flushingPath);
   return moves.length;
 }
-async function flush() {
+async function drainPath(path) {
+  const tmpPath = `${path}.flushing.${String(Date.now())}.${String(process.pid)}`;
+  try {
+    renameSync2(path, tmpPath);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return 0;
+    }
+    throw err;
+  }
+  return drainFlushingPath(tmpPath);
+}
+function processIsAlive2(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function selectRecoverable(files, now, opts = {}) {
+  const quarantineMs = opts.quarantineMs ?? ORPHAN_QUARANTINE_MS;
+  const isAlive = opts.isAlive ?? processIsAlive2;
+  return files.filter(
+    (f) => f.pid === void 0 ? now - f.mtimeMs > quarantineMs : !isAlive(f.pid)
+  );
+}
+async function recoverOrphans() {
   let total = 0;
+  for (const file of selectRecoverable(listFlushing(), Date.now())) {
+    try {
+      total += await drainFlushingPath(file.path);
+    } catch {
+    }
+  }
+  return total;
+}
+async function flush() {
+  let total = await recoverOrphans();
   for (const { path } of listBuckets()) {
     total += await drainPath(path);
   }
@@ -2102,7 +2275,7 @@ async function flushIfNeeded() {
 }
 
 // src/commands/moves.ts
-var MS_PER_SECOND = 1e3;
+var MS_PER_SECOND2 = 1e3;
 var DEFAULT_TAIL_LINES = "20";
 var RADIX_DECIMAL = 10;
 var ID_PREFIX_LEN = 8;
@@ -2120,17 +2293,32 @@ function registerMovesCommands(program2) {
   });
   moves.command("status").description("Show per-bucket pending stats").action(() => {
     const stats = bucketStats();
-    if (stats.length === 0) {
+    const stranded = listFlushing();
+    if (stats.length === 0 && stranded.length === 0) {
       console.log("[prim] journal: empty");
       return;
     }
     console.log(`[prim] root: ${JOURNAL_DIR}`);
     for (const s of stats) {
-      const ageS = Math.round((Date.now() - s.mtimeMs) / MS_PER_SECOND);
+      const ageS = Math.round((Date.now() - s.mtimeMs) / MS_PER_SECOND2);
       console.log(
         `  ${s.bucket.padEnd(BUCKET_COL_WIDTH)} ${String(s.lineCount).padStart(5)} pending, ${String(s.sizeBytes).padStart(8)} bytes, last write ${String(ageS)}s ago`
       );
     }
+    if (stranded.length > 0) {
+      const moveCount = stranded.reduce((n, f) => n + f.lineCount, 0);
+      const byteCount = stranded.reduce((n, f) => n + f.sizeBytes, 0);
+      console.log(
+        `[prim] \u26A0 ${String(stranded.length)} stranded flush file(s): ${String(moveCount)} move(s), ${String(byteCount)} bytes \u2014 recover with \`prim moves flush\``
+      );
+      for (const f of stranded) {
+        const ageS = Math.round((Date.now() - f.mtimeMs) / MS_PER_SECOND2);
+        const owner = f.pid === void 0 ? "no pid" : `pid ${String(f.pid)}`;
+        console.log(
+          `  ${f.bucket.padEnd(BUCKET_COL_WIDTH)} ${String(f.lineCount).padStart(5)} stranded, ${String(f.sizeBytes).padStart(8)} bytes, ${String(ageS)}s ago (${owner})`
+        );
+      }
+    }
   });
   moves.command("tail").description("Pretty-print recent journal entries across all buckets").option("-n, --lines <n>", "number of lines to tail", DEFAULT_TAIL_LINES).action((opts) => {
     const lines = Number.parseInt(opts.lines, RADIX_DECIMAL);
@@ -2156,8 +2344,8 @@ function registerMovesCommands(program2) {
   });
   moves.command("bind").description("Pin the current directory to an org via .prim/workspace.json").requiredOption("--orgId <orgId>", "Convex organization id").action((opts) => {
     const dir = join5(process.cwd(), ".prim");
-    if (!existsSync6(dir)) {
-      mkdirSync4(dir, { recursive: true, mode: DIR_MODE });
+    if (!existsSync7(dir)) {
+      mkdirSync5(dir, { recursive: true, mode: DIR_MODE });
     }
     const file = join5(process.cwd(), WORKSPACE_FILE);
     writeFileSync4(file, JSON.stringify({ orgId: opts.orgId, boundAt: Date.now() }, null, 2), {
@@ -2167,7 +2355,7 @@ function registerMovesCommands(program2) {
   });
   moves.command("drop").description("Remove the .prim/workspace.json binding from the cwd").action(() => {
     const file = join5(process.cwd(), WORKSPACE_FILE);
-    if (!existsSync6(file)) {
+    if (!existsSync7(file)) {
       console.log("[prim] no workspace binding in cwd");
       return;
     }
@@ -2260,8 +2448,8 @@ function registerReconcileCommands(program2) {
 
 // src/commands/session.ts
 import {
-  existsSync as existsSync7,
-  mkdirSync as mkdirSync5,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync6,
   readFileSync as readFileSync6,
   readdirSync,
   unlinkSync as unlinkSync5,
@@ -2271,8 +2459,8 @@ import { join as join6 } from "path";
 var DIR_MODE2 = 448;
 var FILE_MODE3 = 384;
 function ensureDir() {
-  if (!existsSync7(SESSIONS_DIR)) {
-    mkdirSync5(SESSIONS_DIR, { recursive: true, mode: DIR_MODE2 });
+  if (!existsSync8(SESSIONS_DIR)) {
+    mkdirSync6(SESSIONS_DIR, { recursive: true, mode: DIR_MODE2 });
   }
 }
 function markerPath(sessionId) {
@@ -2292,7 +2480,7 @@ function registerSessionCommands(program2) {
     console.log(`[prim] session ${sessionId} bound to org ${opts.orgId}`);
   });
   session.command("list").description("List active session markers").action(() => {
-    if (!existsSync7(SESSIONS_DIR)) {
+    if (!existsSync8(SESSIONS_DIR)) {
       console.log("[prim] no session markers");
       return;
     }
@@ -2312,7 +2500,7 @@ function registerSessionCommands(program2) {
   });
   session.command("drop <sessionId>").description("Remove a session marker").action((sessionId) => {
     const p = markerPath(sessionId);
-    if (!existsSync7(p)) {
+    if (!existsSync8(p)) {
       console.log(`[prim] no marker for session ${sessionId}`);
       return;
     }
@@ -2413,10 +2601,10 @@ function registerSetupCommand(program2) {
 
 // src/commands/skill.ts
 import {
-  closeSync as closeSync2,
-  existsSync as existsSync8,
+  closeSync as closeSync3,
+  existsSync as existsSync9,
   fsyncSync as fsyncSync2,
-  openSync as openSync2,
+  openSync as openSync3,
   readFileSync as readFileSync7,
   renameSync as renameSync3,
   writeFileSync as writeFileSync6
@@ -2439,13 +2627,13 @@ function loadSkill() {
   let dir = __dirname;
   while (dir !== dirname4(dir)) {
     const p = resolve2(dir, "SKILL.md");
-    if (existsSync8(p)) return readFileSync7(p, "utf-8");
+    if (existsSync9(p)) return readFileSync7(p, "utf-8");
     dir = dirname4(dir);
   }
   throw new Error("SKILL.md not found in package");
 }
 function detectTargets(cwd) {
-  return TARGET_CANDIDATES.filter((p) => existsSync8(resolve2(cwd, p)));
+  return TARGET_CANDIDATES.filter((p) => existsSync9(resolve2(cwd, p)));
 }
 function detectNewline(content) {
   return content.includes("\r\n") ? "\r\n" : "\n";
@@ -2474,11 +2662,11 @@ function removeBlock(existing) {
 function atomicWrite2(target, content) {
   const tmp = `${target}.tmp`;
   writeFileSync6(tmp, content);
-  const fd = openSync2(tmp, "r+");
+  const fd = openSync3(tmp, "r+");
   try {
     fsyncSync2(fd);
   } finally {
-    closeSync2(fd);
+    closeSync3(fd);
   }
   renameSync3(tmp, target);
 }
@@ -2494,7 +2682,7 @@ function resolveTarget(cwd, override) {
 function runInstall(cwd, opts) {
   const target = resolveTarget(cwd, opts.target);
   if (target === null) return 1;
-  const existing = existsSync8(target) ? readFileSync7(target, "utf-8") : "";
+  const existing = existsSync9(target) ? readFileSync7(target, "utf-8") : "";
   const eol = existing ? detectNewline(existing) : "\n";
   const block = composeBlock(loadSkill(), eol);
   const next = applyBlock(existing, block, eol);
@@ -2513,7 +2701,7 @@ function runInstall(cwd, opts) {
 function runUninstall(cwd, opts) {
   const target = resolveTarget(cwd, opts.target);
   if (target === null) return 1;
-  if (!existsSync8(target)) {
+  if (!existsSync9(target)) {
     console.log(`Skill block not present at ${target}`);
     return 0;
   }
@@ -2530,7 +2718,7 @@ function runUninstall(cwd, opts) {
 function runStatus(cwd, opts) {
   const target = resolveTarget(cwd, opts.target);
   if (target === null) return 1;
-  const fileExists = existsSync8(target);
+  const fileExists = existsSync9(target);
   let installed = false;
   if (fileExists) {
     const content = readFileSync7(target, "utf-8");
@@ -2602,13 +2790,18 @@ async function renderStatusline() {
   const version = readPackageVersion();
   const snapshot = await daemonRequest(
     "status_snapshot",
-    {},
+    // callerEnv lets the daemon withhold presence when it is bound to a different
+    // deployment than this statusline targets.
+    { callerEnv: getSiteUrl() },
     { timeoutMs: STATUSLINE_TIMEOUT_MS }
   );
   if (!snapshot) {
     debug("daemon snapshot missing");
     return `primitive ${version} (daemon: down)`;
   }
+  if (snapshot.envMismatch) {
+    return `primitive ${version} (daemon: live \xB7 presence: other env)`;
+  }
   if (snapshot.presenceStale) {
     return `primitive ${version} (daemon: live \xB7 presence: stale)`;
   }
@@ -2760,6 +2953,7 @@ registerDecisionsCommands(program);
 registerClaudeCommands(program);
 registerCodexCommands(program);
 registerDaemonCommands(program);
+registerDoctorCommands(program);
 registerReconcileCommands(program);
 registerStatuslineCommands(program);
 registerWelcomeCommand(program);

package/package.json

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