Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat: unify the context key
Gusa463ff1d3e61
diff --git a/src/cli/commands/email.ts b/src/cli/commands/email.tsindex 38ad41258..c8c4178a6 100644--- a/src/cli/commands/email.ts+++ b/src/cli/commands/email.ts@@ -373,6 +373,7 @@ export function emailCommand(): Command {}}+ const conversationId = process.env.ALOOK_CONVERSATION_ID;const res = await client.postJSON<SendResponse>("/api/email/send", {agentId: opts.agent_id,to: opts.to,@@ -381,6 +382,7 @@ export function emailCommand(): Command {attachments,...(inReplyTo ? { inReplyTo, references } : {}),...(opts.from ? { from: opts.from } : {}),+ ...(conversationId ? { conversationId } : {}),});console.log(`Sent email to ${res.to_email} (id: ${res.id})`);} catch (err) {diff --git a/src/cli/daemon/execenv/__tests__/steering.test.ts b/src/cli/daemon/execenv/__tests__/steering.test.tsindex 5f745565c..05b588c21 100644--- a/src/cli/daemon/execenv/__tests__/steering.test.ts+++ b/src/cli/daemon/execenv/__tests__/steering.test.ts@@ -120,38 +120,38 @@ describe("steering", () => {describe("steering lock", () => {it("acquires and releases a steering lock", () => {- const acquired = acquireSteeringLock(baseDir, "email:<[email protected]>");+ const acquired = acquireSteeringLock(baseDir, "conv_thread");expect(acquired).toBe(true);- releaseSteeringLock(baseDir, "email:<[email protected]>");+ releaseSteeringLock(baseDir, "conv_thread");});it("cannot acquire the same lock twice", () => {- acquireSteeringLock(baseDir, "dm:conv_1");- const second = acquireSteeringLock(baseDir, "dm:conv_1");+ acquireSteeringLock(baseDir, "conv_1");+ const second = acquireSteeringLock(baseDir, "conv_1");expect(second).toBe(false);- releaseSteeringLock(baseDir, "dm:conv_1");+ releaseSteeringLock(baseDir, "conv_1");});it("can re-acquire after release", () => {- acquireSteeringLock(baseDir, "dm:conv_1");- releaseSteeringLock(baseDir, "dm:conv_1");+ acquireSteeringLock(baseDir, "conv_1");+ releaseSteeringLock(baseDir, "conv_1");- const reacquired = acquireSteeringLock(baseDir, "dm:conv_1");+ const reacquired = acquireSteeringLock(baseDir, "conv_1");expect(reacquired).toBe(true);- releaseSteeringLock(baseDir, "dm:conv_1");+ releaseSteeringLock(baseDir, "conv_1");});it("different context keys do not conflict", () => {- const first = acquireSteeringLock(baseDir, "dm:conv_1");- const second = acquireSteeringLock(baseDir, "dm:conv_2");+ const first = acquireSteeringLock(baseDir, "conv_1");+ const second = acquireSteeringLock(baseDir, "conv_2");expect(first).toBe(true);expect(second).toBe(true);- releaseSteeringLock(baseDir, "dm:conv_1");- releaseSteeringLock(baseDir, "dm:conv_2");+ releaseSteeringLock(baseDir, "conv_1");+ releaseSteeringLock(baseDir, "conv_2");});});});diff --git a/src/cli/daemon/execenv/__tests__/timeline.test.ts b/src/cli/daemon/execenv/__tests__/timeline.test.tsindex bd71cb31a..5c317ea8a 100644--- a/src/cli/daemon/execenv/__tests__/timeline.test.ts+++ b/src/cli/daemon/execenv/__tests__/timeline.test.ts@@ -13,7 +13,6 @@ import {initEntry,updateEntry,createTimelineEntry,- findResumableSessionId,findResumableSessionByContextKey,findRunningPidByTaskId,findRunningEntryByContextKey,@@ -245,275 +244,23 @@ describe("timeline", () => {expect(todayEntries.agent_responses).toEqual([]);});- describe("findResumableSessionId", () => {- function writeEntry(filename: string, entry: ContextTimelineEntry) {- const filePath = join(dir, filename);- let existing = "";- try { existing = readFileSync(filePath, "utf-8"); } catch { /* new file */ }- writeFileSync(filePath, existing + JSON.stringify(entry) + "\n");- }-- function makeEntry(overrides: Partial<ContextTimelineEntry>): ContextTimelineEntry {- return {- task_id: "t_1",- context_key: null,- session_id: null,- pid: null,- status: "running",- datetime: new Date().toISOString(),- type: "user_dm_message",- prompt: "test",- agent_responses: [],- errmsg: null,- provider: "claude",- ...overrides,- };- }-- it("returns session_id from a completed entry of matching type within 3h", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_1",- status: "completed",- session_id: "sess_abc",- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_abc");- });-- it("returns null when no entries exist", () => {- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBeNull();- });-- it("returns null when no timeline files exist", () => {- rmSync(dir, { recursive: true, force: true });- mkdirSync(dir, { recursive: true });- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBeNull();- });-- it("returns null when the latest completed entry is older than 3h", () => {- const fourHoursAgo = new Date(Date.now() - 4 * 60 * 60 * 1000);- writeEntry(_todayFilename(), makeEntry({- task_id: "t_old",- status: "completed",- session_id: "sess_old",- datetime: fourHoursAgo.toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBeNull();- });-- it("returns null when session_id is null on the entry", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_nosess",- status: "completed",- session_id: null,- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBeNull();- });-- it("skips running entries but resumes from failed/killed/completed", () => {- const threeMinAgo = new Date(Date.now() - 3 * 60 * 1000);- const twoMinAgo = new Date(Date.now() - 2 * 60 * 1000);- const oneMinAgo = new Date(Date.now() - 1 * 60 * 1000);-- writeEntry(_todayFilename(), makeEntry({- task_id: "t_completed",- status: "completed",- session_id: "sess_completed",- datetime: threeMinAgo.toISOString(),- }));- writeEntry(_todayFilename(), makeEntry({- task_id: "t_running",- status: "running",- session_id: null,- datetime: oneMinAgo.toISOString(),- }));- writeEntry(_todayFilename(), makeEntry({- task_id: "t_failed",- status: "failed",- session_id: "sess_failed",- datetime: twoMinAgo.toISOString(),- }));-- // Most recent non-running entry with a session_id wins (failed, 2min ago)- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_failed");- });-- it("resumes from killed sessions", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_killed",- status: "killed",- session_id: "sess_killed",- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_killed");- });-- it("searches across midnight boundary (yesterday's file)", () => {- const yesterday = new Date();- yesterday.setDate(yesterday.getDate() - 1);- const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000);-- writeEntry(_filenameForDate(yesterday), makeEntry({- task_id: "t_yesterday",- status: "completed",- session_id: "sess_yesterday",- datetime: twoHoursAgo.toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_yesterday");- });-- it("returns the latest match, not the first one in file order", () => {- const oneHourAgo = new Date(Date.now() - 1 * 60 * 60 * 1000);- const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000);-- writeEntry(_todayFilename(), makeEntry({- task_id: "t_older",- status: "completed",- session_id: "sess_older",- datetime: twoHoursAgo.toISOString(),- }));- writeEntry(_todayFilename(), makeEntry({- task_id: "t_newer",- status: "completed",- session_id: "sess_newer",- datetime: oneHourAgo.toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_newer");- });-- it("respects custom maxAgeMs parameter", () => {- const thirtyMinAgo = new Date(Date.now() - 30 * 60 * 1000);- writeEntry(_todayFilename(), makeEntry({- task_id: "t_recent",- status: "completed",- session_id: "sess_recent",- datetime: thirtyMinAgo.toISOString(),- }));-- // 10 minute window — entry is 30 min old, should not match- expect(findResumableSessionId(dir, "user_dm_message", "claude", 10 * 60 * 1000)).toBeNull();- // 60 minute window — entry is 30 min old, should match- expect(findResumableSessionId(dir, "user_dm_message", "claude", 60 * 60 * 1000)).toBe("sess_recent");- });-- it("does not match a different task type", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_1",- status: "completed",- session_id: "sess_dm",- type: "user_dm_message",- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "scheduled_check", "claude")).toBeNull();- });-- it("finds the latest entry across midnight boundary correctly", () => {- const yesterday = new Date();- yesterday.setDate(yesterday.getDate() - 1);- const ninetyMinAgo = new Date(Date.now() - 90 * 60 * 1000);- const thirtyMinAgo = new Date(Date.now() - 30 * 60 * 1000);-- // Yesterday's entry is older but still within 3h- writeEntry(_filenameForDate(yesterday), makeEntry({- task_id: "t_yesterday",- status: "completed",- session_id: "sess_yesterday",- datetime: ninetyMinAgo.toISOString(),- }));- // Today's entry is newer- writeEntry(_todayFilename(), makeEntry({- task_id: "t_today",- status: "completed",- session_id: "sess_today",- datetime: thirtyMinAgo.toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_today");- });-- it("createTimelineEntry includes provider field when provided", () => {+ describe("createTimelineEntry provider and context_key", () => {+ it("includes provider field when provided", () => {const entry = createTimelineEntry("t_p1", "test", "user_dm_message", "sess_1", 1234, "claude");expect(entry.provider).toBe("claude");});- it("createTimelineEntry sets provider to null when not provided (backward compat)", () => {+ it("sets provider to null when not provided (backward compat)", () => {const entry = createTimelineEntry("t_p2", "test", "user_dm_message", "sess_1", 1234);expect(entry.provider).toBeNull();});- it("returns session ID when latest completed entry has matching provider", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_match",- status: "completed",- session_id: "sess_match",- provider: "codex",- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "codex")).toBe("sess_match");+ it("includes context_key when provided", () => {+ const entry = createTimelineEntry("t_c1", "test", "user_dm_message", "sess_1", 1234, "claude", "conv_abc");+ expect(entry.context_key).toBe("conv_abc");});- it("returns null when latest completed entry has a different provider", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_diff",- status: "completed",- session_id: "sess_claude",- provider: "claude",- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "codex")).toBeNull();- });-- it("skips entries with provider null or undefined (old entries — backward compat)", () => {- writeEntry(_todayFilename(), makeEntry({- task_id: "t_old",- status: "completed",- session_id: "sess_old",- provider: null,- datetime: new Date().toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBeNull();- });-- it("finds correct session when multiple providers interleave in timeline", () => {- const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000);- const oneHourAgo = new Date(Date.now() - 1 * 60 * 60 * 1000);-- writeEntry(_todayFilename(), makeEntry({- task_id: "t_claude",- status: "completed",- session_id: "sess_claude",- provider: "claude",- datetime: twoHoursAgo.toISOString(),- }));- writeEntry(_todayFilename(), makeEntry({- task_id: "t_codex",- status: "completed",- session_id: "sess_codex",- provider: "codex",- datetime: oneHourAgo.toISOString(),- }));-- expect(findResumableSessionId(dir, "user_dm_message", "claude")).toBe("sess_claude");- expect(findResumableSessionId(dir, "user_dm_message", "codex")).toBe("sess_codex");- });-- it("createTimelineEntry includes context_key when provided", () => {- const entry = createTimelineEntry("t_c1", "test", "user_dm_message", "sess_1", 1234, "claude", "dm:conv_abc");- expect(entry.context_key).toBe("dm:conv_abc");- });-- it("createTimelineEntry sets context_key to null when not provided", () => {+ it("sets context_key to null when not provided", () => {const entry = createTimelineEntry("t_c2", "test", "user_dm_message");expect(entry.context_key).toBeNull();});@@ -620,11 +367,11 @@ describe("timeline", () => {task_id: "t_1",status: "completed",session_id: "sess_abc",- context_key: "dm:conv_1",+ context_key: "conv_1",datetime: new Date().toISOString(),}));- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "claude")).toBe("sess_abc");+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBe("sess_abc");});it("returns null when context_key does not match", () => {@@ -632,54 +379,65 @@ describe("timeline", () => {task_id: "t_1",status: "completed",session_id: "sess_abc",- context_key: "dm:conv_1",+ context_key: "conv_1",datetime: new Date().toISOString(),}));- expect(findResumableSessionByContextKey(dir, "dm:conv_2", "claude")).toBeNull();+ expect(findResumableSessionByContextKey(dir, "conv_2", "claude")).toBeNull();});it("returns null when no entries exist", () => {- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "claude")).toBeNull();+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBeNull();});- it("uses 3h max age for dm: context keys", () => {+ it("uses unified 72h max age for all context keys", () => {const fourHoursAgo = new Date(Date.now() - 4 * 60 * 60 * 1000);writeEntry(_todayFilename(), makeEntry({+ task_id: "t_4h",+ status: "completed",+ session_id: "sess_4h",+ context_key: "conv_1",+ datetime: fourHoursAgo.toISOString(),+ }));++ // 4 hours ago is within 72h — should match+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBe("sess_4h");+ });++ it("expires after 72h", () => {+ const seventyFourHoursAgo = new Date(Date.now() - 74 * 60 * 60 * 1000);+ writeEntry(_filenameForDate(seventyFourHoursAgo), makeEntry({task_id: "t_old",status: "completed",session_id: "sess_old",- context_key: "dm:conv_1",- datetime: fourHoursAgo.toISOString(),+ context_key: "conv_1",+ datetime: seventyFourHoursAgo.toISOString(),}));- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "claude")).toBeNull();+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBeNull();});- it("uses 48h max age for email: context keys", () => {+ it("does not use different max age for different context key types", () => {const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);+writeEntry(_todayFilename(), makeEntry({- task_id: "t_email",+ task_id: "t_dm",status: "completed",- session_id: "sess_email",- context_key: "email:<[email protected]>",+ session_id: "sess_dm",+ context_key: "conv_dm",datetime: twentyFourHoursAgo.toISOString(),}));-- expect(findResumableSessionByContextKey(dir, "email:<[email protected]>", "claude")).toBe("sess_email");- });-- it("email: context key expires after 48h", () => {- const fiftyHoursAgo = new Date(Date.now() - 50 * 60 * 60 * 1000);- writeEntry(_filenameForDate(fiftyHoursAgo), makeEntry({- task_id: "t_email_old",+ writeEntry(_todayFilename(), makeEntry({+ task_id: "t_email",status: "completed",- session_id: "sess_email_old",- context_key: "email:<[email protected]>",- datetime: fiftyHoursAgo.toISOString(),+ session_id: "sess_email",+ context_key: "conv_email",+ datetime: twentyFourHoursAgo.toISOString(),}));- expect(findResumableSessionByContextKey(dir, "email:<[email protected]>", "claude")).toBeNull();+ // Both 24h old — both within unified 72h window+ expect(findResumableSessionByContextKey(dir, "conv_dm", "claude")).toBe("sess_dm");+ expect(findResumableSessionByContextKey(dir, "conv_email", "claude")).toBe("sess_email");});it("filters by provider", () => {@@ -687,13 +445,13 @@ describe("timeline", () => {task_id: "t_1",status: "completed",session_id: "sess_claude",- context_key: "dm:conv_1",+ context_key: "conv_1",provider: "claude",datetime: new Date().toISOString(),}));- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "codex")).toBeNull();- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "claude")).toBe("sess_claude");+ expect(findResumableSessionByContextKey(dir, "conv_1", "codex")).toBeNull();+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBe("sess_claude");});it("returns the latest matching entry", () => {@@ -704,18 +462,18 @@ describe("timeline", () => {task_id: "t_older",status: "completed",session_id: "sess_older",- context_key: "dm:conv_1",+ context_key: "conv_1",datetime: twoHoursAgo.toISOString(),}));writeEntry(_todayFilename(), makeEntry({task_id: "t_newer",status: "completed",session_id: "sess_newer",- context_key: "dm:conv_1",+ context_key: "conv_1",datetime: oneHourAgo.toISOString(),}));- expect(findResumableSessionByContextKey(dir, "dm:conv_1", "claude")).toBe("sess_newer");+ expect(findResumableSessionByContextKey(dir, "conv_1", "claude")).toBe("sess_newer");});});@@ -801,29 +559,29 @@ describe("timeline", () => {task_id: "t_running",status: "running",pid: 12345,- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "claude",}));- const entry = findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude");+ const entry = findRunningEntryByContextKey(dir, "conv_thread", "claude");expect(entry).not.toBeNull();expect(entry!.task_id).toBe("t_running");expect(entry!.pid).toBe(12345);});it("returns null when no running entries exist", () => {- expect(findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude")).toBeNull();+ expect(findRunningEntryByContextKey(dir, "conv_thread", "claude")).toBeNull();});it("ignores non-running entries", () => {writeEntry(_todayFilename(), makeEntry({task_id: "t_done",status: "completed",- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "claude",}));- expect(findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude")).toBeNull();+ expect(findRunningEntryByContextKey(dir, "conv_thread", "claude")).toBeNull();});it("ignores different provider", () => {@@ -831,11 +589,11 @@ describe("timeline", () => {task_id: "t_codex",status: "running",pid: 22222,- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "codex",}));- expect(findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude")).toBeNull();+ expect(findRunningEntryByContextKey(dir, "conv_thread", "claude")).toBeNull();});it("ignores different context_key", () => {@@ -843,11 +601,11 @@ describe("timeline", () => {task_id: "t_other",status: "running",pid: 33333,- context_key: "email:<[email protected]>",+ context_key: "conv_other",provider: "claude",}));- expect(findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude")).toBeNull();+ expect(findRunningEntryByContextKey(dir, "conv_thread", "claude")).toBeNull();});it("returns the newest running entry for same context_key", () => {@@ -858,7 +616,7 @@ describe("timeline", () => {task_id: "t_older",status: "running",pid: 11111,- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "claude",datetime: twoMinAgo.toISOString(),}));@@ -866,12 +624,12 @@ describe("timeline", () => {task_id: "t_newer",status: "running",pid: 22222,- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "claude",datetime: oneMinAgo.toISOString(),}));- const entry = findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude");+ const entry = findRunningEntryByContextKey(dir, "conv_thread", "claude");expect(entry!.task_id).toBe("t_newer");});@@ -882,12 +640,12 @@ describe("timeline", () => {task_id: "t_old_running",status: "running",pid: 44444,- context_key: "email:<[email protected]>",+ context_key: "conv_thread",provider: "claude",datetime: threeDaysAgo.toISOString(),}));- const entry = findRunningEntryByContextKey(dir, "email:<[email protected]>", "claude");+ const entry = findRunningEntryByContextKey(dir, "conv_thread", "claude");expect(entry!.task_id).toBe("t_old_running");});@@ -900,7 +658,7 @@ describe("timeline", () => {provider: "claude",}));- expect(findRunningEntryByContextKey(dir, "dm:conv_1", "claude")).toBeNull();+ expect(findRunningEntryByContextKey(dir, "conv_1", "claude")).toBeNull();});});diff --git a/src/cli/daemon/execenv/index.ts b/src/cli/daemon/execenv/index.tsindex f723da945..61f8ef405 100644--- a/src/cli/daemon/execenv/index.ts+++ b/src/cli/daemon/execenv/index.ts@@ -38,4 +38,3 @@ export function prepare(}export { buildInstructionContent, writeInstructionFileIfChanged, ensureSymlinks, CANONICAL_FILE } from "./context.js";-export { findResumableSessionId } from "./timeline.js";diff --git a/src/cli/daemon/execenv/timeline.ts b/src/cli/daemon/execenv/timeline.tsindex 8383ce033..8ad3ee962 100644--- a/src/cli/daemon/execenv/timeline.ts+++ b/src/cli/daemon/execenv/timeline.ts@@ -218,55 +218,17 @@ export function createTimelineEntry(};}-const DEFAULT_RESUME_MAX_AGE_MS = 3 * 60 * 60 * 1000; // 3 hours--export function findResumableSessionId(- timelineDir: string,- type: string,- provider: string,- maxAgeMs: number = DEFAULT_RESUME_MAX_AGE_MS,-): string | null {- const now = new Date();- const cutoff = new Date(now.getTime() - maxAgeMs);-- const daysToScan = Math.ceil(maxAgeMs / 86_400_000) + 1;- const entries: ContextTimelineEntry[] = [];- for (const filename of recentFilenames(daysToScan)) {- entries.push(...readJsonl(join(timelineDir, filename)));- }-- entries.sort((a, b) => new Date(b.datetime).getTime() - new Date(a.datetime).getTime());-- for (const entry of entries) {- if (- entry.status !== "running" &&- entry.type === type &&- entry.provider === provider &&- entry.session_id &&- new Date(entry.datetime) >= cutoff- ) {- return entry.session_id;- }- }-- return null;-}--const EMAIL_RESUME_MAX_AGE_MS = 48 * 60 * 60 * 1000;+const RESUME_MAX_AGE_MS = 72 * 60 * 60 * 1000; // 72 hoursexport function findResumableSessionByContextKey(timelineDir: string,contextKey: string,provider: string,): string | null {- const maxAgeMs = contextKey.startsWith("email:")- ? EMAIL_RESUME_MAX_AGE_MS- : DEFAULT_RESUME_MAX_AGE_MS;const now = new Date();- const cutoff = new Date(now.getTime() - maxAgeMs);- const daysToScan = Math.ceil(maxAgeMs / 86_400_000) + 1;+ const cutoff = new Date(now.getTime() - RESUME_MAX_AGE_MS);const entries: ContextTimelineEntry[] = [];- for (const filename of recentFilenames(daysToScan)) {+ for (const filename of recentFilenames(7)) {entries.push(...readJsonl(join(timelineDir, filename)));}entries.sort((a, b) => new Date(b.datetime).getTime() - new Date(a.datetime).getTime());diff --git a/src/cli/daemon/session-runner.test.ts b/src/cli/daemon/session-runner.test.tsindex f1274cca2..634931012 100644--- a/src/cli/daemon/session-runner.test.ts+++ b/src/cli/daemon/session-runner.test.ts@@ -119,7 +119,7 @@ function makeInput(overrides?: Partial<SessionRunnerInput>): SessionRunnerInputstatus: "dispatched",priority: 0,type: "user_dm_message",- contextKey: "dm:c1",+ contextKey: "c1",createdAt: "2026-01-01T00:00:00Z",},provider: "claude",@@ -257,7 +257,7 @@ describe("session-runner runSession", () => {"sess-1",process.pid,"claude",- "dm:c1",+ "c1",undefined,);expect(mockInitEntryAsync).toHaveBeenCalledWith(@@ -384,7 +384,7 @@ describe("session-runner runSession", () => {expect(mockFindResumableSessionByContextKey).toHaveBeenCalledWith("/tmp/ws/ws1/agent1/workdir/.context_timeline",- "dm:c1",+ "c1","claude",);expect(mockBackendExecute).toHaveBeenCalledWith(@@ -591,7 +591,7 @@ describe("session-runner runSession", () => {"sess-1",process.pid,"codex",- "dm:c1",+ "c1",undefined,);});@@ -609,7 +609,7 @@ describe("session-runner runSession", () => {expect(mockFindResumableSessionByContextKey).toHaveBeenCalledWith("/tmp/ws/ws1/agent1/workdir/.context_timeline",- "dm:c1",+ "c1","codex",);});@@ -648,7 +648,7 @@ describe("session-runner runSession", () => {expect(mockFindResumableSessionByContextKey).toHaveBeenCalledWith("/tmp/ws/ws1/agent1/workdir/.context_timeline",- "dm:c1",+ "c1","opencode",);expect(mockBackendExecute).toHaveBeenCalledWith(diff --git a/src/shared/src/constants.ts b/src/shared/src/constants.tsindex bd8245bda..feb323e83 100644--- a/src/shared/src/constants.ts+++ b/src/shared/src/constants.ts@@ -50,6 +50,7 @@ export type TaskType = (typeof TASK_TYPES)[keyof typeof TASK_TYPES];export const MessageRole = {USER: "user",ASSISTANT: "assistant",+ EVENT: "event",} as const;export type MessageRoleType = (typeof MessageRole)[keyof typeof MessageRole];diff --git a/src/shared/src/db/queries-index.ts b/src/shared/src/db/queries-index.tsindex 6aaf1e131..0198588e8 100644--- a/src/shared/src/db/queries-index.ts+++ b/src/shared/src/db/queries-index.ts@@ -22,3 +22,4 @@ export * as overview from "./queries/overview";export * as meetingSession from "./queries/meeting-session";export * as channel from "./queries/channel";export * as workspaceFileRequest from "./queries/workspace-file-request";+export * as conversationMap from "./queries/conversation-map";diff --git a/src/shared/src/db/queries/conversation-map.ts b/src/shared/src/db/queries/conversation-map.tsnew file mode 100644index 000000000..1c7780255--- /dev/null+++ b/src/shared/src/db/queries/conversation-map.ts@@ -0,0 +1,38 @@+import { eq, and } from "drizzle-orm";+import type { Database } from "../index";+import { conversationMap } from "../schema";+import { nanoid } from "nanoid";++export async function findByKey(+ db: Database,+ key: string,+ workspaceId: string,+): Promise<string | null> {+ const rows = await db+ .select({ conversationId: conversationMap.conversationId })+ .from(conversationMap)+ .where(+ and(+ eq(conversationMap.key, key),+ eq(conversationMap.workspaceId, workspaceId),+ ),+ )+ .limit(1);+ return rows[0]?.conversationId ?? null;+}++export async function createMapping(+ db: Database,+ opts: { key: string; workspaceId: string; conversationId: string },+): Promise<void> {+ await db+ .insert(conversationMap)+ .values({+ id: nanoid(),+ key: opts.key,+ workspaceId: opts.workspaceId,+ conversationId: opts.conversationId,+ createdAt: new Date().toISOString(),+ })+ .onConflictDoNothing();+}diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.tsindex a1883ce09..0f9b48cb1 100644--- a/src/shared/src/db/schema.ts+++ b/src/shared/src/db/schema.ts@@ -547,6 +547,24 @@ export const machineToken = sqliteTable(// Workspace file request (ephemeral queue for file browsing)// ---------------------------------------------------------------------------+export const conversationMap = sqliteTable(+ "conversation_map",+ {+ id: text("id").primaryKey().$defaultFn(() => nanoid()),+ key: text("key").notNull(),+ workspaceId: text("workspace_id")+ .notNull()+ .references(() => workspace.id, { onDelete: "cascade" }),+ conversationId: text("conversation_id")+ .notNull()+ .references(() => conversation.id, { onDelete: "cascade" }),+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),+ },+ (t) => [+ unique("conversation_map_key_workspace").on(t.key, t.workspaceId),+ ]+);+export const workspaceFileRequest = sqliteTable("workspace_file_request",{diff --git a/src/shared/src/index.ts b/src/shared/src/index.tsindex c8fe96466..66f9acb52 100644--- a/src/shared/src/index.ts+++ b/src/shared/src/index.ts@@ -175,7 +175,7 @@ export type { LogLevel, LoggerOptions } from "./logger"// Libexport { isEmptyHtml } from "./lib/html";-export { buildContextKey, extractThreadId } from "./lib/context-key";+export { extractThreadId, buildEmailMapKey } from "./lib/context-key";export { parseIcs } from "./lib/ics-parser";export type { MeetingInfo } from "./lib/ics-parser";export {diff --git a/src/shared/src/lib/context-key.test.ts b/src/shared/src/lib/context-key.test.tsindex cb1491e03..b6b222b8a 100644--- a/src/shared/src/lib/context-key.test.ts+++ b/src/shared/src/lib/context-key.test.ts@@ -1,6 +1,5 @@import { describe, it, expect } from "vitest";-import { extractThreadId, buildContextKey } from "./context-key";-import { TASK_TYPES } from "../constants";+import { extractThreadId, buildEmailMapKey } from "./context-key";describe("extractThreadId", () => {it("returns first message-id from references when available", () => {@@ -50,42 +49,16 @@ describe("extractThreadId", () => {});});-describe("buildContextKey", () => {- it("returns dm:{conversationId} for USER_DM_MESSAGE with conversationId", () => {- expect(- buildContextKey(TASK_TYPES.USER_DM_MESSAGE, { conversationId: "conv_123" }),- ).toBe("dm:conv_123");- });-- it("returns null for USER_DM_MESSAGE without conversationId", () => {- expect(buildContextKey(TASK_TYPES.USER_DM_MESSAGE, {})).toBeNull();- });-- it("returns email:{threadId} for EMAIL_NOTIFICATION with threadId", () => {- expect(- buildContextKey(TASK_TYPES.EMAIL_NOTIFICATION, { threadId: "<[email protected]>" }),- ).toBe("email:<[email protected]>");- });-- it("returns null for EMAIL_NOTIFICATION without threadId", () => {- expect(buildContextKey(TASK_TYPES.EMAIL_NOTIFICATION, {})).toBeNull();- });-- it("returns null for EMAIL_NOTIFICATION with null threadId", () => {- expect(buildContextKey(TASK_TYPES.EMAIL_NOTIFICATION, { threadId: null })).toBeNull();- });-- it("returns null for CALENDAR_EVENT", () => {- expect(buildContextKey(TASK_TYPES.CALENDAR_EVENT, {})).toBeNull();- });-- it("returns null for CALENDAR_EVENT even with conversationId", () => {- expect(- buildContextKey(TASK_TYPES.CALENDAR_EVENT, { conversationId: "conv_123" }),- ).toBeNull();+describe("buildEmailMapKey", () => {+ it("returns email:<agentId>:<threadId>", () => {+ expect(buildEmailMapKey("agent123", "<[email protected]>")).toBe(+ "email:agent123:<[email protected]>",+ );});- it("returns null for unknown type", () => {- expect(buildContextKey("unknown_type", { conversationId: "conv_123" })).toBeNull();+ it("handles different agent and thread IDs", () => {+ expect(buildEmailMapKey("ag_abc", "<[email protected]>")).toBe(+ "email:ag_abc:<[email protected]>",+ );});});diff --git a/src/shared/src/lib/context-key.ts b/src/shared/src/lib/context-key.tsindex da3fe55e0..e0af0108d 100644--- a/src/shared/src/lib/context-key.ts+++ b/src/shared/src/lib/context-key.ts@@ -1,5 +1,3 @@-import { TASK_TYPES } from "../constants";-/*** Extract a stable thread identifier from email headers (RFC 2822).* Priority: first message-id in References > In-Reply-To > own Message-ID.@@ -19,21 +17,9 @@ export function extractThreadId(}/**- * Build a unified context key for session resumption.- * Returns null when the task type should never resume (e.g. calendar events).+ * Build the conversation_map lookup key for email threads.+ * Format: "email:<agentId>:<threadId>" — agent-scoped, thread-scoped.*/-export function buildContextKey(- type: string,- opts: { conversationId?: string; threadId?: string | null },-): string | null {- switch (type) {- case TASK_TYPES.USER_DM_MESSAGE:- return opts.conversationId ? `dm:${opts.conversationId}` : null;- case TASK_TYPES.EMAIL_NOTIFICATION:- return opts.threadId ? `email:${opts.threadId}` : null;- case TASK_TYPES.CALENDAR_EVENT:- return null;- default:- return null;- }+export function buildEmailMapKey(agentId: string, threadId: string): string {+ return `email:${agentId}:${threadId}`;}diff --git a/src/shared/src/schemas.ts b/src/shared/src/schemas.tsindex 62d1c4cdd..1290f1891 100644--- a/src/shared/src/schemas.ts+++ b/src/shared/src/schemas.ts@@ -413,6 +413,7 @@ export const SendEmailRequestSchema = z.object({attachments: z.array(EmailAttachmentSchema).optional(),customAccountId: z.string().optional(),from: z.string().email().optional(),+ conversationId: z.string().optional(),});export type SendEmailRequest = z.infer<typeof SendEmailRequestSchema>;diff --git a/src/shared/src/types.ts b/src/shared/src/types.tsindex 54d92a80c..0aac8e667 100644--- a/src/shared/src/types.ts+++ b/src/shared/src/types.ts@@ -93,7 +93,7 @@ export interface CalendarEvent {export interface Message {id: string;conversation_id: string;- role: "user" | "assistant";+ role: "user" | "assistant" | "event";content: string;task_id: string | null;attachment_ids: string[] | null;diff --git a/src/web/migrations/0016_conversation_map.sql b/src/web/migrations/0016_conversation_map.sqlnew file mode 100644index 000000000..b7d073404--- /dev/null+++ b/src/web/migrations/0016_conversation_map.sql@@ -0,0 +1,9 @@+-- Conversation map: generic key → conversation mapping+CREATE TABLE IF NOT EXISTS conversation_map (+ id TEXT PRIMARY KEY,+ key TEXT NOT NULL,+ workspace_id TEXT NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,+ conversation_id TEXT NOT NULL REFERENCES conversation(id) ON DELETE CASCADE,+ created_at TEXT NOT NULL,+ UNIQUE(key, workspace_id)+);diff --git a/src/web/src/app/api/conversations/[id]/active-task/route.test.ts b/src/web/src/app/api/conversations/[id]/active-task/route.test.tsindex bedf16979..9b0b487f0 100644--- a/src/web/src/app/api/conversations/[id]/active-task/route.test.ts+++ b/src/web/src/app/api/conversations/[id]/active-task/route.test.ts@@ -14,7 +14,7 @@ vi.mock("@alook/shared", () => ({createDb: vi.fn(() => ({})),createLogger: vi.fn(() => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() })),TASK_TYPES: { USER_DM_MESSAGE: "user_dm_message", KILL_TASK: "kill_task" },- buildContextKey: () => "ctx:test",+ buildEmailMapKey: (agentId: string, threadId: string) => `email:${agentId}:${threadId}`,queries: {conversation: {getConversation: (...args: any[]) => mockGetConversation(...args),diff --git a/src/web/src/app/api/conversations/[id]/messages/route.test.ts b/src/web/src/app/api/conversations/[id]/messages/route.test.tsindex 619626da5..62757253b 100644--- a/src/web/src/app/api/conversations/[id]/messages/route.test.ts+++ b/src/web/src/app/api/conversations/[id]/messages/route.test.ts@@ -27,8 +27,7 @@ vi.mock("@alook/shared", async () => {EMAIL_NOTIFICATION: "email_notification",CALENDAR_EVENT: "calendar_event",},- buildContextKey: (type: string, opts: { conversationId?: string }) =>- type === "user_dm_message" && opts.conversationId ? `dm:${opts.conversationId}` : null,+ buildEmailMapKey: (agentId: string, threadId: string) => `email:${agentId}:${threadId}`,queries: {conversation: {getConversation: (...args: any[]) => mockGetConversation(...args),@@ -184,7 +183,7 @@ describe("POST /api/conversations/[id]/messages", () => {expect(res.status).toBe(201);expect(body.message).toEqual({ id: "m1", content: "Hi there" });expect(body.task).toEqual({ id: "t1", status: "pending" });- expect(mockEnqueueTask).toHaveBeenCalledWith("a1", "c1", "w1", "Hi there", "user_dm_message", { contextKey: "dm:c1" });+ expect(mockEnqueueTask).toHaveBeenCalledWith("a1", "c1", "w1", "Hi there", "user_dm_message", { contextKey: "c1" });});it("auto-titles conversation with truncated first message", async () => {diff --git a/src/web/src/app/api/conversations/[id]/messages/route.ts b/src/web/src/app/api/conversations/[id]/messages/route.tsindex 892c21321..25ff40fe4 100644--- a/src/web/src/app/api/conversations/[id]/messages/route.ts+++ b/src/web/src/app/api/conversations/[id]/messages/route.ts@@ -1,6 +1,6 @@import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare"-import { queries, TASK_TYPES, buildContextKey, CreateMessageRequestSchema, parsePromptMentions } from "@alook/shared"+import { queries, TASK_TYPES, CreateMessageRequestSchema, parsePromptMentions } from "@alook/shared"import { getDb } from "@/lib/db"import { nanoid } from "nanoid";import { withAuth } from "@/lib/middleware/auth";@@ -182,7 +182,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {}}- const contextKey = buildContextKey(TASK_TYPES.USER_DM_MESSAGE, { conversationId: id });+ const contextKey = id;const taskContext: Record<string, unknown> = {...(artifactIds.length > 0 ? { attachment_ids: artifactIds } : {}),...mentionContext,diff --git a/src/web/src/app/api/email/notify/route.test.ts b/src/web/src/app/api/email/notify/route.test.tsnew file mode 100644index 000000000..5d7682cbd--- /dev/null+++ b/src/web/src/app/api/email/notify/route.test.ts@@ -0,0 +1,232 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetAgent = vi.fn();+const mockCreateEmail = vi.fn();+const mockCreateConversation = vi.fn();+const mockCreateMessage = vi.fn();+const mockCreateMeetingSession = vi.fn();+const mockFindByKey = vi.fn();+const mockCreateMapping = vi.fn();+const mockEnqueueTask = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),+}));+vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual("@alook/shared");+ return {+ ...actual,+ createDb: vi.fn(() => ({})),+ queries: {+ agent: {+ getAgent: (...args: unknown[]) => mockGetAgent(...args),+ },+ email: {+ createEmail: (...args: unknown[]) => mockCreateEmail(...args),+ },+ conversation: {+ createConversation: (...args: unknown[]) => mockCreateConversation(...args),+ },+ message: {+ createMessage: (...args: unknown[]) => mockCreateMessage(...args),+ },+ meetingSession: {+ createMeetingSession: (...args: unknown[]) => mockCreateMeetingSession(...args),+ },+ conversationMap: {+ findByKey: (...args: unknown[]) => mockFindByKey(...args),+ createMapping: (...args: unknown[]) => mockCreateMapping(...args),+ },+ },+ };+});++vi.mock("@/lib/middleware/helpers", async () => {+ const { NextResponse } = require("next/server");+ const actual = await vi.importActual("@/lib/middleware/helpers");+ return {+ ...actual,+ writeJSON: (data: unknown, status = 200) => NextResponse.json(data, { status }),+ writeError: (msg: string, status: number) => NextResponse.json({ error: msg }, { status }),+ };+});++vi.mock("@/lib/services/task", () => {+ return {+ TaskService: class {+ enqueueTask(...args: any[]) { return mockEnqueueTask(...args); }+ },+ };+});++vi.mock("@/lib/broadcast", () => ({+ broadcastToUser: vi.fn().mockResolvedValue(undefined),+}));++import { POST } from "./route";++function makeNotifyReq(body: Record<string, unknown>) {+ return new NextRequest("http://localhost/api/email/notify", {+ method: "POST",+ body: JSON.stringify(body),+ });+}++const baseBody = {+ agentId: "a1",+ workspaceId: "ws1",+ r2Key: "emails/fake/raw",+ from: "[email protected]",+ subject: "Test email",+ isWhitelisted: true,+ messageId: "<[email protected]>",+ inReplyTo: "",+ references: "",+};++describe("POST /api/email/notify", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ mockCreateEmail.mockResolvedValue({ id: "e1" });+ mockFindByKey.mockResolvedValue(null);+ mockCreateMapping.mockResolvedValue(undefined);+ });++ it("creates new conversation when no mapping found", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: "u1" });+ mockCreateConversation.mockResolvedValue({ id: "conv_new" });+ mockEnqueueTask.mockResolvedValue({ id: "t1" });++ const res = await POST(makeNotifyReq(baseBody));+ expect(res.status).toBe(200);++ expect(mockFindByKey).toHaveBeenCalledWith(+ expect.anything(),+ "email:a1:<[email protected]>",+ "ws1",+ );+ expect(mockCreateConversation).toHaveBeenCalledOnce();+ expect(mockCreateMessage).toHaveBeenCalledWith(+ expect.anything(),+ expect.objectContaining({ role: "event" }),+ );+ expect(mockCreateMapping).toHaveBeenCalledWith(expect.anything(), {+ key: "email:a1:<[email protected]>",+ workspaceId: "ws1",+ conversationId: "conv_new",+ });+ expect(mockEnqueueTask).toHaveBeenCalledWith(+ "a1", "conv_new", "ws1",+ expect.any(String),+ "email_notification",+ { contextKey: "conv_new" },+ );+ });++ it("reuses existing conversation when mapping is found", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: "u1" });+ mockFindByKey.mockResolvedValue("conv_existing");+ mockEnqueueTask.mockResolvedValue({ id: "t1" });++ const res = await POST(makeNotifyReq(baseBody));+ expect(res.status).toBe(200);++ expect(mockCreateConversation).not.toHaveBeenCalled();+ expect(mockCreateMapping).not.toHaveBeenCalled();+ expect(mockEnqueueTask).toHaveBeenCalledWith(+ "a1", "conv_existing", "ws1",+ expect.any(String),+ "email_notification",+ { contextKey: "conv_existing" },+ );+ });++ it("same thread, two different agents get separate conversations", async () => {+ // Agent A+ mockGetAgent.mockResolvedValueOnce({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: "u1" });+ mockFindByKey.mockResolvedValueOnce(null);+ mockCreateConversation.mockResolvedValueOnce({ id: "conv_a" });+ mockEnqueueTask.mockResolvedValueOnce({ id: "t1" });++ await POST(makeNotifyReq(baseBody));++ expect(mockFindByKey).toHaveBeenCalledWith(expect.anything(), "email:a1:<[email protected]>", "ws1");+ expect(mockCreateMapping).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({+ key: "email:a1:<[email protected]>",+ conversationId: "conv_a",+ }));++ vi.clearAllMocks();+ mockCreateEmail.mockResolvedValue({ id: "e2" });++ // Agent B - same email thread+ mockGetAgent.mockResolvedValueOnce({ id: "a2", workspaceId: "ws1", runtimeId: "r2", ownerId: "u2" });+ mockFindByKey.mockResolvedValueOnce(null);+ mockCreateConversation.mockResolvedValueOnce({ id: "conv_b" });+ mockEnqueueTask.mockResolvedValueOnce({ id: "t2" });++ await POST(makeNotifyReq({ ...baseBody, agentId: "a2" }));++ expect(mockFindByKey).toHaveBeenCalledWith(expect.anything(), "email:a2:<[email protected]>", "ws1");+ expect(mockCreateMapping).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({+ key: "email:a2:<[email protected]>",+ conversationId: "conv_b",+ }));+ });++ it("does not create conversation or task when not whitelisted", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: "u1" });++ const res = await POST(makeNotifyReq({ ...baseBody, isWhitelisted: false }));+ expect(res.status).toBe(200);++ expect(mockCreateConversation).not.toHaveBeenCalled();+ expect(mockEnqueueTask).not.toHaveBeenCalled();+ expect(mockFindByKey).not.toHaveBeenCalled();+ });++ it("does not create conversation or task when agent has no runtime", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: null, ownerId: "u1" });++ const res = await POST(makeNotifyReq(baseBody));+ expect(res.status).toBe(200);++ expect(mockCreateConversation).not.toHaveBeenCalled();+ expect(mockEnqueueTask).not.toHaveBeenCalled();+ });++ it("does not create conversation or task when agent has no ownerId", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: null });++ const res = await POST(makeNotifyReq(baseBody));+ expect(res.status).toBe(200);++ expect(mockCreateConversation).not.toHaveBeenCalled();+ expect(mockEnqueueTask).not.toHaveBeenCalled();+ expect(mockFindByKey).not.toHaveBeenCalled();+ });++ it("uses References header thread root for mapping lookup", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", workspaceId: "ws1", runtimeId: "r1", ownerId: "u1" });+ mockFindByKey.mockResolvedValue("conv_thread");+ mockEnqueueTask.mockResolvedValue({ id: "t1" });++ const bodyWithRefs = {+ ...baseBody,+ messageId: "<[email protected]>",+ inReplyTo: "<[email protected]>",+ references: "<[email protected]> <[email protected]>",+ };++ await POST(makeNotifyReq(bodyWithRefs));++ expect(mockFindByKey).toHaveBeenCalledWith(+ expect.anything(),+ "email:a1:<[email protected]>",+ "ws1",+ );+ });+});diff --git a/src/web/src/app/api/email/notify/route.ts b/src/web/src/app/api/email/notify/route.tsindex 1b8b49868..edb9f456c 100644--- a/src/web/src/app/api/email/notify/route.ts+++ b/src/web/src/app/api/email/notify/route.ts@@ -1,6 +1,6 @@import { NextRequest } from "next/server"import { getCloudflareContext } from "@opennextjs/cloudflare"-import { queries, TASK_TYPES, MeetingStatus, buildContextKey, extractThreadId, EmailNotifyRequestSchema } from "@alook/shared"+import { queries, TASK_TYPES, MeetingStatus, extractThreadId, buildEmailMapKey, EmailNotifyRequestSchema } from "@alook/shared"import { getDb } from "@/lib/db"import { writeJSON, parseBody } from "@/lib/middleware/helpers"import { TaskService } from "@/lib/services/task"@@ -45,24 +45,42 @@ export async function POST(req: NextRequest) {})}- if (body.isWhitelisted && agent && agent.runtimeId) {- const conv = await queries.conversation.createConversation(db, {- workspaceId: agent.workspaceId,- agentId: agent.id,- userId: agent.ownerId!,- title: `Email: ${body.subject}`.slice(0, 50),- type: TASK_TYPES.EMAIL_NOTIFICATION,- })+ if (body.isWhitelisted && agent && agent.runtimeId && agent.ownerId) {+ const threadId = extractThreadId(body.references, body.inReplyTo, body.messageId);+ const mapKey = threadId ? buildEmailMapKey(agent.id, threadId) : null;++ let conversationId: string | null = null;+ if (mapKey) {+ conversationId = await queries.conversationMap.findByKey(db, mapKey, body.workspaceId);+ }++ if (!conversationId) {+ const conv = await queries.conversation.createConversation(db, {+ workspaceId: agent.workspaceId,+ agentId: agent.id,+ userId: agent.ownerId,+ title: `Email: ${body.subject}`.slice(0, 50),+ type: TASK_TYPES.EMAIL_NOTIFICATION,+ })+ conversationId = conv.id;++ if (mapKey) {+ await queries.conversationMap.createMapping(db, {+ key: mapKey,+ workspaceId: body.workspaceId,+ conversationId,+ });+ }+ }+const prompt = `New email from ${body.from}: ${body.subject}`;await queries.message.createMessage(db, {- conversationId: conv.id,- role: "user",+ conversationId,+ role: "event",content: prompt,})- const threadId = extractThreadId(body.references, body.inReplyTo, body.messageId);- const contextKey = buildContextKey(TASK_TYPES.EMAIL_NOTIFICATION, { threadId });const taskService = new TaskService(db)- await taskService.enqueueTask(agent.id, conv.id, agent.workspaceId, prompt, TASK_TYPES.EMAIL_NOTIFICATION, { contextKey })+ await taskService.enqueueTask(agent.id, conversationId, agent.workspaceId, prompt, TASK_TYPES.EMAIL_NOTIFICATION, { contextKey: conversationId })}if (agent?.ownerId) {diff --git a/src/web/src/app/api/email/send/route.test.ts b/src/web/src/app/api/email/send/route.test.tsindex 374400761..5fa532e06 100644--- a/src/web/src/app/api/email/send/route.test.ts+++ b/src/web/src/app/api/email/send/route.test.ts@@ -11,6 +11,8 @@ const mockEmailWorkerFetch = vi.fn();const mockEmailBucketGet = vi.fn();const mockEmailBucketPut = vi.fn();const mockWorkerSelfRefFetch = vi.fn();+const mockCreateMapping = vi.fn();+const mockGetConversation = vi.fn();vi.mock("@opennextjs/cloudflare", () => ({getCloudflareContext: vi.fn(() => ({@@ -48,6 +50,12 @@ vi.mock("@alook/shared", async () => {getEmailAccountsByAgent: (...args: unknown[]) => mockGetEmailAccountsByAgent(...args),getEmailAccountScoped: (...args: unknown[]) => mockGetEmailAccountScoped(...args),},+ conversation: {+ getConversation: (...args: unknown[]) => mockGetConversation(...args),+ },+ conversationMap: {+ createMapping: (...args: unknown[]) => mockCreateMapping(...args),+ },},};});@@ -494,4 +502,117 @@ describe("POST /api/email/send", () => {expect(mockCreateEmail).not.toHaveBeenCalled();});});++ describe("conversation_map mapping creation", () => {+ it("creates mapping on local delivery when conversationId is provided", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "sender-agent", workspaceId: "ws1" });+ mockGetAgentByHandle.mockResolvedValue({ id: "a2", emailHandle: "agent-b", workspaceId: "ws1" });+ mockIsWhitelisted.mockResolvedValue(false);+ mockWorkerSelfRefFetch.mockResolvedValue(Response.json({ ok: true }));+ mockCreateEmail.mockResolvedValue({ id: "e1" });+ mockGetConversation.mockResolvedValue({ id: "conv_123" });++ const req = makeReq({+ agentId: "a1",+ to: "[email protected]",+ subject: "Map test",+ htmlBody: "<p>Map</p>",+ conversationId: "conv_123",+ });++ const res = await POST(req, {} as any);+ expect(res.status).toBe(200);+ expect(mockCreateMapping).toHaveBeenCalledOnce();+ const args = mockCreateMapping.mock.calls[0]![1] as any;+ expect(args.workspaceId).toBe("ws1");+ expect(args.conversationId).toBe("conv_123");+ expect(args.key).toMatch(/^email:a1:/);+ });++ it("does NOT create mapping on local delivery without conversationId", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "sender-agent", workspaceId: "ws1" });+ mockGetAgentByHandle.mockResolvedValue({ id: "a2", emailHandle: "agent-b", workspaceId: "ws1" });+ mockIsWhitelisted.mockResolvedValue(false);+ mockWorkerSelfRefFetch.mockResolvedValue(Response.json({ ok: true }));+ mockCreateEmail.mockResolvedValue({ id: "e1" });++ const req = makeReq({+ agentId: "a1",+ to: "[email protected]",+ subject: "No map",+ htmlBody: "<p>No map</p>",+ });++ const res = await POST(req, {} as any);+ expect(res.status).toBe(200);+ expect(mockCreateMapping).not.toHaveBeenCalled();+ });++ it("creates mapping on remote delivery when conversationId and messageId are provided", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "test-agent" });+ mockEmailWorkerFetch.mockResolvedValue(+ Response.json({ ok: true, r2Key: "emails/abc/raw", messageId: "<[email protected]>" }),+ );+ mockCreateEmail.mockResolvedValue({ id: "e1" });+ mockGetConversation.mockResolvedValue({ id: "conv_456" });++ const req = makeReq({+ agentId: "a1",+ to: "[email protected]",+ subject: "Remote map",+ htmlBody: "<p>Remote</p>",+ conversationId: "conv_456",+ });++ const res = await POST(req, {} as any);+ expect(res.status).toBe(200);+ expect(mockCreateMapping).toHaveBeenCalledOnce();+ const args = mockCreateMapping.mock.calls[0]![1] as any;+ expect(args.workspaceId).toBe("ws1");+ expect(args.conversationId).toBe("conv_456");+ expect(args.key).toBe("email:a1:<[email protected]>");+ });++ it("does NOT create mapping when conversationId does not belong to workspace", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "sender-agent", workspaceId: "ws1" });+ mockGetAgentByHandle.mockResolvedValue({ id: "a2", emailHandle: "agent-b", workspaceId: "ws1" });+ mockIsWhitelisted.mockResolvedValue(false);+ mockWorkerSelfRefFetch.mockResolvedValue(Response.json({ ok: true }));+ mockCreateEmail.mockResolvedValue({ id: "e1" });+ mockGetConversation.mockResolvedValue(null);++ const req = makeReq({+ agentId: "a1",+ to: "[email protected]",+ subject: "Bad conv",+ htmlBody: "<p>Bad</p>",+ conversationId: "conv_other_workspace",+ });++ const res = await POST(req, {} as any);+ expect(res.status).toBe(200);+ expect(mockCreateMapping).not.toHaveBeenCalled();+ });++ it("does NOT create mapping on remote delivery when messageId is undefined", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "test-agent" });+ mockEmailWorkerFetch.mockResolvedValue(+ Response.json({ ok: true, r2Key: "emails/abc/raw" }),+ );+ mockCreateEmail.mockResolvedValue({ id: "e1" });+ mockGetConversation.mockResolvedValue({ id: "conv_456" });++ const req = makeReq({+ agentId: "a1",+ to: "[email protected]",+ subject: "Remote no msgid",+ htmlBody: "<p>No id</p>",+ conversationId: "conv_456",+ });++ const res = await POST(req, {} as any);+ expect(res.status).toBe(200);+ expect(mockCreateMapping).not.toHaveBeenCalled();+ });+ });});diff --git a/src/web/src/app/api/email/send/route.ts b/src/web/src/app/api/email/send/route.tsindex 402973334..18abdaf77 100644--- a/src/web/src/app/api/email/send/route.ts+++ b/src/web/src/app/api/email/send/route.ts@@ -1,6 +1,6 @@import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare";-import { queries, DEV_EMAIL_WORKER_URL, DEV_WEB_URL, SendEmailRequestSchema, parseEmailHandle } from "@alook/shared";+import { queries, DEV_EMAIL_WORKER_URL, DEV_WEB_URL, SendEmailRequestSchema, parseEmailHandle, extractThreadId, buildEmailMapKey } from "@alook/shared";import { nanoid } from "nanoid";import { getDb } from "@/lib/db"import { withAuth } from "@/lib/middleware/auth";@@ -51,6 +51,12 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {fromAddress = `${agent.emailHandle}@alook.ai`;}+ let validatedConversationId: string | undefined;+ if (body.conversationId) {+ const conv = await queries.conversation.getConversation(db, body.conversationId, ws.workspaceId);+ if (conv) validatedConversationId = body.conversationId;+ }+const attachments = body.attachments ?? [];// Local delivery shortcut: same-workspace @alook.ai → @alook.ai@@ -172,6 +178,17 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {direction: "outbound",});+ if (validatedConversationId) {+ const threadId = extractThreadId(body.references, body.inReplyTo, messageId);+ if (threadId) {+ await queries.conversationMap.createMapping(db, {+ key: buildEmailMapKey(body.agentId, threadId),+ workspaceId: ws.workspaceId,+ conversationId: validatedConversationId,+ });+ }+ }+return writeJSON(emailToResponse(email));}}@@ -232,5 +249,16 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {direction: "outbound",});+ if (validatedConversationId && emailResult.messageId) {+ const threadId = extractThreadId(body.references, body.inReplyTo, emailResult.messageId);+ if (threadId) {+ await queries.conversationMap.createMapping(db, {+ key: buildEmailMapKey(body.agentId, threadId),+ workspaceId: ws.workspaceId,+ conversationId: validatedConversationId,+ });+ }+ }+return writeJSON(emailToResponse(email));});diff --git a/src/web/src/components/agent-chat/agent-chat-view.test.ts b/src/web/src/components/agent-chat/agent-chat-view.test.tsindex 5b5b23bbc..f6d4c1296 100644--- a/src/web/src/components/agent-chat/agent-chat-view.test.ts+++ b/src/web/src/components/agent-chat/agent-chat-view.test.ts@@ -3,8 +3,8 @@ import type { Message, Artifact } from "@alook/shared";import { sortMessages, mergeMessages, buildTimeline } from "./agent-chat-view";import type { NapMarker } from "./agent-chat-view";-function msg(id: string, created_at: string, role: "user" | "assistant" = "user", content = ""): Message {- return { id, conversation_id: "conv1", role, content, task_id: null, created_at };+function msg(id: string, created_at: string, role: "user" | "assistant" | "event" = "user", content = ""): Message {+ return { id, conversation_id: "conv1", role, content, task_id: null, attachment_ids: null, created_at };}describe("sortMessages", () => {@@ -287,4 +287,16 @@ describe("buildTimeline", () => {it("returns empty timeline when all inputs are empty", () => {expect(buildTimeline([], [], [])).toEqual([]);});++ it("handles mixed roles (user + assistant + event) without errors", () => {+ const msgs = [+ msg("m1", "2024-01-01T00:00:00Z", "user", "hello"),+ msg("m2", "2024-01-02T00:00:00Z", "event", "New email from [email protected]: Subject"),+ msg("m3", "2024-01-03T00:00:00Z", "assistant", "response"),+ ];+ const result = buildTimeline(msgs, [], []);+ expect(result).toHaveLength(3);+ expect(result.map((i) => i.data.id)).toEqual(["m1", "m2", "m3"]);+ expect(result.every((i) => i.kind === "message")).toBe(true);+ });});diff --git a/src/web/src/components/agent-chat/agent-chat-view.tsx b/src/web/src/components/agent-chat/agent-chat-view.tsxindex 7d48e9d9f..1fb0a7798 100644--- a/src/web/src/components/agent-chat/agent-chat-view.tsx+++ b/src/web/src/components/agent-chat/agent-chat-view.tsx@@ -31,7 +31,7 @@ import { toast } from "sonner";import { cn } from "@/lib/utils";import { Skeleton } from "@/components/ui/skeleton";import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip";-import { ArrowUp, BedDouble, Box, FileText, Loader2, Mail, Mic, Paperclip, Square, X } from "lucide-react";+import { ArrowUp, BedDouble, Box, Calendar, FileText, Loader2, Mail, Mic, Paperclip, Square, X } from "lucide-react";import { useSpeechRecognition } from "@/hooks/use-speech-recognition";import { useMentionPopup } from "@/hooks/use-mention-popup";import { MentionPopup } from "@/components/agent-chat/mention-popup";@@ -1138,7 +1138,14 @@ export function AgentChatView() {</div></div>);- })() : !hasTaskStream ? (+ })() : msg.role === "event" ? (+ <div className="flex justify-start">+ <div className="w-full rounded-md border bg-muted/50 text-muted-foreground text-sm px-3 py-2 flex items-start gap-2">+ {msg.content.toLowerCase().includes("email") ? <Mail className="h-4 w-4 mt-0.5 shrink-0" /> : <Calendar className="h-4 w-4 mt-0.5 shrink-0" />}+ <span>{msg.content}</span>+ </div>+ </div>+ ) : !hasTaskStream ? (<div className="flex justify-start" {...(msg.task_id ? { "data-task-id": msg.task_id } : {})}><div className="markdown max-w-full min-w-0 px-1 py-1 text-base text-foreground"><Streamdown controls={{ code: { copy: true, download: false }, table: { copy: true, download: false, fullscreen: true } }} linkSafety={{ enabled: false }} allowedTags={MENTION_ALLOWED_TAGS} literalTagContent={MENTION_LITERAL_TAGS} components={MENTION_COMPONENTS}>{highlightMentions(msg.content, agents)}</Streamdown>diff --git a/src/web/src/lib/services/calendar.test.ts b/src/web/src/lib/services/calendar.test.tsindex ac529516f..d61732488 100644--- a/src/web/src/lib/services/calendar.test.ts+++ b/src/web/src/lib/services/calendar.test.ts@@ -100,6 +100,10 @@ describe("promoteDueCalendarEventsForWorkspace", () => {userId: "u_1",type: "calendar_event",});+ expect(mockCreateMessage).toHaveBeenCalledWith(+ expect.anything(),+ expect.objectContaining({ role: "event" }),+ );expect(mockCreateTask).toHaveBeenCalledTimes(1);expect(mockCreateTask.mock.calls[0][1]).toMatchObject({agentId: "ag_1",diff --git a/src/web/src/lib/services/calendar.ts b/src/web/src/lib/services/calendar.tsindex ea3dfc694..5a419594e 100644--- a/src/web/src/lib/services/calendar.ts+++ b/src/web/src/lib/services/calendar.ts@@ -77,7 +77,7 @@ export async function promoteDueCalendarEventsForWorkspace(await queries.message.createMessage(db, {conversationId: conv.id,- role: "user",+ role: "event",content: ev.title,});diff --git a/src/web/src/lib/services/sweep.test.ts b/src/web/src/lib/services/sweep.test.tsindex 8d35c083c..89ee78c2d 100644--- a/src/web/src/lib/services/sweep.test.ts+++ b/src/web/src/lib/services/sweep.test.ts@@ -34,7 +34,7 @@ vi.mock("@alook/shared", () => ({},},TASK_TYPES: { USER_DM_MESSAGE: "user_dm_message", KILL_TASK: "kill_task" },- buildContextKey: () => "ctx:test",+ buildEmailMapKey: (agentId: string, threadId: string) => `email:${agentId}:${threadId}`,}));vi.mock("@/lib/logger", () => ({diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.tsindex f3efc9cb6..cd3142cd4 100644--- a/src/web/src/lib/services/task.test.ts+++ b/src/web/src/lib/services/task.test.ts@@ -9,7 +9,6 @@ vi.mock("@alook/shared", () => ({CALENDAR_EVENT: "calendar_event",KILL_TASK: "kill_task",},- buildContextKey: (...a: unknown[]) => `ctx:${(a[1] as Record<string, unknown>)?.conversationId}`,queries: {task: {createTask: vi.fn(),@@ -808,6 +807,34 @@ describe("TaskService", () => {context: { attachment_ids: ["a1"] },}));});++ it("propagates contextKey from original task", async () => {+ const taskWithKey = { ...failedTask, contextKey: "c1" };+ taskQ.getTask.mockResolvedValue(taskWithKey);+ taskQ.markFailedAsSuperseded.mockResolvedValue({ ...taskWithKey, status: "superseded" });+ agentQ.getAgent.mockResolvedValue({ id: "a1", runtimeId: "r1" });+ taskQ.createTask.mockResolvedValue({ id: "t2", status: "queued" });++ await service.retryTask("t1", "w1");++ expect(taskQ.createTask).toHaveBeenCalledWith({}, expect.objectContaining({+ contextKey: "c1",+ }));+ });++ it("handles original task with contextKey: null gracefully", async () => {+ const taskNoKey = { ...failedTask, contextKey: null };+ taskQ.getTask.mockResolvedValue(taskNoKey);+ taskQ.markFailedAsSuperseded.mockResolvedValue({ ...taskNoKey, status: "superseded" });+ agentQ.getAgent.mockResolvedValue({ id: "a1", runtimeId: "r1" });+ taskQ.createTask.mockResolvedValue({ id: "t2", status: "queued" });++ await service.retryTask("t1", "w1");++ expect(taskQ.createTask).toHaveBeenCalledWith({}, expect.objectContaining({+ contextKey: null,+ }));+ });});// ── claimTasksForRuntimes with kill_tasks ───────────────────diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.tsindex 74eb8255e..c7e5f8cb5 100644--- a/src/web/src/lib/services/task.ts+++ b/src/web/src/lib/services/task.ts@@ -1,5 +1,5 @@import type { Database } from "@alook/shared";-import { queries, TASK_TYPES, buildContextKey } from "@alook/shared";+import { queries, TASK_TYPES } from "@alook/shared";import { log } from "@/lib/logger";import { broadcastToUser } from "@/lib/broadcast";import { messageToResponse, taskToResponse } from "@/lib/api/responses";@@ -203,7 +203,10 @@ export class TaskService {workspaceId,original.prompt,original.type,- { context: original.context as Record<string, unknown> | undefined },+ {+ contextKey: original.contextKey ?? null,+ context: original.context as Record<string, unknown> | undefined,+ },);return { oldTask: marked, newTask };@@ -262,7 +265,7 @@ export class TaskService {const userId = conversation.userId;try {- const contextKey = buildContextKey(TASK_TYPES.USER_DM_MESSAGE, { conversationId });+ const contextKey = conversationId;const attachmentIds = activated.attachmentIds ? JSON.parse(activated.attachmentIds) as string[] : [];const task = await this.enqueueTask(conversation.agentId,diff --git a/src/web/src/test/e2e/task-lifecycle.test.ts b/src/web/src/test/e2e/task-lifecycle.test.tsindex c8e6a9a52..3a77c4d7c 100644--- a/src/web/src/test/e2e/task-lifecycle.test.ts+++ b/src/web/src/test/e2e/task-lifecycle.test.ts@@ -61,7 +61,7 @@ describe("task lifecycle", () => {expect(data.tasks[0].id).toBe(taskId)expect(data.tasks[0].status).toBe("dispatched")expect(data.tasks[0].prompt).toBe("Run the e2e tests")- expect(data.tasks[0].context_key).toBe(`dm:${conversationId}`)+ expect(data.tasks[0].context_key).toBe(conversationId)// Poll response includes agent dataexpect(data.tasks[0].agent).toBeTruthy()const agent = data.tasks[0].agent as Record<string, unknown>@@ -193,7 +193,7 @@ describe("context_key resume contract", () => {const pollData = await pollRes.json() as { tasks: Array<Record<string, unknown>> }expect(pollData.tasks).toHaveLength(1)// Same conversation → same context_key- expect(pollData.tasks[0].context_key).toBe(`dm:${conversationId}`)+ expect(pollData.tasks[0].context_key).toBe(conversationId)// Clean up: start + complete this taskawait tokenRequest(`/api/daemon/tasks/${task2Id}/start`, seed.machineToken, { method: "POST" })@@ -242,8 +242,8 @@ describe("context_key resume contract", () => {const pollData = await pollRes.json() as { tasks: Array<Record<string, unknown>> }expect(pollData.tasks).toHaveLength(1)// Different conversation → different context_key- expect(pollData.tasks[0].context_key).toBe(`dm:${conv2Id}`)- expect(pollData.tasks[0].context_key).not.toBe(`dm:${conversationId}`)+ expect(pollData.tasks[0].context_key).toBe(conv2Id)+ expect(pollData.tasks[0].context_key).not.toBe(conversationId)// Clean upconst tid = pollData.tasks[0].id as string@@ -255,7 +255,7 @@ describe("context_key resume contract", () => {})})- it("email notify with same thread root produces same context_key", async () => {+ it("email notify with same thread root reuses same conversation via mapping", async () => {const threadRoot = `<root-${Date.now()}@e2e.test>`// First email in thread@@ -292,8 +292,10 @@ describe("context_key resume contract", () => {)const poll1Data = await poll1.json() as { tasks: Array<Record<string, unknown>> }expect(poll1Data.tasks).toHaveLength(1)- const emailKey1 = poll1Data.tasks[0].context_key as string- expect(emailKey1).toBe(`email:${threadRoot}`)+ const emailConvId = poll1Data.tasks[0].context_key as string+ // context_key is now a conversation ID (not email:threadRoot)+ expect(emailConvId).toBeTruthy()+ expect(emailConvId).toBe(poll1Data.tasks[0].conversation_id)// Complete itconst tid1 = poll1Data.tasks[0].id as string@@ -338,8 +340,9 @@ describe("context_key resume contract", () => {)const poll2Data = await poll2.json() as { tasks: Array<Record<string, unknown>> }expect(poll2Data.tasks).toHaveLength(1)- // Same thread root → same context_key- expect(poll2Data.tasks[0].context_key).toBe(emailKey1)+ // Same thread root → same conversation (via conversation_map lookup)+ expect(poll2Data.tasks[0].context_key).toBe(emailConvId)+ expect(poll2Data.tasks[0].conversation_id).toBe(emailConvId)// Clean upconst tid2 = poll2Data.tasks[0].id as string