openryoko 2026.7.26 → 2026.8.5

package/dist/src/gateway/__tests__/notification-wake-delivery.test.js

@@ -0,0 +1,145 @@
+import { describe, it, expect, beforeAll, afterAll, vi } from "vitest";
+import fs from "node:fs";
+import http from "node:http";
+import os from "node:os";
+import path from "node:path";
+// Regression pin for issue #38 follow-up: a session woken by a notification
+// (detached job finished) runs on the gateway's connector-less web path. Its
+// final answer MUST come back to the original Slack channel/thread stored in
+// reply_context — the 2026-08-04 accident left an externally-shared customer
+// thread waiting on "生成中です" forever.
+//
+// RYOKO_HOME must point at a temp dir BEFORE any module import pulls in
+// shared/paths.js, so every module here is imported dynamically.
+process.env.RYOKO_HOME = fs.mkdtempSync(path.join(os.tmpdir(), "wake-test-home-"));
+const STUB_CONFIG = {
+    jinn: { version: "0.0.0" },
+    gateway: { port: 0, host: "127.0.0.1" },
+    engines: {
+        default: "claude",
+        claude: { bin: "claude", model: "" },
+        codex: { bin: "codex", model: "" },
+    },
+    connectors: {},
+    sessions: {},
+    logging: { level: "error", stdout: false, file: "" },
+};
+describe("notification wake-up delivers the reply to the origin connector", () => {
+    let server;
+    let baseUrl;
+    let replyMessage;
+    let sessionId;
+    beforeAll(async () => {
+        const { handleApiRequest } = await import("../api.js");
+        const { createSession } = await import("../../sessions/registry.js");
+        const { SessionManager } = await import("../../sessions/manager.js");
+        const engineRun = vi.fn(async () => ({
+            result: "資料が完成しました。アップロード済みです。",
+            sessionId: "engine-sess-1",
+            numTurns: 1,
+        }));
+        const mockEngine = { run: engineRun };
+        const engines = new Map([["claude", mockEngine]]);
+        const sessionManager = new SessionManager(STUB_CONFIG, engines, ["slack"]);
+        replyMessage = vi.fn(async () => "posted-ts");
+        const fakeSlack = {
+            name: "slack",
+            replyMessage,
+            addReaction: vi.fn(async () => { }),
+            getCapabilities: () => ({ threading: true, messageEdits: true, reactions: true, attachments: true }),
+            reconstructTarget: (rc) => ({
+                channel: typeof rc.channel === "string" ? rc.channel : "",
+                thread: typeof rc.thread === "string" ? rc.thread : undefined,
+                messageTs: typeof rc.messageTs === "string" ? rc.messageTs : undefined,
+            }),
+        };
+        const session = createSession({
+            engine: "claude",
+            source: "slack",
+            sourceRef: "C_EXTERNAL",
+            connector: "slack",
+            sessionKey: "slack:C_EXTERNAL:100.200",
+            replyContext: { channel: "C_EXTERNAL", thread: "100.200", messageTs: "100.300" },
+            transportMeta: { channelExternal: true },
+            prompt: "資料を作って",
+        });
+        sessionId = session.id;
+        const context = {
+            config: STUB_CONFIG,
+            getConfig: () => STUB_CONFIG,
+            sessionManager,
+            startTime: 0,
+            emit: () => { },
+            connectors: new Map([["slack", fakeSlack]]),
+        };
+        server = http.createServer((req, res) => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            handleApiRequest(req, res, context);
+        });
+        await new Promise((r) => server.listen(0, "127.0.0.1", r));
+        const addr = server.address();
+        baseUrl = typeof addr === "object" && addr ? `http://127.0.0.1:${addr.port}` : "";
+    });
+    afterAll(async () => {
+        await new Promise((resolve, reject) => server.close((e) => (e ? reject(e) : resolve())));
+        fs.rmSync(process.env.RYOKO_HOME, { recursive: true, force: true });
+    });
+    it("wakes the session and replies into the original channel/thread", async () => {
+        const res = await fetch(`${baseUrl}/api/sessions/${sessionId}/message`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({
+                message: '✅ Detached job "pdf-build" completed successfully (exit 0).',
+                role: "notification",
+            }),
+        });
+        expect(res.status).toBe(200);
+        // The engine run + delivery happen asynchronously after the 200.
+        await vi.waitFor(() => {
+            expect(replyMessage).toHaveBeenCalledTimes(1);
+        }, { timeout: 10_000 });
+        const [target, text] = replyMessage.mock.calls[0];
+        expect(target).toMatchObject({ channel: "C_EXTERNAL", thread: "100.200" });
+        expect(text).toBe("資料が完成しました。アップロード済みです。");
+    });
+    it("a duplicate dedupeKey does not enqueue a second turn (monitor retry after lost response)", async () => {
+        replyMessage.mockClear();
+        const body = JSON.stringify({
+            message: '✅ Detached job "dedupe-job" completed successfully (exit 0).',
+            role: "notification",
+            dedupeKey: "job:dedupe-job-1",
+        });
+        const first = await fetch(`${baseUrl}/api/sessions/${sessionId}/message`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body,
+        });
+        expect(first.status).toBe(200);
+        expect((await first.json()).status).toBe("queued");
+        const second = await fetch(`${baseUrl}/api/sessions/${sessionId}/message`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body,
+        });
+        expect(second.status).toBe(200);
+        expect((await second.json()).status).toBe("duplicate");
+        await vi.waitFor(() => {
+            expect(replyMessage).toHaveBeenCalledTimes(1); // one turn, one delivery
+        }, { timeout: 10_000 });
+        await new Promise((r) => setTimeout(r, 1000));
+        expect(replyMessage).toHaveBeenCalledTimes(1);
+    });
+    it("a plain user message on the web path does NOT auto-post to the connector", async () => {
+        replyMessage.mockClear();
+        const res = await fetch(`${baseUrl}/api/sessions/${sessionId}/message`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ message: "operator typing in web UI", role: "user" }),
+        });
+        expect(res.status).toBe(200);
+        // Give the async run time to complete, then confirm no connector post.
+        await new Promise((r) => setTimeout(r, 1500));
+        expect(replyMessage).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=notification-wake-delivery.test.js.map

