agentosity 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentosity",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Agentosity — AI-native is a number now. Automatic attendance for your AI agents (stdio MCP lifecycle + activity probes) + human clock-out CLI.",
   "type": "module",
   "bin": {

package/src/probes.js

@@ -1,7 +1,8 @@
-import { readdirSync, statSync, openSync, readSync, closeSync, fstatSync } from "node:fs";
+import { readdirSync, statSync, openSync, readSync, closeSync, fstatSync, existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { execFileSync } from "node:child_process";
+import { createHash } from "node:crypto";
 
 /**
  * 活跃度探针:回答"此刻 Agent 是否在干活"。
@@ -18,6 +19,7 @@ export function detectHarness(clientInfo) {
   if (n.includes("gemini")) return "gemini-cli";
   if (n.includes("cursor")) return "cursor";
   if (n.includes("cline")) return "cline";
+  if (n.includes("opencode")) return "opencode";
   return n || "unknown";
 }
 
@@ -38,30 +40,66 @@ function codexSessionDir() {
   );
 }
 
+/** Gemini CLI:~/.gemini/tmp/<sha256(cwd)>/ 下的日志文件 */
+function geminiSessionDir() {
+  const hash = createHash("sha256").update(process.cwd()).digest("hex");
+  return join(homedir(), ".gemini", "tmp", hash);
+}
+
+/**
+ * 各 harness 的探针配置:
+ * - dir:目录内找"我们这个会话"的文件(新建或最近在写的)
+ * - file:固定文件,直接看 mtime(全局共享,精度低一档但胜过没有)
+ * - tail:文件是 jsonl 时才解析尾巴的在途工具调用
+ */
+const PROBE_TARGETS = {
+  "claude-code": { dir: claudeSessionDir, ext: ".jsonl", tail: true },
+  codex: { dir: codexSessionDir, ext: ".jsonl", tail: true },
+  "gemini-cli": { dir: geminiSessionDir, ext: "", tail: false },
+  opencode: {
+    file: () => join(homedir(), ".local", "share", "opencode", "opencode.db-wal"),
+    tail: false,
+  },
+};
+
 export function createProbe(harness, processStartMs) {
+  const target = PROBE_TARGETS[harness];
   const state = {
     kind: "none",
     file: null,
+    tail: target?.tail ?? false,
     lastMtimeMs: 0,
     lastWriteAt: 0,
+    baselineChildren: null, // harness 的常驻子进程基线(其他 MCP server 等),它们在 ≠ 在干活
   };
 
-  const dirOf = { "claude-code": claudeSessionDir, codex: codexSessionDir }[harness];
-
   function bindFile() {
-    if (state.file || !dirOf) return;
+    if (state.file || !target) return;
     try {
-      const dir = dirOf();
+      if (target.file) {
+        const p = target.file();
+        if (!existsSync(p)) return;
+        const st = statSync(p);
+        state.file = p;
+        state.kind = "file-mtime";
+        state.lastMtimeMs = st.mtimeMs;
+        state.lastWriteAt = Date.now();
+        return;
+      }
+      const dir = target.dir();
       const candidates = readdirSync(dir)
-        .filter((f) => f.endsWith(".jsonl"))
+        .filter((f) => (target.ext ? f.endsWith(target.ext) : true))
         .map((f) => {
           const p = join(dir, f);
           const st = statSync(p);
+          if (!st.isFile()) return null;
           return { p, birth: st.birthtimeMs || st.ctimeMs, mtime: st.mtimeMs };
         })
-        // 会话文件在首条消息时才创建,允许比进程启动早 2 分钟(时钟偏差)之后的任何时间
-        .filter((c) => c.birth >= processStartMs - 120_000)
-        .sort((a, b) => b.birth - a.birth);
+        .filter(Boolean)
+        // 会话文件可能是新建的(新会话),也可能是续用的老文件(resume):
+        // 新建:创建时间在进程启动前后;续用:进程启动后仍在被写入
+        .filter((c) => c.birth >= processStartMs - 120_000 || c.mtime >= processStartMs - 5_000)
+        .sort((a, b) => b.mtime - a.mtime);
       if (candidates.length > 0) {
         state.file = candidates[0].p;
         state.kind = "file-mtime";
@@ -90,9 +128,9 @@ export function createProbe(harness, processStartMs) {
     }
   }
 
-  /** 信号 2:尾巴状态 — 最后一个事件是发起工具调用且尚无结果 → 工具在途 */
+  /** 信号 2:尾巴状态 — 最后一个事件是发起工具调用且尚无结果 → 工具在途(仅 jsonl) */
   function toolInFlight() {
-    if (!state.file) return false;
+    if (!state.file || !state.tail) return false;
     try {
       const fd = openSync(state.file, "r");
       const size = fstatSync(fd).size;
@@ -112,18 +150,30 @@ export function createProbe(harness, processStartMs) {
     }
   }
 
-  /** 信号 3:harness(父进程)有除本进程外的子进程在跑(长工具调用) */
+  /** 信号 3:harness(父进程)出现了基线之外的新子进程(= 工具调用在跑)。
+   *  基线 = 探针启动时已存在的子进程(自己和其他常驻 MCP server),它们一直在,不代表在干活。 */
   function childActive() {
     try {
       const out = execFileSync("pgrep", ["-P", String(process.ppid)], {
         encoding: "utf8",
         timeout: 3000,
       });
-      const others = out
-        .split("\n")
-        .map((s) => parseInt(s, 10))
-        .filter((pid) => pid && pid !== process.pid);
-      return others.length > 0;
+      const current = new Set(
+        out
+          .split("\n")
+          .map((s) => parseInt(s, 10))
+          .filter((pid) => pid && pid !== process.pid)
+      );
+      if (state.baselineChildren === null) {
+        state.baselineChildren = current;
+        return false;
+      }
+      // 死掉的移出基线;有基线外的新面孔才算干活
+      state.baselineChildren = new Set([...state.baselineChildren].filter((p) => current.has(p)));
+      for (const p of current) {
+        if (!state.baselineChildren.has(p)) return true;
+      }
+      return false;
     } catch {
       return false; // pgrep 无匹配时 exit 1,也走这里 → 视为无子进程
     }