agenthub-multiagent-mcp 1.76.0 → 1.76.1

package/dist/currentCaptureSession.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Which coding session is this agent's work being captured into, if any
+ * (add-session-report-numbers).
+ *
+ * `session_close_report` attaches the answer when its caller did not pass a
+ * `session_id`, so a report from a captured session links to that session and
+ * shows its `s-YYYYMMDD-NNN` beside the report's own `h-` number. Before this,
+ * the `/close-session` skill never passed one, so no report ever linked.
+ *
+ * Two places can know, mirroring the two capture paths in session-capture.sh:
+ *
+ *  1. A daemon shift: the daemon opens the session and stamps
+ *     `AGENTHUB_SESSION_ID` into the shift's environment, which this MCP
+ *     process inherits.
+ *  2. An interactive session whose owner consented: the capture hook resolves
+ *     a session per Claude Code session id and caches it beside the grant file
+ *     (`<dir of grant>/agenthub-capture-state/<claude session id>.json`). The
+ *     Claude session id is read from the activity marker the PostToolUse hook
+ *     writes.
+ *
+ * Anything else — no capture, consent refused, a missing or unreadable file —
+ * answers `undefined`, and the report is filed without a session, exactly as
+ * before. This never throws and never calls the network.
+ */
+export interface CurrentCaptureSessionOptions {
+    env?: NodeJS.ProcessEnv;
+    workingDir?: string | null;
+    homeDir?: string;
+}
+export declare function currentCaptureSessionId(opts?: CurrentCaptureSessionOptions): string | undefined;
+//# sourceMappingURL=currentCaptureSession.d.ts.map

package/dist/currentCaptureSession.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"currentCaptureSession.d.ts","sourceRoot":"","sources":["../src/currentCaptureSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,MAAM,WAAW,4BAA4B;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,GAAE,4BAAiC,GAAG,MAAM,GAAG,SAAS,CA8BnG"}

package/dist/currentCaptureSession.js