package/dist/src/gateway/__tests__/notification-wake-delivery.test.js.map

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

package/dist/src/gateway/__tests__/notification-wake-restart.test.d.ts

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

package/dist/src/gateway/__tests__/notification-wake-restart.test.d.ts.map

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

package/dist/src/gateway/__tests__/notification-wake-restart.test.js

@@ -0,0 +1,97 @@
+import { describe, it, expect, beforeAll, afterAll, vi } from "vitest";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+// Gateway-restart recovery for notification wake-ups (issue #38 follow-up):
+// the job monitor got its 200 (message persisted + queue item enqueued) and
+// will never re-send. If the gateway dies before running the turn, the resume
+// pass must replay the queue item FOR CONNECTOR-ORIGIN SESSIONS TOO — and
+// with origin-connector delivery, or the customer thread stays silent.
+process.env.RYOKO_HOME = fs.mkdtempSync(path.join(os.tmpdir(), "wake-restart-home-"));
+const STUB_CONFIG = {
+    jinn: { version: "0.0.0" },
+    gateway: { port: 0, host: "127.0.0.1" },
+    engines: {
+        default: "claude",
+        claude: { bin: "claude", model: "" },
+        codex: { bin: "codex", model: "" },
+    },
+    connectors: {},
+    sessions: {},
+    logging: { level: "error", stdout: false, file: "" },
+};
+describe("resumePendingWebQueueItems — connector-origin notification wake-ups", () => {
+    let replyMessage;
+    let engineRun;
+    beforeAll(async () => {
+        const { resumePendingWebQueueItems } = await import("../api.js");
+        const { createSession, insertMessage, enqueueQueueItem } = await import("../../sessions/registry.js");
+        const { SessionManager } = await import("../../sessions/manager.js");
+        engineRun = vi.fn(async () => ({ result: "遅れましたが完成しました", sessionId: "es-1", numTurns: 1 }));
+        const engines = new Map([["claude", { run: engineRun }]]);
+        const sessionManager = new SessionManager(STUB_CONFIG, engines, ["slack"]);
+        replyMessage = vi.fn(async () => "ts");
+        const fakeSlack = {
+            name: "slack",
+            replyMessage,
+            addReaction: vi.fn(async () => { }),
+            getCapabilities: () => ({ threading: true, messageEdits: true, reactions: true, attachments: true }),
+            reconstructTarget: (rc) => ({
+                channel: typeof rc.channel === "string" ? rc.channel : "",
+                thread: typeof rc.thread === "string" ? rc.thread : undefined,
+            }),
+        };
+        // Simulate the pre-restart state the monitor left behind: notification
+        // message persisted + queue item pending, but no turn ever ran.
+        const wakeText = '✅ Detached job "pdf" completed successfully (exit 0).';
+        const slackSession = createSession({
+            engine: "claude",
+            source: "slack",
+            sourceRef: "C_CUST",
+            connector: "slack",
+            sessionKey: "slack:C_CUST:1.2",
+            replyContext: { channel: "C_CUST", thread: "1.2" },
+            transportMeta: { channelExternal: true },
+            prompt: "資料を作って",
+        });
+        insertMessage(slackSession.id, "notification", wakeText);
+        enqueueQueueItem(slackSession.id, slackSession.sessionKey, wakeText);
+        // Control: a connector session with a pending USER prompt must stay
+        // untouched (pre-existing behavior — the connector route owns it).
+        const userSession = createSession({
+            engine: "claude",
+            source: "slack",
+            sourceRef: "C_OTHER",
+            connector: "slack",
+            sessionKey: "slack:C_OTHER:9.9",
+            replyContext: { channel: "C_OTHER", thread: "9.9" },
+            prompt: "こんにちは",
+        });
+        insertMessage(userSession.id, "user", "続きをやって");
+        enqueueQueueItem(userSession.id, userSession.sessionKey, "続きをやって");
+        const context = {
+            config: STUB_CONFIG,
+            getConfig: () => STUB_CONFIG,
+            sessionManager,
+            startTime: 0,
+            emit: () => { },
+            connectors: new Map([["slack", fakeSlack]]),
+        };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        resumePendingWebQueueItems(context);
+    });
+    afterAll(() => {
+        fs.rmSync(process.env.RYOKO_HOME, { recursive: true, force: true });
+    });
+    it("replays the notification wake-up and delivers to the original thread", async () => {
+        await vi.waitFor(() => {
+            expect(replyMessage).toHaveBeenCalledTimes(1);
+        }, { timeout: 10_000 });
+        const [target, text] = replyMessage.mock.calls[0];
+        expect(target).toMatchObject({ channel: "C_CUST", thread: "1.2" });
+        expect(text).toBe("遅れましたが完成しました");
+        // Only the notification item ran — the user-prompt item was left alone.
+        expect(engineRun).toHaveBeenCalledTimes(1);
+    });
+});
+//# sourceMappingURL=notification-wake-restart.test.js.map

