@outerlayer/cli 0.2.0 → 0.4.1

package/dist/{chunk-NXLLURA4.js → chunk-UFFXNXLQ.js}

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { deadHooksState, huskyPrepareScript, preparePackageManagerCommand } from './chunk-I3ETLSNE.js';
+import { deadHooksState, huskyPrepareScript, preparePackageManagerCommand } from './chunk-XCCLFVXM.js';
+import { readRepoConnection, findGitDirs } from './chunk-BJ3KTMDH.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
 import { readFileSync, mkdirSync, writeFileSync, renameSync, existsSync, statSync, appendFileSync, openSync, opendirSync, unlinkSync } from 'fs';
 import { spawn, execFileSync } from 'child_process';
 import { createHash } from 'crypto';
-import { join, dirname, isAbsolute, resolve } from 'path';
+import { join, dirname, resolve } from 'path';
 
 createRequire(import.meta.url);
 var SYNC_STALE_AFTER_MS = 6 * 60 * 60 * 1e3;
@@ -354,11 +355,17 @@ function appendFd(path) {
     return "ignore";
   }
 }
-var spawnDetached = (command, args, stderrPath) => {
-  const child = spawn(command, args, { detached: true, stdio: ["ignore", "ignore", appendFd(stderrPath)] });
+var spawnDetached = (command, args, stderrPath, cwd) => {
+  const child = spawn(command, args, {
+    detached: true,
+    stdio: ["ignore", "ignore", appendFd(stderrPath)],
+    ...cwd !== void 0 ? { cwd } : {}
+  });
+  child.on("error", () => {
+  });
   child.unref();
 };
-function maybeAutoSync(event, home = homeFromEnv(), spawnImpl = spawnDetached, now = Date.now()) {
+function maybeAutoSync(event, home = homeFromEnv(), spawnImpl = spawnDetached, now = Date.now(), cwd = process.cwd()) {
   try {
     if (event !== "SessionEnd" && event !== "Stop") return;
     const marker = join(spoolDir(home), "last-auto-sync");
@@ -370,55 +377,114 @@ function maybeAutoSync(event, home = homeFromEnv(), spawnImpl = spawnDetached, n
     if (!existsSync(configPath)) return;
     const config = JSON.parse(readFileSync(configPath, "utf8"));
     if (config.autoSync === false) return;
-    if (!config.url || !config.apiKey || !config.appId) return;
+    if (!config.url) return;
+    if (config.apiKey) {
+      if (!config.appId) return;
+    } else if (!config.accountToken || readRepoConnection(cwd) === void 0) return;
     writeFileSync(marker, String(now));
-    spawnImpl(process.execPath, [process.argv[1], "sync", "--quiet"]);
+    spawnImpl(process.execPath, [process.argv[1], "sync", "--quiet"], void 0, cwd);
   } catch {
   }
 }
-var WORK_ADD_RETRIES = 4;
+var WORK_LINK_RETRIES = 4;
 function hookErrorsContext(home, writtenBytes, seenBytes) {
   if (writtenBytes === 0) return null;
   if (writtenBytes === seenBytes) return null;
   const path = join(spoolDir(home), "hook-errors.log");
-  return `OuterLayer recorded a hook failure since your last session started \u2014 a refused OUTERLAYER_WORK value, or a work-item session link that could not reach the Floor. The log is ${path}.`;
+  return `OuterLayer recorded a hook failure since your last session started \u2014 a refused OUTERLAYER_WORK value, or a work-item session link that could not reach Work. The log is ${path}.`;
 }
-async function handleWorkLaunch(sessionId, home, env, spawnImpl = spawnDetached) {
+async function handleWorkLaunch(sessionId, home, env, spawnImpl = spawnDetached, cwd = process.cwd()) {
   if (!sessionId || env.OUTERLAYER_WORK === void 0) return void 0;
-  const { parseWorkItemEnv, appendLaunchRecord } = await import('./work-launch-LT663PB3.js');
+  const { parseWorkItemEnv, appendLaunchRecord } = await import('./work-launch-YI4CJDAP.js');
   const parsed = parseWorkItemEnv(env.OUTERLAYER_WORK);
   if ("reason" in parsed) {
     logHookError(home, new Error(`OUTERLAYER_WORK ignored: ${parsed.reason}`));
     return `OuterLayer ignored this session's OUTERLAYER_WORK value: ${sanitizeForContext(parsed.reason)}. The session is not attached to a work item and will not upload. Hook failures are logged to ${join(spoolDir(home), "hook-errors.log")}.`;
   }
   appendLaunchRecord({ sessionId, item: parsed.number }, home);
+  const args = [
+    process.argv[1],
+    "work",
+    "link-session",
+    String(parsed.number),
+    "--session-id",
+    sessionId,
+    // The ordinary failure is a gateway that is briefly unreachable — a
+    // laptop that has not joined the network yet, a restart. Nothing else
+    // ever retries this link: the launch record is already written, so
+    // the session uploads whether or not Work ever hears about the
+    // link. Retrying costs nothing here (this process is detached; the
+    // hook has already returned) and cannot double-link, because the
+    // link is keyed by the session id passed above.
+    "--retry",
+    String(WORK_LINK_RETRIES)
+  ];
+  if (env.OUTERLAYER_JOB_DIR !== void 0) args.push("--no-lease");
   spawnImpl(
     process.execPath,
-    [
-      process.argv[1],
-      "work",
-      "link-session",
-      String(parsed.number),
-      "--session-id",
-      sessionId,
-      // The ordinary failure is a gateway that is briefly unreachable — a
-      // laptop that has not joined the network yet, a restart. Nothing else
-      // ever retries this link: the launch record is already written, so
-      // the session uploads whether or not the Floor ever hears about the
-      // link. Retrying costs nothing here (this process is detached; the
-      // hook has already returned) and cannot double-link, because the
-      // link is keyed by the session id passed above.
-      "--retry",
-      String(WORK_ADD_RETRIES)
-    ],
+    args,
     // The link runs after this hook has exited, so its own failure
     // (offline, revoked key, unknown item number) has nowhere else to be
-    // seen: without this the session uploads later with no Floor link and
+    // seen: without this the session uploads later with no Work link and
     // no trace of why.
-    join(spoolDir(home), "hook-errors.log")
+    join(spoolDir(home), "hook-errors.log"),
+    cwd
   );
   return void 0;
 }
+async function missingRenewalHookContext(home, cwd) {
+  try {
+    const { settingsPath, readSettings, isOurHookCommand } = await import('./settings-J2652U5N.js');
+    const userSettings = readSettings(settingsPath("user", { home }));
+    const projectSettings = readSettings(settingsPath("project", { cwd }));
+    if (userSettings === null && projectSettings === null) return void 0;
+    const registeredIn = (settings) => (settings.hooks?.PostToolUse ?? []).some((block) => (block.hooks ?? []).some((h) => isOurHookCommand(h)));
+    const registered = userSettings !== null && registeredIn(userSettings) || projectSettings !== null && registeredIn(projectSettings);
+    if (registered) return void 0;
+    return "This install has no PostToolUse hook, so this session's work-item lease will never be renewed while it works and may be lost to another worker mid-session. Run `outerlayer init` to register it.";
+  } catch {
+    return void 0;
+  }
+}
+var WORK_LEASE_RENEW_DEBOUNCE_MS = 5 * 60 * 1e3;
+async function maybeRenewWorkLease(event, sessionId, home = homeFromEnv(), env = process.env, spawnImpl = spawnDetached, now = Date.now(), cwd = process.cwd()) {
+  try {
+    if (event !== "PostToolUse") return;
+    if (!sessionId || env.OUTERLAYER_WORK === void 0 || env.OUTERLAYER_JOB_DIR !== void 0) return;
+    const marker = join(spoolDir(home), `work-lease-renew-${sessionId}`);
+    try {
+      if (now - statSync(marker).mtimeMs < WORK_LEASE_RENEW_DEBOUNCE_MS) return;
+    } catch {
+    }
+    const { parseWorkItemEnv } = await import('./work-launch-YI4CJDAP.js');
+    const parsed = parseWorkItemEnv(env.OUTERLAYER_WORK);
+    if ("reason" in parsed) return;
+    writeFileSync(marker, String(now));
+    spawnImpl(
+      process.execPath,
+      [process.argv[1], "work", "link-session", String(parsed.number), "--session-id", sessionId],
+      join(spoolDir(home), "hook-errors.log"),
+      cwd
+    );
+  } catch {
+  }
+}
+async function handleWorkSessionEnd(event, sessionId, home = homeFromEnv(), env = process.env, spawnImpl = spawnDetached, cwd = process.cwd()) {
+  try {
+    if (event !== "SessionEnd") return;
+    if (!sessionId || env.OUTERLAYER_WORK === void 0) return;
+    const { parseWorkItemEnv } = await import('./work-launch-YI4CJDAP.js');
+    const parsed = parseWorkItemEnv(env.OUTERLAYER_WORK);
+    if ("reason" in parsed) return;
+    spawnImpl(
+      process.execPath,
+      [process.argv[1], "work", "link-session", String(parsed.number), "--session-id", sessionId, "--ended"],
+      join(spoolDir(home), "hook-errors.log"),
+      cwd
+    );
+  } catch {
+  }
+}
 function syncHealthContext(home) {
   if (!existsSync(join(home, ".outerlayer", "config.json"))) return null;
   const health = assessSyncHealth(readSyncStatus(home));
@@ -479,7 +545,7 @@ function clearHealFailureMarker(home, repoRoot) {
   }
 }
 function deadHooksAutoHealContext(cwd, home) {
-  if (findGitRoot(cwd) === void 0) return null;
+  if (findGitDirs(cwd) === void 0) return null;
   const state = deadHooksState(cwd);
   if (!state.dead || state.repoRoot === void 0 || state.hooksDir === void 0) return null;
   const hooksDirLabel = sanitizeForContext(state.hooksDir);
@@ -510,41 +576,9 @@ var PIN_FILENAME = ".outerlayer-pin.json";
 function sourceCachePath(gitCommonDir) {
   return join(gitCommonDir, "outerlayer", "source.json");
 }
-function findGitRoot(cwd) {
-  let dir = cwd;
-  for (; ; ) {
-    const gitPath = join(dir, ".git");
-    let stat;
-    try {
-      stat = statSync(gitPath);
-    } catch {
-      stat = void 0;
-    }
-    if (stat?.isDirectory()) return { repoRoot: dir, gitCommonDir: gitPath };
-    if (stat?.isFile()) {
-      try {
-        const content = readFileSync(gitPath, "utf8").trim();
-        const match = /^gitdir:\s*(.+)$/.exec(content);
-        if (match) {
-          const gitdir = isAbsolute(match[1]) ? match[1] : join(dir, match[1]);
-          try {
-            const commondir = readFileSync(join(gitdir, "commondir"), "utf8").trim();
-            return { repoRoot: dir, gitCommonDir: isAbsolute(commondir) ? commondir : join(gitdir, commondir) };
-          } catch {
-            return { repoRoot: dir, gitCommonDir: gitdir };
-          }
-        }
-      } catch {
-      }
-    }
-    const parent = dirname(dir);
-    if (parent === dir) return void 0;
-    dir = parent;
-  }
-}
 function contextPossiblyGoverned(cwd, home = homeFromEnv()) {
   try {
-    const found = findGitRoot(cwd);
+    const found = findGitDirs(cwd);
     if (found === void 0) return false;
     const { repoRoot, gitCommonDir } = found;
     if (existsSync(join(repoRoot, PIN_FILENAME))) return true;
@@ -566,8 +600,6 @@ function contextPossiblyGoverned(cwd, home = homeFromEnv()) {
 }
 async function runHookFast(event, home = homeFromEnv(), read = readStdin, env = process.env, spawnImpl = spawnDetached) {
   try {
-    const dir = spoolDir(home);
-    mkdirSync(dir, { recursive: true });
     const stdin = read();
     let payload = {};
     try {
@@ -576,6 +608,11 @@ async function runHookFast(event, home = homeFromEnv(), read = readStdin, env =
       payload = {};
     }
     const resolvedEvent = String(event ?? payload.hook_event_name ?? "unknown");
+    if (resolvedEvent === "PostToolUse" && (env.OUTERLAYER_WORK === void 0 || env.OUTERLAYER_JOB_DIR !== void 0)) {
+      return;
+    }
+    const dir = spoolDir(home);
+    mkdirSync(dir, { recursive: true });
     const record = {
       t: (/* @__PURE__ */ new Date()).toISOString(),
       event: resolvedEvent,
@@ -585,19 +622,23 @@ async function runHookFast(event, home = homeFromEnv(), read = readStdin, env =
     };
     appendFileSync(join(dir, "events.jsonl"), JSON.stringify(record) + "\n");
     markHookFired(resolvedEvent, home);
-    maybeAutoSync(resolvedEvent, home, spawnImpl);
     const sessionCwd = typeof payload.cwd === "string" ? payload.cwd : process.cwd();
+    maybeAutoSync(resolvedEvent, home, spawnImpl, Date.now(), sessionCwd);
+    const hookSessionId = typeof payload.session_id === "string" ? payload.session_id : void 0;
+    await maybeRenewWorkLease(resolvedEvent, hookSessionId, home, env, spawnImpl, Date.now(), sessionCwd);
+    await handleWorkSessionEnd(resolvedEvent, hookSessionId, home, env, spawnImpl, sessionCwd);
     let materializeMessage;
     let deadHooksMessage;
     let workLaunchMessage;
     let hookErrorsMessage;
+    let renewalHookMessage;
     if (resolvedEvent === "SessionStart") {
       const hookErrorsBytes = fileSizeBytes(join(dir, "hook-errors.log"));
       const hookErrorsSeen = hookErrorsSeenBytes(home);
       recordHookErrorsSeen(home, hookErrorsBytes);
       if (contextPossiblyGoverned(sessionCwd, home)) {
         try {
-          const { materializeContext: materialize } = await import('./context-materialize-6WKT3RBQ.js');
+          const { materializeContext: materialize } = await import('./context-materialize-G2FUFC72.js');
           const sessionId = typeof payload.session_id === "string" ? payload.session_id : "unknown";
           const result = await materialize({ cwd: sessionCwd, sessionId, home });
           materializeMessage = result.message;
@@ -612,20 +653,23 @@ async function runHookFast(event, home = homeFromEnv(), read = readStdin, env =
       }
       try {
         const sessionId = typeof payload.session_id === "string" ? payload.session_id : void 0;
-        workLaunchMessage = await handleWorkLaunch(sessionId, home, env, spawnImpl);
+        workLaunchMessage = await handleWorkLaunch(sessionId, home, env, spawnImpl, sessionCwd);
       } catch (err) {
         logHookError(home, err);
       }
       if (workLaunchMessage === void 0) {
         hookErrorsMessage = hookErrorsContext(home, hookErrorsBytes, hookErrorsSeen) ?? void 0;
       }
+      if (env.OUTERLAYER_WORK !== void 0 && env.OUTERLAYER_JOB_DIR === void 0 && workLaunchMessage === void 0) {
+        renewalHookMessage = await missingRenewalHookContext(home, sessionCwd);
+      }
     }
     writeSessionStartContext(
       resolvedEvent,
       home,
       sessionCwd,
       (out) => process.stdout.write(out),
-      [materializeMessage, deadHooksMessage, workLaunchMessage, hookErrorsMessage].filter(
+      [materializeMessage, deadHooksMessage, workLaunchMessage, hookErrorsMessage, renewalHookMessage].filter(
         (s) => s !== void 0
       )
     );
@@ -647,4 +691,4 @@ function logHookError(home, err) {
   }
 }
 
-export { AUTO_SYNC_DEBOUNCE_MS, SYNC_STALE_AFTER_MS, WORK_ADD_RETRIES, assessSyncHealth, checkInstalledCliStaleness, contextPossiblyGoverned, formatAgo, handleWorkLaunch, hookFiredMarkerPath, installedCliDistDir, maybeAutoSync, readSyncStatus, refreshCommand, runHookFast, sanitizeForContext, spoolDir, workspaceRootOf, writeSyncStatus };
+export { AUTO_SYNC_DEBOUNCE_MS, SYNC_STALE_AFTER_MS, WORK_LEASE_RENEW_DEBOUNCE_MS, WORK_LINK_RETRIES, assessSyncHealth, checkInstalledCliStaleness, contextPossiblyGoverned, formatAgo, handleWorkLaunch, handleWorkSessionEnd, hookFiredMarkerPath, installedCliDistDir, maybeAutoSync, maybeRenewWorkLease, readSyncStatus, refreshCommand, runHookFast, sanitizeForContext, spoolDir, workspaceRootOf, writeSyncStatus };