@flowmind/cli 0.3.10 → 0.3.11

package/dist/index.js

@@ -294,7 +294,7 @@ var isHttpEvidenceUrl = (value) => {
 
 // src/agent-session.ts
 import { createHash as createHash4 } from "node:crypto";
-import { appendFile, mkdir as mkdir5, readdir as readdir7, readFile as readFile6, rename as rename4, rm as rm3, rmdir, stat as stat3, utimes, writeFile as writeFile5 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir5, readdir as readdir7, readFile as readFile6, rename as rename5, rm as rm4, rmdir, stat as stat3, utimes, writeFile as writeFile5 } from "node:fs/promises";
 import { join as join8 } from "node:path";
 
 // src/awake-clock.ts
@@ -566,7 +566,8 @@ function accountDirectory() {
 }
 
 // src/project-link.ts
-import { readFile as readFile2, stat, writeFile as writeFile2 } from "node:fs/promises";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { chmod, readFile as readFile2, rename, rm, stat, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname2, join as join4, resolve } from "node:path";
 var LINK_FILE = ".flowmind.json";
 var UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -625,22 +626,40 @@ async function readLink(start) {
 async function writeLink(start, project) {
   const root = await findRepoRoot(start);
   const path = join4(root, LINK_FILE);
-  await writeFile2(path, `${JSON.stringify({ projectId: project.id, name: project.name }, null, 2)}
-`, "utf8");
+  await replaceLinkFile(path, { projectId: project.id, name: project.name });
   return { kind: "linked", root, path, projectId: project.id, name: project.name };
 }
 async function writeIgnore(start, reason) {
   const root = await findRepoRoot(start);
   const path = join4(root, LINK_FILE);
   const trimmed = reason?.trim() || null;
-  await writeFile2(path, `${JSON.stringify({ ignore: true, ...trimmed ? { reason: trimmed } : {} }, null, 2)}
-`, "utf8");
+  await replaceLinkFile(path, { ignore: true, ...trimmed ? { reason: trimmed } : {} });
   return { kind: "ignored", root, path, reason: trimmed };
 }
+async function replaceLinkFile(path, content) {
+  const temporary = `${path}.${process.pid}.${randomUUID2()}.tmp`;
+  const mode = await permissionBits(path);
+  try {
+    await writeFile2(temporary, `${JSON.stringify(content, null, 2)}
+`, { encoding: "utf8", flag: "wx" });
+    if (mode !== null) await chmod(temporary, mode);
+    await rename(temporary, path);
+  } finally {
+    await rm(temporary, { force: true });
+  }
+}
+async function permissionBits(path) {
+  try {
+    return (await stat(path)).mode & 4095;
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+}
 
 // src/manual-save.ts
-import { createHash as createHash3, randomUUID as randomUUID3 } from "node:crypto";
-import { mkdir as mkdir4, readdir as readdir6, readFile as readFile5, rename as rename3, unlink as unlink2, writeFile as writeFile4 } from "node:fs/promises";
+import { createHash as createHash3, randomUUID as randomUUID4 } from "node:crypto";
+import { mkdir as mkdir4, readdir as readdir6, readFile as readFile5, rename as rename4, unlink as unlink2, writeFile as writeFile4 } from "node:fs/promises";
 import { join as join7 } from "node:path";
 
 // src/account.ts
@@ -975,13 +994,13 @@ async function apiRequest(endpoint, args, options = {}) {
 }
 
 // src/legacy-proofs.ts
-import { mkdir as mkdir3, readdir as readdir4, readFile as readFile4, rename as rename2, rm as rm2, stat as stat2 } from "node:fs/promises";
+import { mkdir as mkdir3, readdir as readdir4, readFile as readFile4, rename as rename3, rm as rm3, stat as stat2 } from "node:fs/promises";
 import { join as join6 } from "node:path";
 
 // src/pending-stages.ts
 import { spawn } from "node:child_process";
-import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
-import { mkdir as mkdir2, readdir as readdir3, readFile as readFile3, rename, rm, writeFile as writeFile3 } from "node:fs/promises";
+import { createHash as createHash2, randomUUID as randomUUID3 } from "node:crypto";
+import { mkdir as mkdir2, readdir as readdir3, readFile as readFile3, rename as rename2, rm as rm2, writeFile as writeFile3 } from "node:fs/promises";
 import { basename, join as join5 } from "node:path";
 
 // src/stored-stage-input.ts
@@ -1065,9 +1084,9 @@ function readStage(value, fileName, legacy = false) {
 }
 var writePendingStage = async (stage) => {
   await mkdir2(outboxDir(), { recursive: true });
-  const temporary = fileOf(stage.id) + "." + process.pid + "." + randomUUID2() + ".tmp";
+  const temporary = fileOf(stage.id) + "." + process.pid + "." + randomUUID3() + ".tmp";
   await writeFile3(temporary, JSON.stringify(stage, null, 2) + "\n", { encoding: "utf8", mode: 384 });
-  await rename(temporary, fileOf(stage.id));
+  await rename2(temporary, fileOf(stage.id));
 };
 async function saveStageBeforeSending(input2) {
   const at2 = input2.now.toISOString();
@@ -1111,7 +1130,7 @@ async function recordStageFailure(stage, failure, now) {
   return next;
 }
 async function forgetStage(id) {
-  await rm(fileOf(id), { force: true });
+  await rm2(fileOf(id), { force: true });
 }
 async function listPendingStages() {
   let names;
@@ -1309,7 +1328,7 @@ async function moveIntoAccount(stage) {
     }
   );
   if (present) return false;
-  await rename2(join6(legacyOutboxDir(), stage.id + ".json"), target);
+  await rename3(join6(legacyOutboxDir(), stage.id + ".json"), target);
   await writePendingStage({ ...stage, credentialFingerprint: accountBinding().credential });
   return true;
 }
@@ -1342,7 +1361,7 @@ async function adoptUnownedProof(id) {
 }
 async function discardUnownedProof(id) {
   await findUnowned(id);
-  await rm2(join6(legacyOutboxDir(), id + ".json"));
+  await rm3(join6(legacyOutboxDir(), id + ".json"));
 }
 
 // src/account.ts
@@ -1450,10 +1469,10 @@ async function manualSave(identity, prepare, send) {
       if (error.code !== "ENOENT") throw error;
       const body = await prepare();
       if (body === null) return null;
-      saved = { id, body, key: randomUUID3(), savedAt: Date.now() };
-      const temp = fileOf2(id) + "." + randomUUID3() + ".tmp";
+      saved = { id, body, key: randomUUID4(), savedAt: Date.now() };
+      const temp = fileOf2(id) + "." + randomUUID4() + ".tmp";
       await writeFile4(temp, JSON.stringify(saved), { mode: 384, flag: "wx" });
-      await rename3(temp, fileOf2(id));
+      await rename4(temp, fileOf2(id));
     }
     if (Date.now() - saved.savedAt >= RECEIPT_MS) {
       throw new Error(
@@ -4232,7 +4251,7 @@ async function adoptLegacyJournals(fromDir, extendStart, now = Date.now()) {
     try {
       events = text2.split("\n").filter((line) => line.trim() !== "").map((line) => currentFormOf(line, journal.from));
     } catch {
-      await rename4(journal.from, journal.from + ".unreadable");
+      await rename5(journal.from, journal.from + ".unreadable");
       continue;
     }
     for (const event of events) earliest = Math.min(earliest, Date.parse(event.at));
@@ -4244,17 +4263,17 @@ async function adoptLegacyJournals(fromDir, extendStart, now = Date.now()) {
     const target = join8(sessionsDir(), journal.name + ADOPTED);
     await writeFile5(target + ".partial", copy, { mode: 384 });
     await utimes(target + ".partial", journal.modified, journal.modified);
-    await rename4(target + ".partial", target);
+    await rename5(target + ".partial", target);
     sources[journal.name] = { size: journal.size, mtimeMs: journal.mtimeMs };
   }
   for (const journal of await legacyJournals(fromDir, now)) {
     if (!journal.expired || !unchanged(journal, sources)) continue;
-    await rm3(journal.from, { force: true });
+    await rm4(journal.from, { force: true });
     delete sources[journal.name];
   }
   const manifest = join8(sessionsDir(), SOURCES);
   await writeFile5(manifest + ".partial", JSON.stringify(sources), { mode: 384 });
-  await rename4(manifest + ".partial", manifest);
+  await rename5(manifest + ".partial", manifest);
   try {
     await rmdir(fromDir);
   } catch (error) {
@@ -4368,9 +4387,9 @@ async function pruneOldSessions(now) {
     if (!retiring && now.getTime() - await lastWritten(path) <= RETENTION_MS) continue;
     if (!retiring && await lastWritten(join8(legacySessionsDir(), name)) !== -Infinity) continue;
     if (!retiring) await writeFile5(path + RETIRED, "", { mode: 384 });
-    await rm3(path, { force: true });
-    await rm3(path + ADOPTED, { force: true });
-    await rm3(path + RETIRED, { force: true });
+    await rm4(path, { force: true });
+    await rm4(path + ADOPTED, { force: true });
+    await rm4(path + RETIRED, { force: true });
   }
 }
 async function handleHook(agent, raw, prune, now = currentMoment()) {
@@ -4525,7 +4544,7 @@ function ownedParts(start, end, cut, periods) {
     return part.ms > 0 ? [part] : [];
   });
 }
-function measureRecordedTime(events, now, periods) {
+function measureRecordedTime(events, now, periods, observedTurnId) {
   const first = events.find((event) => event.event === "session" || event.event === "start");
   if (!first || first.event !== "session" && first.event !== "start") return null;
   const nowPoint = { wall: now.at.getTime(), up: now.up };
@@ -4572,7 +4591,7 @@ function measureRecordedTime(events, now, periods) {
         break;
     }
   }
-  if (open2) turns.push({ start: open2.start, end: open2.last });
+  if (open2) turns.push({ start: open2.start, end: observedTurnId !== void 0 && observedTurnId === open2.turnId ? nowPoint : open2.last });
   const stagedCut = lastStage ? cutOf(lastStage) : null;
   const counted = turns.flatMap(
     ({ start, end }) => ownedParts(start, end.wall > nowPoint.wall ? nowPoint : end, stagedCut, periods)
@@ -4653,17 +4672,23 @@ function missedTurnEvents(events, turns, owner, now, lastWake) {
   }
   return added;
 }
-async function stageTime(sessionId, now) {
+async function stageTime(sessionId, now, observation) {
   const events = await readEventsAt(sessionFile(sessionId));
   if (!events) return null;
   const owner = events.find(
     (event) => event.event === "session" || event.event === "start"
   );
-  if (owner?.agent !== "codex") return measureRecordedTime(events, now, signedInPeriods());
+  if (owner?.agent !== "codex") {
+    const latestStart = events.filter((event) => event.event === "start").at(-1);
+    const observedTurn2 = observation === "active-turn" && latestStart?.event === "start" ? latestStart.turnId : void 0;
+    return measureRecordedTime(events, now, signedInPeriods(), observedTurn2);
+  }
   const file = await codexTurnsOf(sessionId, transcriptPathOf(events));
   if (file === null) return measureRecordedTime(events, now, signedInPeriods());
   const added = missedTurnEvents(events, file.turns, owner, now, lastWakeMs());
-  return measureRecordedTime(byTime([...events, ...added]), now, signedInPeriods());
+  const latestTurn = file.turns.at(-1);
+  const observedTurn = observation === "codex-env" && latestTurn?.endedAt === null ? latestTurn.turnId : void 0;
+  return measureRecordedTime(byTime([...events, ...added]), now, signedInPeriods(), observedTurn);
 }
 async function promptReminder(sessionId, cwd, now) {
   const link2 = await readLink(cwd);
@@ -4969,7 +4994,8 @@ async function resolveStageOptions(options, cwd, now) {
   let { minutes, startedAt } = options;
   let recorded = null;
   if (minutes === void 0 && startedAt === void 0) {
-    recorded = session.sessionId ? await stageTime(session.sessionId, now) : null;
+    const observation = session.source === "codex-env" || session.source === "flag" && session.sessionId === process.env.CODEX_THREAD_ID ? "codex-env" : session.source === "active-turn" ? "active-turn" : void 0;
+    recorded = session.sessionId ? await stageTime(session.sessionId, now, observation) : null;
     if (!recorded) {
       throw new Error(
         "No recorded agent time for this session. If the session hooks are not installed, run `flowmind hooks install`; for this session, pass --minutes and --started-at."
@@ -5683,9 +5709,9 @@ var logCommand = new Command3("log").description("Log time with natural language
 });
 
 // src/commands/hooks.ts
-import { createHash as createHash6, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash6, randomUUID as randomUUID5 } from "node:crypto";
 import { realpathSync } from "node:fs";
-import { readFile as readFile7, link, lstat, mkdir as mkdir6, rename as rename5, rm as rm4, writeFile as writeFile6 } from "node:fs/promises";
+import { readFile as readFile7, link, lstat, mkdir as mkdir6, rename as rename6, rm as rm5, writeFile as writeFile6 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname3, join as join9 } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -5887,7 +5913,7 @@ async function updateHookFile(agent, action, base) {
   if (info && !info.isFile()) throw new Error("Unsupported hook settings file: " + path);
   const changed = () => new Error(path + " changed while Flowmind was updating it. Nothing was written; run the command again.");
   const removeFile = agent === "codex" && action === "uninstall" && Object.keys(next).length === 0;
-  const temporary = path + "." + randomUUID4() + ".tmp";
+  const temporary = path + "." + randomUUID5() + ".tmp";
   if (!removeFile) await writeFile6(temporary, serialize(next), { mode: info ? info.mode & 511 : 384, flag: "wx" });
   try {
     let onDisk;
@@ -5898,7 +5924,7 @@ async function updateHookFile(agent, action, base) {
       onDisk = null;
     }
     if (onDisk !== text2) throw changed();
-    if (removeFile) await rm4(path);
+    if (removeFile) await rm5(path);
     else if (text2 === null) {
       try {
         await link(temporary, path);
@@ -5906,9 +5932,9 @@ async function updateHookFile(agent, action, base) {
         if (error.code === "EEXIST") throw changed();
         throw error;
       }
-    } else await rename5(temporary, path);
+    } else await rename6(temporary, path);
   } finally {
-    await rm4(temporary, { force: true });
+    await rm5(temporary, { force: true });
   }
 }
 async function bundledSkill() {
@@ -5962,8 +5988,8 @@ hooksCommand.command("install").description(
         if (options.dryRun) {
           console.log(terminalLine`Would remove ${copy.path} and ${copy.markerPath}: ${reason}`);
         } else {
-          await rm4(copy.path);
-          await rm4(copy.markerPath);
+          await rm5(copy.path);
+          await rm5(copy.markerPath);
           console.log(terminalLine`Removed ${copy.path} and ${copy.markerPath}: ${reason}`);
         }
       } else if (copy.state === "absent") {
@@ -6034,9 +6060,9 @@ hooksCommand.command("uninstall").description("Remove unmodified Flowmind-manage
         console.log(terminalLine`Left ${target.state} ${target.path}`);
         continue;
       }
-      await rm4(target.path);
+      await rm5(target.path);
       console.log(terminalLine`Removed ${target.path}`);
-      await rm4(target.markerPath);
+      await rm5(target.markerPath);
       console.log(terminalLine`Removed ${target.markerPath}`);
     }
     for (const agent of agents) {
@@ -8017,7 +8043,7 @@ for (const [name, description, done] of [
 
 // src/index.ts
 var program = new Command12();
-program.name("flowmind").description("Flowmind CLI (also installed as fm)").version("0.3.10").enablePositionalOptions();
+program.name("flowmind").description("Flowmind CLI (also installed as fm)").version("0.3.11").enablePositionalOptions();
 program.addCommand(agentCommand);
 program.addCommand(authCommand);
 program.addCommand(logCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowmind/cli",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Flowmind CLI: log what you and your coding agents ship, with the outcome and the link that proves it. Works with Codex and Claude Code.",
   "license": "MIT",
   "keywords": [