package/dist/src/gateway/__tests__/notification-wake-restart.test.js.map

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

package/dist/src/gateway/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/gateway/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,IAAI,WAAW,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMhF,OAAO,KAAK,EAAoC,UAAU,EAAmB,MAAM,oBAAoB,CAAC;AAExG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAoD7D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,UAAU,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAChE,wBAAwB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACrG;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAChG;;;;;;OAMG;IACH,2BAA2B,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC;;;;OAIG;IACH,gCAAgC,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9C;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,oBAAoB,EAAE,YAAY,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAgCpE;AAsLD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA+BnH;AA4CD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CAsnDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/gateway/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,IAAI,WAAW,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMhF,OAAO,KAAK,EAAoC,UAAU,EAAmB,MAAM,oBAAoB,CAAC;AAExG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAuD7D,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,UAAU,CAAC;IAC5B,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAChE,wBAAwB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IACrG;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAChG;;;;;;OAMG;IACH,2BAA2B,CAAC,EAAE,MAAM,IAAI,CAAC;IACzC;;;;OAIG;IACH,gCAAgC,CAAC,EAAE,MAAM,IAAI,CAAC;IAC9C;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,oBAAoB,EAAE,YAAY,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CA4CpE;AAoMD,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA+BnH;AA4CD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CAoqDf"}

package/dist/src/gateway/api.js

@@ -5,14 +5,16 @@ import path from "node:path";
 import yaml from "js-yaml";
 import { isInterruptibleEngine } from "../shared/types.js";
 import { buildContext } from "../sessions/context.js";
-import { initDb, listSessions, getSession, createSession, updateSession, deleteSession, deleteSessions, duplicateSession, insertMessage, getMessages, enqueueQueueItem, cancelQueueItem, getQueueItems, cancelAllPendingQueueItems, listAllPendingQueueItems, getFile, } from "../sessions/registry.js";
+import { initDb, listSessions, getSession, createSession, updateSession, deleteSession, deleteSessions, duplicateSession, insertMessage, getMessages, enqueueQueueItem, insertNotificationWithQueueItem, cancelQueueItem, getQueueItems, cancelAllPendingQueueItems, listAllPendingQueueItems, getFile, } from "../sessions/registry.js";
 import { forkEngineSession } from "../sessions/fork.js";