@@ -0,0 +1,54 @@
+/**
+ * Which coding session is this agent's work being captured into, if any
+ * (add-session-report-numbers).
+ *
+ * `session_close_report` attaches the answer when its caller did not pass a
+ * `session_id`, so a report from a captured session links to that session and
+ * shows its `s-YYYYMMDD-NNN` beside the report's own `h-` number. Before this,
+ * the `/close-session` skill never passed one, so no report ever linked.
+ *
+ * Two places can know, mirroring the two capture paths in session-capture.sh:
+ *
+ *  1. A daemon shift: the daemon opens the session and stamps
+ *     `AGENTHUB_SESSION_ID` into the shift's environment, which this MCP
+ *     process inherits.
+ *  2. An interactive session whose owner consented: the capture hook resolves
+ *     a session per Claude Code session id and caches it beside the grant file
+ *     (`<dir of grant>/agenthub-capture-state/<claude session id>.json`). The
+ *     Claude session id is read from the activity marker the PostToolUse hook
+ *     writes.
+ *
+ * Anything else — no capture, consent refused, a missing or unreadable file —
+ * answers `undefined`, and the report is filed without a session, exactly as
+ * before. This never throws and never calls the network.
+ */
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { readActivityMarker } from "./activityMarker.js";
+export function currentCaptureSessionId(opts = {}) {
+    const env = opts.env ?? process.env;
+    const fromEnv = (env.AGENTHUB_SESSION_ID || "").trim();
+    if (fromEnv)
+        return fromEnv;
+    if (!opts.workingDir)
+        return undefined;
+    const claudeSessionId = readActivityMarker(opts.workingDir)?.session_id;
+    if (!claudeSessionId)
+        return undefined;
+    const grantPath = (env.AGENTHUB_CAPTURE_GRANT || "").trim() ||
+        path.join(opts.homeDir ?? os.homedir(), ".claude", "agenthub-capture.json");
+    // Same file name rule as session-capture.sh: os.sep replaced by "_".
+    const stateFile = path.join(path.dirname(grantPath), "agenthub-capture-state", claudeSessionId.split(path.sep).join("_") + ".json");
+    try {
+        const state = JSON.parse(fs.readFileSync(stateFile, "utf8"));
+        if (state.denied)
+            return undefined;
+        const id = typeof state.session_id === "string" ? state.session_id.trim() : "";
+        return id || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+//# sourceMappingURL=currentCaptureSession.js.map

package/dist/currentCaptureSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"currentCaptureSession.js","sourceRoot":"","sources":["../src/currentCaptureSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAQzD,MAAM,UAAU,uBAAuB,CAAC,OAAqC,EAAE;IAC7E,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAEpC,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAE5B,IAAI,CAAC,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IACvC,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxE,IAAI,CAAC,eAAe;QAAE,OAAO,SAAS,CAAC;IAEvC,MAAM,SAAS,GACb,CAAC,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;QACzC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,CAAC;IAC9E,qEAAqE;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CACzB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EACvB,wBAAwB,EACxB,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CACpD,CAAC;IACF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAG1D,CAAC;QACF,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QACnC,MAAM,EAAE,GAAG,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/E,OAAO,EAAE,IAAI,SAAS,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}

package/dist/currentCaptureSession.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=currentCaptureSession.test.d.ts.map

package/dist/currentCaptureSession.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"currentCaptureSession.test.d.ts","sourceRoot":"","sources":["../src/currentCaptureSession.test.ts"],"names":[],"mappings":""}

package/dist/currentCaptureSession.test.js

@@ -0,0 +1,55 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { currentCaptureSessionId } from "./currentCaptureSession.js";
+import { writeActivityMarker } from "./activityMarker.js";
+let tmp;
+let work;
+let grant;
+beforeEach(() => {
+    tmp = fs.mkdtempSync(path.join(os.tmpdir(), "agenthub-capsess-"));
+    work = path.join(tmp, "work");
+    fs.mkdirSync(work);
+    grant = path.join(tmp, "claude", "agenthub-capture.json");
+});
+afterEach(() => {
+    fs.rmSync(tmp, { recursive: true, force: true });
+});
+function writeState(claudeSid, state) {
+    const dir = path.join(path.dirname(grant), "agenthub-capture-state");
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(path.join(dir, `${claudeSid}.json`), JSON.stringify(state));
+}
+describe("currentCaptureSessionId", () => {
+    it("prefers AGENTHUB_SESSION_ID (a daemon shift)", () => {
+        writeActivityMarker(work, "editing", { session_id: "claude-1", transcript_path: "/t" });
+        writeState("claude-1", { session_id: "from-state" });
+        const env = { AGENTHUB_SESSION_ID: " shift-sess ", AGENTHUB_CAPTURE_GRANT: grant };
+        expect(currentCaptureSessionId({ env, workingDir: work })).toBe("shift-sess");
+    });
+    it("reads the capture hook's cached session for the current Claude session", () => {
+        writeActivityMarker(work, "editing", { session_id: "claude-1", transcript_path: "/t" });
+        writeState("claude-1", { session_id: "cs-uuid-1", notice_text: "x" });
+        expect(currentCaptureSessionId({ env: { AGENTHUB_CAPTURE_GRANT: grant }, workingDir: work })).toBe("cs-uuid-1");
+    });
+    it("answers nothing when capture was refused", () => {
+        writeActivityMarker(work, "editing", { session_id: "claude-1", transcript_path: "/t" });
+        writeState("claude-1", { denied: true, session_id: "stale" });
+        expect(currentCaptureSessionId({ env: { AGENTHUB_CAPTURE_GRANT: grant }, workingDir: work })).toBeUndefined();
+    });
+    it("answers nothing with no marker, no state file, or no working dir", () => {
+        expect(currentCaptureSessionId({ env: { AGENTHUB_CAPTURE_GRANT: grant }, workingDir: work })).toBeUndefined();
+        writeActivityMarker(work, "editing", { session_id: "claude-2", transcript_path: "/t" });
+        expect(currentCaptureSessionId({ env: { AGENTHUB_CAPTURE_GRANT: grant }, workingDir: work })).toBeUndefined();
+        expect(currentCaptureSessionId({ env: {}, workingDir: null })).toBeUndefined();
+    });
+    it("uses ~/.claude/agenthub-capture.json when no grant path is set", () => {
+        const home = path.join(tmp, "home");
+        grant = path.join(home, ".claude", "agenthub-capture.json");
+        writeActivityMarker(work, "editing", { session_id: "claude-3", transcript_path: "/t" });
+        writeState("claude-3", { session_id: "cs-home" });
+        expect(currentCaptureSessionId({ env: {}, workingDir: work, homeDir: home })).toBe("cs-home");
+    });
+});
+//# sourceMappingURL=currentCaptureSession.test.js.map

package/dist/currentCaptureSession.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"currentCaptureSession.test.js","sourceRoot":"","sources":["../src/currentCaptureSession.test.ts"],"names":[],"mappings":"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"}

package/dist/tools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,OAAO,EAAqD,MAAM,cAAc,CAAC;AAOrG,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAkH/D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,MAAM,CAAC;IAC5B,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,WAAW,CAAC;IACpC,oEAAoE;IACpE,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE;QAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB,KAAK,IAAI,CAAC;CACZ;AAED,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAyLD,wBAAgB,aAAa,IAAI,IAAI,EAAE,CAohGtC;AAqCD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC,CAwyFlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,OAAO,EAAqD,MAAM,cAAc,CAAC;AAOrG,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAmH/D,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,iBAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,MAAM,CAAC;IAC5B,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC;;;OAGG;IACH,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,WAAW,CAAC;IACpC,oEAAoE;IACpE,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE;QAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB,KAAK,IAAI,CAAC;CACZ;AAED,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAyLD,wBAAgB,aAAa,IAAI,IAAI,EAAE,CAohGtC;AAqCD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC,CA6yFlB"}

package/dist/tools/index.js

@@ -26,6 +26,7 @@ import * as path from "node:path";
 import { describeSendResult } from "../messageIdempotency.js";
 import { readZohoAttachments } from "../zohoAttachments.js";
 import { isUnknownSendOutcome, unknownSendOutcomeError } from "../zohoSendOutcome.js";
+import { currentCaptureSessionId } from "../currentCaptureSession.js";
 // fix-message-send-idempotency — shared by the four message tools.
 const IDEMPOTENCY_KEY_DESCRIPTION = "Optional. Leave unset: a key derived from the message content is sent, so " +
     "re-issuing this exact call (e.g. after a timeout) never delivers it twice. " +
@@ -2461,13 +2462,13 @@ export function registerTools() {
         // Session handoff tools (add-session-handoff)
         {
             name: "session_close_report",
-            description: "Upload a session-close handoff report to AgentHub. Call this at the end of every session after running the close-session skill. Shares what shipped + what the next session should pick up, so /start-session on the next run (any machine) can resume cleanly.",
+            description: "Upload a session-close handoff report to AgentHub. Call this at the end of every session after running the close-session skill. Shares what shipped + what the next session should pick up, so /start-session on the next run (any machine) can resume cleanly. The reply carries `display_number` (the report's own `h-YYYYMMDD-NNN`, always) and `session_display_number` (the captured coding session's `s-YYYYMMDD-NNN`, only when this session is captured).",
             inputSchema: {
                 type: "object",
                 properties: {
                     summary: { type: "string", description: "Markdown summary of what shipped this session" },
                     next_plan: { type: "string", description: "Markdown of what the next session should pick up" },
-                    session_id: { type: "string", description: "Optional session UUID or display number `s-YYYYMMDD-NNN` for upsert keying. Server resolves either form to the canonical UUID before storing." },
+                    session_id: { type: "string", description: "Optional session UUID or display number `s-YYYYMMDD-NNN` for upsert keying. Server resolves either form to the canonical UUID before storing. Omit it normally: when this session is being captured, the tool attaches the capture session itself." },
                     commits: {
                         type: "array",
                         description: "Commits pushed this session",
@@ -5348,8 +5349,12 @@ export async function handleToolCall(name, args, client, context) {
                 summary,
                 next_plan: nextPlan,
             };
-            if (args.session_id)
-                body.session_id = args.session_id;
+            // add-session-report-numbers: a caller's session_id wins; otherwise link
+            // the session this work is being captured into, when there is one.
+            const sessionId = args.session_id ||
+                currentCaptureSessionId({ workingDir: context.getWorkingDir() });
+            if (sessionId)
+                body.session_id = sessionId;
             if (args.commits)
                 body.commits = args.commits;
             if (args.open_threads)