+import { deliverToOriginConnector, isUndeliveredToOrigin, recordFailedOriginDelivery } from "../sessions/origin-delivery.js";
 import { CONFIG_PATH, CRON_RUNS, ORG_DIR, SKILLS_DIR, LOGS_DIR, TMP_DIR, FILES_DIR, } from "../shared/paths.js";
 import { logger } from "../shared/logger.js";
 import { getSttStatus, downloadModel, transcribe as sttTranscribe, resolveLanguages, WHISPER_LANGUAGES } from "../stt/stt.js";
 import { JINN_HOME } from "../shared/paths.js";
 import { handleHookPost, LOOPBACK as HOOK_LOOPBACK } from "./hook-endpoint.js";
 import { resolveEffort } from "../shared/effort.js";
+import { explicitThread } from "../shared/threading.js";
 import { effortLevelsForModel, invalidateModelRegistry } from "../shared/models.js";
 import { computeNextRetryDelayMs, computeRateLimitDeadlineMs, detectRateLimit } from "../shared/rateLimit.js";
 import { getClaudeExpectedResetAt, recordClaudeRateLimit } from "../shared/usageAwareness.js";
@@ -36,8 +38,20 @@ export function resumePendingWebQueueItems(context) {
             cancelQueueItem(item.id);
             continue;
         }
-        if (session.source !== "web")
-            continue;
+        // Connector-origin sessions normally get their runs from the connector
+        // route, EXCEPT notification wake-ups (detached jobs, child callbacks):
+        // the job monitor already got its 200 and will never re-send, so a
+        // restart here would strand the wake-up forever. Detect those by the
+        // persisted notification message matching the queued prompt and resume
+        // them with origin-connector delivery.
+        let deliverToConnector = false;
+        if (session.source !== "web") {
+            const messages = getMessages(session.id);
+            const match = [...messages].reverse().find((m) => m.content === item.prompt);
+            if (match?.role !== "notification")
+                continue;
+            deliverToConnector = true;
+        }
         session = maybeRevertEngineOverride(session);
         const config = context.getConfig();
         const engine = context.sessionManager.getEngine(session.engine);
@@ -48,7 +62,7 @@ export function resumePendingWebQueueItems(context) {
         }
         // Ensure the session is in a runnable state
         updateSession(session.id, { status: "running", lastActivity: new Date().toISOString(), lastError: null });
-        dispatchWebSessionRun(session, item.prompt, engine, config, context, { queueItemId: item.id });
+        dispatchWebSessionRun(session, item.prompt, engine, config, context, { queueItemId: item.id, deliverToConnector });
         resumed++;
     }
     if (resumed > 0) {
@@ -95,11 +109,24 @@ function maybeRevertEngineOverride(session) {
         lastError: null,
     }) ?? session;
 }
+// In-memory idempotency keys for notification wake-ups. The persisted-message
+// comparison in the /message handler covers gateway restarts; this map covers
+// the common case cheaply and caps unbounded growth by TTL pruning on write.
+const seenDedupeKeys = new Map();
+const DEDUPE_TTL_MS = 60 * 60 * 1000;
+function rememberDedupeKey(key) {
+    const now = Date.now();
+    for (const [k, t] of seenDedupeKeys) {
+        if (now - t > DEDUPE_TTL_MS)
+            seenDedupeKeys.delete(k);
+    }
+    seenDedupeKeys.set(key, now);
+}
 function dispatchWebSessionRun(session, prompt, engine, config, context, opts) {
     const run = async () => {
         await context.sessionManager.getQueue().enqueue(session.sessionKey || session.sourceRef, async () => {
             context.emit("session:started", { sessionId: session.id });
-            await runWebSession(session, prompt, engine, config, context, opts?.attachments);
+            await runWebSession(session, prompt, engine, config, context, opts?.attachments, opts?.deliverToConnector);
         }, opts?.queueItemId);
     };
     const launch = () => {
@@ -739,12 +766,39 @@ export async function handleApiRequest(req, res, context) {
             // Allow internal callers (e.g. child session callbacks) to specify a non-user role
             const messageRole = body.role === "notification" ? "notification" : "user";
             const isNotification = messageRole === "notification";
+            // Notification wake-ups are a loopback-only mechanism (job monitors,
+            // child-session callbacks). A remote caller must not be able to wake an
+            // arbitrary session — the woken turn can post into its origin Slack
+            // conversation, so this would be a remote-to-customer-channel bridge.
+            if (isNotification && (!req.socket.remoteAddress || !HOOK_LOOPBACK.has(req.socket.remoteAddress))) {
+                return json(res, { error: "notification role is loopback-only" }, 403);
+            }
+            // Idempotency: a job monitor retries its wake-up when a response is
+            // lost after the gateway already accepted it. Same dedupeKey (+ an
+            // identical persisted notification, which survives restarts) → don't
+            // enqueue a second engine turn. The key is only REMEMBERED after the
+            // message + queue item are durably persisted below, so a failure
+            // before that point never turns the retry into a false duplicate.
+            const dedupeKey = typeof body.dedupeKey === "string" && body.dedupeKey.trim() ? body.dedupeKey.trim() : null;
+            const dedupedNotification = isNotification && dedupeKey !== null;
+            if (dedupedNotification) {
+                const duplicate = seenDedupeKeys.has(dedupeKey)
+                    || getMessages(session.id).some((m) => m.role === "notification" && m.content === prompt);
+                if (duplicate) {
+                    return json(res, { status: "duplicate", sessionId: session.id });
+                }
+            }
             const config = context.getConfig();
             const engine = context.sessionManager.getEngine(session.engine);
             if (!engine)
                 return serverError(res, `Engine "${session.engine}" not available`);
-            // Persist the message immediately
-            insertMessage(session.id, messageRole, prompt);
+            // Persist the message immediately. Deduped notifications defer this to
+            // the atomic message+queue-item write below — the duplicate check above
+            // treats "message exists" as "turn queued", so the two writes must
+            // never be separable by a crash.
+            if (!dedupedNotification) {
+                insertMessage(session.id, messageRole, prompt);
+            }
             // Emit notification event for UI display (renders as system banner, not user bubble)
             if (isNotification) {
                 context.emit("session:notification", { sessionId: session.id, message: prompt });
@@ -788,9 +842,20 @@ export async function handleApiRequest(req, res, context) {
             context.sessionManager.getQueue().clearCancelled(session.sessionKey || session.sourceRef || session.id);
             const attachmentPaths = resolveAttachmentPaths(body.attachments);
             const sessionKey = session.sessionKey || session.sourceRef || session.id;
-            const queueItemId = enqueueQueueItem(session.id, sessionKey, prompt);
+            const queueItemId = dedupedNotification
+                ? insertNotificationWithQueueItem(session.id, sessionKey, prompt)
+                : enqueueQueueItem(session.id, sessionKey, prompt);
+            if (dedupedNotification)
+                rememberDedupeKey(dedupeKey);
             context.emit("queue:updated", { sessionId: session.id, sessionKey });
-            dispatchWebSessionRun(session, prompt, engine, config, context, { queueItemId, attachments: attachmentPaths.length > 0 ? attachmentPaths : undefined });
+            dispatchWebSessionRun(session, prompt, engine, config, context, {
+                queueItemId,
+                attachments: attachmentPaths.length > 0 ? attachmentPaths : undefined,
+                // A notification wake-up (detached job finished, child callback) runs
+                // on this connector-less path; deliver the answer back to the origin
+                // conversation so e.g. a Slack thread is not left waiting silently.
+                deliverToConnector: isNotification,
+            });
             return json(res, { status: "queued", sessionId: session.id });
         }
         // GET /api/cron
@@ -1464,11 +1529,18 @@ Handle this as a priority request from a colleague.`;
             const target = body.target;
             let messageId;
             switch (action) {
-                case "sendMessage":
+                case "sendMessage": {
                     if (!target || !body.text)
                         return badRequest(res, "target and text are required");
-                    messageId = (await connector.sendMessage(target, body.text));
+                    // Same contract as /send: an explicit thread on the target means a
+                    // thread reply. Connectors' sendMessage historically dropped
+                    // target.thread, landing "thread replies" bare in the channel (#6).
+                    const proxyThread = explicitThread(target.thread);
+                    messageId = proxyThread
+                        ? (await connector.replyMessage({ ...target, thread: proxyThread }, body.text))
+                        : (await connector.sendMessage(target, body.text));
                     break;
+                }
                 case "replyMessage":
                     if (!target || !body.text)
                         return badRequest(res, "target and text are required");
@@ -1512,9 +1584,9 @@ Handle this as a priority request from a colleague.`;
             const body = _parsed.body;
             if (!body.channel || !body.text)
                 return badRequest(res, "channel and text are required");
-            const hasThread = typeof body.thread === "string" && body.thread.trim().length > 0;
-            const target = { channel: body.channel, thread: body.thread };
-            if (hasThread) {
+            const thread = explicitThread(body.thread);
+            const target = { channel: body.channel, thread };
+            if (thread) {
                 await connector.replyMessage(target, body.text);
             }
             else {
@@ -2048,7 +2120,12 @@ function loadTranscriptMessages(engineSessionId) {
     }
     return [];
 }
-async function runWebSession(session, prompt, engine, config, context, attachments) {
+async function runWebSession(session, prompt, engine, config, context, attachments, 
+/** Deliver the final answer to the session's origin connector (Slack thread
+ *  etc.). Set for notification-triggered wake-ups: this run path has no
+ *  connector of its own, so without explicit delivery a woken Slack session
+ *  would compute its reply and post it nowhere (issue #38 follow-up). */
+deliverToConnector) {
     const currentSession = getSession(session.id);
     if (!currentSession) {
         logger.info(`Skipping deleted web session ${session.id} before run start`);
@@ -2083,6 +2160,13 @@ async function runWebSession(session, prompt, engine, config, context, attachmen
             connectors: Array.from(context.connectors.keys()),
             config,
             sessionId: currentSession.id,
+            // Interactive PTY survives across turns; everything else is a one-shot
+            // process whose background tasks die at turn end (#38).
+            processLifetime: currentSession.engine === "claude" &&
+                config.engines.claude?.interactive === true &&
+                !employee?.sshHost
+                ? "persistent"
+                : "one-shot",
             hierarchy: orgHierarchy,
         });
         const engineConfig = currentSession.engine === "codex"
@@ -2245,6 +2329,11 @@ async function runWebSession(session, prompt, engine, config, context, attachmen
                     });
                     if (completedFallback) {
                         notifyParentSession(completedFallback, { result: fallbackResult.result, error: fallbackResult.error ?? null, cost: fallbackResult.cost, durationMs: fallbackResult.durationMs }, { alwaysNotify: employee?.alwaysNotify });
+                        if (deliverToConnector && fallbackResult.result && !fallbackResult.error) {
+                            const delivery = await deliverToOriginConnector(completedFallback, fallbackResult.result, context.connectors);
+                            if (isUndeliveredToOrigin(delivery, completedFallback))
+                                recordFailedOriginDelivery(completedFallback, context.emit);
+                        }
                     }
                     context.emit("session:completed", {
                         sessionId: currentSession.id,
@@ -2360,6 +2449,11 @@ async function runWebSession(session, prompt, engine, config, context, attachmen
                         notifyRateLimitResumed(completedAfterRetry);
                         notifyDiscordChannel(`✅ Claude usage limit cleared. Session ${currentSession.id}${currentSession.employee ? ` (${currentSession.employee})` : ""} resumed.`);
                         notifyParentSession(completedAfterRetry, { result: retryResult.result, error: retryResult.error ?? null, cost: retryResult.cost, durationMs: retryResult.durationMs }, { alwaysNotify: employee?.alwaysNotify });
+                        if (deliverToConnector && retryResult.result && !retryResult.error) {
+                            const delivery = await deliverToOriginConnector(completedAfterRetry, retryResult.result, context.connectors);
+                            if (isUndeliveredToOrigin(delivery, completedAfterRetry))
+                                recordFailedOriginDelivery(completedAfterRetry, context.emit);
+                        }
                     }
                     context.emit("session:completed", {
                         sessionId: currentSession.id,
@@ -2416,6 +2510,11 @@ async function runWebSession(session, prompt, engine, config, context, attachmen
         }
         if (completedSession) {
             notifyParentSession(completedSession, { result: result.result, error: result.error ?? null, cost: result.cost, durationMs: result.durationMs }, { alwaysNotify: employee?.alwaysNotify });
+            if (deliverToConnector && result.result && !result.error) {
+                const delivery = await deliverToOriginConnector(completedSession, result.result, context.connectors);
+                if (isUndeliveredToOrigin(delivery, completedSession))
+                    recordFailedOriginDelivery(completedSession, context.emit);
+            }
         }
         context.emit("session:completed", {
             sessionId: currentSession.id,