cli-jaw 2.2.19 → 2.2.20

package/dist/src/security/path-guards.js

@@ -12,6 +12,80 @@ function badRequest(code) {
 function forbidden(code) {
     return Object.assign(new Error(code), { statusCode: 403 });
 }
+function defaultRealpath(p) {
+    try {
+        return fs.realpathSync.native(p);
+    }
+    catch {
+        return null;
+    }
+}
+export const hostPathEnvironment = {
+    impl: path,
+    windows: process.platform === 'win32',
+    realpath: defaultRealpath,
+    resolveHome: resolveHomePath,
+};
+/**
+ * Reject NTFS alternate-data-stream suffixes and Win32-trimmed components.
+ *
+ * Measured on Windows (devlog/_plan/260812_windows_and_channels_parity/005):
+ * writing `a.md:hidden` succeeds, the stream is absent from a name-only
+ * directory listing, and its content is still fully readable — so a name-based
+ * allowlist never sees the payload. `trailing.md.` lands on disk as
+ * `trailing.md`, so two distinct strings name one file.
+ *
+ * Only applied under Windows semantics: on POSIX a colon is a legal filename
+ * character, and rejecting it there would break working callers.
+ */
+export function assertNoWindowsStreamSuffix(input, env = hostPathEnvironment) {
+    if (!env.windows)
+        return;
+    const value = String(input || '');
+    // Strip the ROOT before scanning. `path.win32.parse` understands drive
+    // roots (`C:\`), UNC roots (`\\server\share\`), and extended-length
+    // namespace roots (`\\?\C:\`, `\\?\UNC\server\share\`). Scanning the whole
+    // string instead would reject `\\?\C:\Data\f.md` — a legitimate long-path
+    // form that `path.toNamespacedPath()` emits — as if its drive colon were a
+    // stream separator.
+    const root = path.win32.parse(value).root;
+    const tail = root ? value.slice(root.length) : value;
+    for (const seg of tail.split(/[\\/]+/)) {
+        if (!seg)
+            continue;
+        // No colon is legal outside the root: this is the NTFS ADS separator.
+        if (seg.includes(':'))
+            throw forbidden('path_stream_denied');
+        // `.` and `..` are ordinary relative segments that legitimately end in
+        // a dot. Rejecting them here would mask traversal as an encoding error
+        // and break every relative path — containment, not this rule, is what
+        // decides whether `..` is allowed to escape.
+        if (seg === '.' || seg === '..')
+            continue;
+        if (/[ .]$/.test(seg))
+            throw forbidden('path_trailing_trim_denied');
+    }
+}
+/**
+ * Canonical identity for containment comparison.
+ *
+ * Deliberately NOT case-folding, on any platform. Folding ASCII merely because
+ * the host is Windows is an over-authorization bug, not a convenience: Windows
+ * supports per-directory case sensitivity (`fsutil file setCaseSensitiveInfo`)
+ * and case-sensitive SMB shares, so `...\Root` and `...\root` can be two
+ * different directories. Folding makes a forbidden sibling look contained.
+ * This was demonstrated on a real Windows host — see
+ * devlog/_plan/260812_windows_and_channels_parity/010.
+ *
+ * Case-insensitivity is instead obtained where it is actually true: both the
+ * candidate and the roots in `assertSendFilePath` pass through native
+ * `realpath`, which restores each entry's real on-disk casing. Comparing those
+ * canonical forms exactly is both correct on case-insensitive volumes and safe
+ * on case-sensitive ones.
+ */
+export function pathIdentity(p) {
+    return p;
+}
 /**
  * Skill ID 검증 — 소문자 영숫자 + 하이픈/점/밑줄만 허용
  * @param {string} id
@@ -80,12 +154,19 @@ export function assertMemoryRelPath(input, { allowExt = ['.md'] } = {}) {
  * @returns {string} resolved absolute path
  * @throws 403 path_escape
  */
-export function safeResolveUnder(baseDir, unsafeName) {
-    const base = path.resolve(baseDir);
-    const resolved = path.resolve(base, unsafeName);
-    const pref = base.endsWith(path.sep) ? base : base + path.sep;
-    if (resolved !== base && !resolved.startsWith(pref))
+export function safeResolveUnder(baseDir, unsafeName, env = hostPathEnvironment) {
+    assertNoWindowsStreamSuffix(unsafeName, env);
+    const p = env.impl;
+    const base = p.resolve(baseDir);
+    const resolved = p.resolve(base, unsafeName);
+    // Exact comparison, deliberately. This helper is purely lexical — it never
+    // canonicalizes — so it cannot know whether the volume is case sensitive.
+    // Folding here would be a guess that fails open on a case-sensitive
+    // directory; exact matching only ever fails closed.
+    const pref = base.endsWith(p.sep) ? base : base + p.sep;
+    if (resolved !== base && !resolved.startsWith(pref)) {
         throw forbidden('path_escape');
+    }
     return resolved;
 }
 /**
@@ -93,39 +174,55 @@ export function safeResolveUnder(baseDir, unsafeName) {
  * Prevents arbitrary file exfiltration via /api/telegram/send, /api/channel/send, etc.
  * @throws 403 path_not_allowed
  */
-function safeRealpath(p) {
-    try {
-        return fs.realpathSync.native(p);
-    }
-    catch {
-        return null;
-    }
-}
-function isUnderRoot(canonical, root) {
-    const pref = root.endsWith(path.sep) ? root : root + path.sep;
-    return canonical === root || canonical.startsWith(pref);
+/**
+ * Containment between two ALREADY-CANONICAL paths.
+ *
+ * Both sides come from native `realpath`, so each carries its true on-disk
+ * casing and an exact comparison is right on case-insensitive and
+ * case-sensitive volumes alike.
+ */
+function isUnderRoot(canonical, root, env = hostPathEnvironment) {
+    const c = pathIdentity(canonical);
+    const r = pathIdentity(root);
+    const pref = r.endsWith(env.impl.sep) ? r : r + env.impl.sep;
+    return c === r || c.startsWith(pref);
 }
-export function assertSendFilePath(filePath, workingDir, projectDirs) {
-    const resolved = path.resolve(filePath);
-    const canonical = safeRealpath(resolved);
+export function assertSendFilePath(filePath, workingDir, projectDirs, env = hostPathEnvironment) {
+    // Reject stream/trim forms before any filesystem call: `a.md:hidden`
+    // resolves and realpaths cleanly, so a later check would already be too late.
+    assertNoWindowsStreamSuffix(filePath, env);
+    const p = env.impl;
+    const resolved = p.resolve(filePath);
+    const canonical = env.realpath(resolved);
     if (!canonical)
         throw forbidden('path_not_resolvable');
     // Allow anything under JAW_HOME
-    const jawHome = resolveHomePath(process.env["CLI_JAW_HOME"] || process.env["JAW_HOME"] || path.join(os.homedir(), '.cli-jaw'));
-    const canonJaw = safeRealpath(jawHome);
-    if (canonJaw && isUnderRoot(canonical, canonJaw))
+    const jawHome = env.resolveHome(process.env["CLI_JAW_HOME"] || process.env["JAW_HOME"] || p.join(os.homedir(), '.cli-jaw'));
+    const canonJaw = env.realpath(jawHome);
+    if (canonJaw && isUnderRoot(canonical, canonJaw, env))
         return canonical;
     if (workingDir) {
-        const canonWd = safeRealpath(path.resolve(workingDir));
-        if (canonWd && isUnderRoot(canonical, canonWd))
+        const canonWd = env.realpath(p.resolve(workingDir));
+        if (canonWd && isUnderRoot(canonical, canonWd, env))
             return canonical;
     }
     if (projectDirs) {
         for (const dir of projectDirs) {
-            const currentReal = safeRealpath(path.resolve(dir));
-            if (!currentReal || currentReal !== path.resolve(dir))
+            // Compare canonical-to-canonical. The previous form required
+            // `realpath(dir) === resolve(dir)`, which silently dropped every
+            // project root on Windows whose stored casing differed from the
+            // on-disk casing, because native realpath restores real casing
+            // (verified on a Windows host: input `...\mixed` canonicalizes to
+            // `...\MiXeD`, so the equality never held).
+            //
+            // Resolving the root is also what makes containment meaningful: the
+            // candidate is already canonical, so both sides must be. A root
+            // that is a symlink is therefore evaluated at its target, which is
+            // the location the operator actually granted by configuring it.
+            const currentReal = env.realpath(p.resolve(dir));
+            if (!currentReal)
                 continue;
-            if (isUnderRoot(canonical, currentReal))
+            if (isUnderRoot(canonical, currentReal, env))
                 return canonical;
         }
     }

package/dist/src/security/path-guards.js.map

@@ -1 +1 @@
-{"version":3,"file":"path-guards.js","sourceRoot":"","sources":["../../../src/security/path-guards.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,8DAA8D;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAC7C,MAAM,YAAY,GAAG,8BAA8B,CAAC;AAEpD,SAAS,UAAU,CAAC,IAAY;IAC5B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,EAAU;IACpC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,MAAM,UAAU,CAAC,qBAAqB,CAAC,CAAC;IACrG,OAAO,CAAC,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB,EAAE,EAAE,QAAQ,GAAG,CAAC,KAAK,CAAC,KAA8B,EAAE;IACjG,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAChE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAClG,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC;IACtF,OAAO,CAAC,CAAC;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa,EAAE,EAAE,QAAQ,GAAG,CAAC,KAAK,CAAC,KAA8B,EAAE;IACnG,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzD,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IACrG,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC3D,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC;IACtF,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,UAAkB;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9D,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,MAAM,SAAS,CAAC,aAAa,CAAC,CAAC;IACpF,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,CAAS;IAC3B,IAAI,CAAC;QAAC,OAAO,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAAC,CAAC;IACzC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;AAC1B,CAAC;AAED,SAAS,WAAW,CAAC,SAAiB,EAAE,IAAY;IAChD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;IAC9D,OAAO,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,UAAmB,EAAE,WAA6B;IACnG,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,SAAS;QAAE,MAAM,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAEvD,gCAAgC;IAChC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC,CAAC;IAC/H,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ,IAAI,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAEnE,IAAI,UAAU,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QACvD,IAAI,OAAO,IAAI,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;IACrE,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QACd,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;gBAAE,SAAS;YAChE,IAAI,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC;gBAAE,OAAO,SAAS,CAAC;QAC9D,CAAC;IACL,CAAC;IAED,MAAM,SAAS,CAAC,kBAAkB,CAAC,CAAC;AACxC,CAAC"}
+{"version":3,"file":"path-guards.js","sourceRoot":"","sources":["../../../src/security/path-guards.ts"],"names":[],"mappings":"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"}

package/dist/src/slack/api.js

@@ -87,8 +87,22 @@ export const redactSlackTokens = redactChannelSecrets;
  * The repo runs `exactOptionalPropertyTypes`, so `{ status: undefined }` is not
  * assignable to `{ status?: number }` — the key has to be absent instead.
  */
-export function slackFailure(error, status) {
-    return status === undefined ? { ok: false, error } : { ok: false, error, status };
+export function slackFailure(error, status, retryAfterMs) {
+    return {
+        ok: false,
+        error,
+        ...(status !== undefined ? { status } : {}),
+        ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+    };
+}
+export function parseRetryAfterMs(headers) {
+    const raw = headers.get('retry-after');
+    if (raw == null || raw.trim() === '')
+        return undefined;
+    const seconds = Number(raw);
+    if (!Number.isFinite(seconds) || seconds < 0)
+        return undefined;
+    return Math.ceil(seconds * 1000);
 }
 /**
  * Call a Slack Web API method.
@@ -127,21 +141,40 @@ export async function slackApi(token, method, body, options = {}) {
     }
     try {
         const response = await doFetch(url, init);
+        const retryAfterMs = response.headers
+            ? parseRetryAfterMs(response.headers)
+            : undefined;
         const text = await response.text();
         let parsed = {};
         try {
             parsed = text ? JSON.parse(text) : {};
         }
         catch {
-            return { ok: false, error: 'invalid_json_response', status: response.status };
+            return {
+                ok: false,
+                error: 'invalid_json_response',
+                status: response.status,
+                ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+            };
         }
         // Slack signals application errors with HTTP 200 + ok:false.
         if (parsed['ok'] !== true) {
             const err = typeof parsed['error'] === 'string' ? parsed['error'] : 'unknown_error';
             log.warn('[slack:api]', redactSlackTokens(`${method} failed: ${err}`));
-            return { ok: false, error: err, status: response.status, data: parsed };
+            return {
+                ok: false,
+                error: err,
+                status: response.status,
+                ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+                data: parsed,
+            };
         }
-        return { ok: true, status: response.status, data: parsed };
+        return {
+            ok: true,
+            status: response.status,
+            ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+            data: parsed,
+        };
     }
     catch (error) {
         return {

package/dist/src/slack/api.js.map

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

package/dist/src/slack/bot.js

@@ -18,17 +18,23 @@ import { buildMediaPromptMany } from '../agent/spawn.js';
 import { slackApi } from './api.js';
 import { SlackSocketClient } from './socket.js';
 import { resolveEventText, shouldAttachSlack, shouldProcessSlackEvent } from './events.js';
-import { isThreadParticipated, markThreadParticipated } from './thread-tracker.js';
+import { isThreadParticipated, markThreadParticipated, claimThreadPrefetch, commitThreadPrefetch, releaseThreadPrefetch, resetThreadPrefetchClaims, } from './thread-tracker.js';
 import { sendSlackText, getSlackSendClient } from './send-only-client.js';
 import { startSlackProgress, statusFromToolEvent } from './progress.js';
 import { createSlackForwarder, relaySlackImages } from './forwarder.js';
 import { handleSlackSlashCommand } from './commands.js';
 import { logErrorText, redactOutboundText } from '../messaging/redact.js';
 import { downloadAndSaveSlackFiles } from './inbound-file.js';
-import { admitSlackRun, claimSlackEvent, enqueueSlackIngress, resetSlackIngress, slackEventKey, slackIngressLaneKey } from './ingress.js';
+import { admitSlackRun, claimSlackEvent, commitSlackEvent, currentIngressGeneration, enqueueSlackIngress, isIngressGenerationCurrent, resetSlackIngress, slackEventKey, slackIngressLaneKey } from './ingress.js';
 import { buildSenderDisplay, buildSenderPrompt, resolveSenderIdentity } from './identity.js';
+import { resolveConversationInfo, resolveThreadInfo } from './conversation.js';
+import { buildSlackContextBlock, applySlackContext, buildThreadPreamble, ROSTER_PREVIEW } from './context.js';
+import { formatHistoryForAgent } from './history.js';
+import { cachedNameMap } from './conversation.js';
+import { fetchSlackChannelMembers } from './roster.js';
 import { recoverSlackAttachments } from './attachment-recovery.js';
 import { resetSlackIdentityCache } from './identity.js';
+import { resetSlackConversationCache } from './conversation.js';
 let socketClient = null;
 let forwarderHandler = null;
 let selfUserId = null;
@@ -79,7 +85,7 @@ function buildSlackTarget(event) {
     });
 }
 // ─── Dispatch (full reply path) ─────────────────────
-async function slackOrchestrate(target, prompt, displayMsg, signal) {
+async function slackOrchestrate(target, prompt, displayMsg, signal, dedupe = {}) {
     const client = getSlackSendClient();
     if (!client.token)
         return;
@@ -87,6 +93,15 @@ async function slackOrchestrate(target, prompt, displayMsg, signal) {
     const chatId = target.targetId;
     if (signal.aborted)
         return;
+    // #321: the reservation was taken before an `await` and several early
+    // returns. If a reset landed in that window this delivery belongs to a dead
+    // generation — a redelivery has already re-reserved it, and admitting here
+    // would run the same message twice.
+    if (dedupe.reservationGeneration !== undefined
+        && !isIngressGenerationCurrent(dedupe.reservationGeneration)) {
+        log.info('[slack:in] skipped (stale_generation)');
+        return;
+    }
     const result = admitSlackRun({
         target, prompt, displayText: displayMsg, chatId,
         runReply: async (ctx) => {
@@ -128,6 +143,11 @@ async function slackOrchestrate(target, prompt, displayMsg, signal) {
             }
         },
     });
+    // Durable commit AFTER admission, with no await in between: an event that
+    // died before this line stays redeliverable, which is the whole point of
+    // ordering it here rather than at reservation time.
+    if (dedupe.eventKey && result.action !== 'rejected')
+        commitSlackEvent(dedupe.eventKey);
     result.laneTail?.catch(error => log.error('[slack:lane]', logErrorText(error)));
     if (result.action === 'queued') {
         log.info(`[slack:queue] agent busy, queued (${result.pending} pending)`);
@@ -185,7 +205,26 @@ function buildSlackFileFailureWarning(failed, allFailed = false) {
     const items = failed.map(file => `- ${file.name}: ${t(`slack.files.error.${file.code}`, {}, locale)}`);
     return `${t(allFailed ? 'slack.files.allFailure' : 'slack.files.partialFailure', {}, locale)}\n${items.join('\n')}`;
 }
-export async function processSlackMessageEvent(event, target, text, signal) {
+export async function processSlackMessageEvent(event, target, text, signal, opts = {}) {
+    // The claim was taken synchronously in handleSlackEnvelope, before this task
+    // was queued. Every path out of here that did NOT inject history has to give
+    // it back, or one skipped attempt silences the thread for the whole runtime.
+    // The paths are many (empty prompt, all attachments failed, abort, continue
+    // intent, config off, lookup failure, deadline), so the release is a finally
+    // rather than a return-by-return audit.
+    let prefetchCommitted = false;
+    try {
+        await runSlackMessageEvent(event, target, text, signal, opts, () => {
+            prefetchCommitted = Boolean(opts.prefetchToken) && commitThreadPrefetch(event.channel || '', event.thread_ts || '', opts.prefetchToken || 0);
+        });
+    }
+    finally {
+        if (opts.prefetchToken && !prefetchCommitted) {
+            releaseThreadPrefetch(event.channel || '', event.thread_ts || '', opts.prefetchToken);
+        }
+    }
+}
+async function runSlackMessageEvent(event, target, text, signal, opts, commitPrefetch) {
     const files = event.files || [];
     let prompt = text;
     let displayText = text;
@@ -225,10 +264,109 @@ export async function processSlackMessageEvent(event, target, text, signal) {
     // continuation, so control text travels undecorated. Reset is already
     // intercepted upstream and never reaches here.
     if (!isContinueIntent(prompt)) {
-        prompt = buildSenderPrompt(identity, prompt);
+        const block = await buildInboundContextBlock(event, identity, signal, opts, commitPrefetch);
+        // An empty block lands EXACTLY on the previous behavior: config off and
+        // total lookup failure must be indistinguishable from before this
+        // feature existed.
+        prompt = block
+            ? applySlackContext(block, prompt)
+            : buildSenderPrompt(identity, prompt);
+        // Display text is unchanged either way: the UI/DB bubble shows who sent
+        // the message, and the conversation is already obvious in Slack's own UI.
         displayText = buildSenderDisplay(identity, displayText);
     }
-    await slackOrchestrate(target, prompt, displayText, signal);
+    await slackOrchestrate(target, prompt, displayText, signal, {
+        ...(opts.eventKey ? { eventKey: opts.eventKey } : {}),
+        ...(opts.reservationGeneration !== undefined
+            ? { reservationGeneration: opts.reservationGeneration } : {}),
+    });
+}
+/**
+ * Inbound deadline for the whole context phase.
+ *
+ * Larger than identity's 400ms because this is up to two round trips, but still
+ * a hard bound: naming a conversation must never hold a user's message. Work
+ * that outlives the deadline keeps running and warms the cache, so the next
+ * message in the same conversation gets the full block.
+ */
+const INBOUND_CONTEXT_DEADLINE_MS = 700;
+async function buildInboundContextBlock(event, identity, signal, opts = {}, commitPrefetch = () => { }) {
+    const channel = event.channel || '';
+    // The caller's finally releases an uncommitted claim, so early returns here
+    // need no cleanup of their own.
+    if (settings["slack"]?.conversationContext === false)
+        return '';
+    if (!channel)
+        return '';
+    const token = getSlackSendClient().token;
+    if (!token)
+        return '';
+    const teamId = String(settings["slack"]?.teamId || 'unknown');
+    const threadTs = event.thread_ts || '';
+    const work = (async () => {
+        // Independent lookups: serial would double the round trips inside a
+        // deadline that exists to stay small.
+        const [conversation, thread] = await Promise.all([
+            resolveConversationInfo(token, channel, { teamId, signal }),
+            threadTs
+                ? resolveThreadInfo(token, channel, threadTs, { teamId, signal })
+                : Promise.resolve(undefined),
+        ]);
+        const roster = await resolveRosterContext(token, channel, teamId, conversation.kind, signal);
+        const block = buildSlackContextBlock({
+            identity,
+            conversation,
+            ...(thread ? { thread } : {}),
+            ...(roster ? { roster } : {}),
+            selfUserId,
+        });
+        // First entry into a thread already in progress: give the agent what was
+        // said before it was pulled in. Once only — later messages ride the
+        // agent session, and re-injecting would waste tokens and Tier 3 budget.
+        if (!opts.prefetchToken || !thread?.resolved || !thread.messages?.length)
+            return block;
+        // The current message is already the prompt body; repeating it here
+        // would show the agent its own input twice.
+        const prior = thread.messages.filter(message => message.ts !== event.ts);
+        if (!prior.length)
+            return block;
+        const authorIds = prior
+            .map(message => message.user || message.botId || '')
+            .filter(Boolean);
+        const preamble = buildThreadPreamble(formatHistoryForAgent(prior, selfUserId, cachedNameMap(teamId, authorIds)), thread.replyCount);
+        if (!preamble)
+            return block;
+        // History is actually going into the prompt: the claim is spent.
+        commitPrefetch();
+        return block ? `${block}\n${preamble}` : preamble;
+    })();
+    return raceContextDeadline(work, INBOUND_CONTEXT_DEADLINE_MS);
+}
+/** Opt-in channel roster. Off by default: see 021 contract §설정. */
+async function resolveRosterContext(token, channel, teamId, kind, signal) {
+    if (settings["slack"]?.channelRoster !== true)
+        return undefined;
+    // In a DM the other party is the sender; a roster line would just repeat it.
+    if (kind === 'dm')
+        return undefined;
+    const result = await fetchSlackChannelMembers(token, channel, { teamId, signal, limit: 200 });
+    if (!result.ok)
+        return undefined;
+    const humans = result.members.filter(member => !member.isBot);
+    return {
+        names: humans.slice(0, ROSTER_PREVIEW).map(member => member.name),
+        total: humans.length,
+        // The walk is page-bounded, so a truncated result is a lower bound.
+        ...(result.hasMore ? { approximate: true } : {}),
+    };
+}
+function raceContextDeadline(work, ms) {
+    return new Promise(resolve => {
+        const timer = setTimeout(() => resolve(''), ms);
+        // unref: a pending deadline must never hold the process open.
+        timer.unref?.();
+        void work.then(value => { clearTimeout(timer); resolve(value); }, () => { clearTimeout(timer); resolve(''); });
+    });
 }
 // ─── Envelope routing ───────────────────────────────
 export async function handleSlackEnvelope(envelope) {
@@ -251,6 +389,10 @@ export async function handleSlackEnvelope(envelope) {
         log.info(`[slack:in] skipped (${decision.reason})`);
         return;
     }
+    // Carried to the admission site so the durable commit happens only after a
+    // run is accepted, and so a reset in between invalidates this delivery.
+    let reservedEventKey;
+    let reservationGeneration;
     // Message-level dedupe goes HERE — after the gate, before identity resolution.
     // After the gate, because Slack delivers a `message` copy and an `app_mention`
     // copy of one mention under the same ts; the gate drops the former, and letting
@@ -264,46 +406,77 @@ export async function handleSlackEnvelope(envelope) {
             log.info('[slack:in] skipped (duplicate_event)');
             return;
         }
+        reservedEventKey = eventKey;
+        reservationGeneration = currentIngressGeneration();
     }
     if (event.type === 'app_mention' && event.channel) {
         // A mention inside a thread marks that thread; a top-level mention
         // marks the thread this message would parent (marking point a).
         markThreadParticipated(event.channel, event.thread_ts || event.ts || '');
+        if (!event.thread_ts && event.ts) {
+            // A thread WE start needs no history: the parent mention and our
+            // reply are already the session's own context. Spend the claim now
+            // so the first follow-up does not re-inject what the agent said.
+            const token = claimThreadPrefetch(event.channel, event.ts);
+            commitThreadPrefetch(event.channel, event.ts, token);
+        }
     }
-    const target = buildSlackTarget(event);
-    setLastActiveTarget('slack', target);
-    setLatestSeenTarget('slack', target);
-    const text = resolveEventText(event, selfUserId);
-    let hasFiles = Boolean(event.files?.length);
-    // app_mention 봉투에는 files 가 없고, 첨부를 가진 message 사본은 위
-    // shouldProcessSlackEvent 에서 mention_via_app_mention 으로 드롭된다.
-    // 그래서 멘션과 함께 올린 파일은 여기서 되찾지 않으면 영영 사라진다.
-    if (!hasFiles && event.type === 'app_mention' && event.channel && event.ts) {
-        const recoverToken = getSlackSendClient().token;
-        if (recoverToken) {
-            const recovered = await recoverSlackAttachments(recoverToken, event.channel, event.ts, event.thread_ts ? { threadTs: event.thread_ts } : {});
-            if (recovered.length) {
-                event.files = recovered;
-                hasFiles = true;
-                log.info(`[slack:recover] ${event.channel} ts=${event.ts}: ${recovered.length} attachment(s)`);
+    // Claim the one-time thread prefetch HERE, synchronously, before the ingress
+    // task is queued. Asking inside the queue task instead would be a dead
+    // branch for app_mention (the mark above already ran) and a race for
+    // DM/listen-all channels (they are marked only after a successful reply,
+    // which is not awaited). On the accepted message-event path no `await` runs
+    // between this function's entry and this line, so the test-and-set is atomic
+    // against a second envelope in the same tick.
+    const prefetchToken = event.thread_ts
+        ? claimThreadPrefetch(event.channel || '', event.thread_ts)
+        : 0;
+    let prefetchHandedOff = false;
+    try {
+        const target = buildSlackTarget(event);
+        setLastActiveTarget('slack', target);
+        setLatestSeenTarget('slack', target);
+        const text = resolveEventText(event, selfUserId);
+        let hasFiles = Boolean(event.files?.length);
+        // app_mention 봉투에는 files 가 없고, 첨부를 가진 message 사본은 위
+        // shouldProcessSlackEvent 에서 mention_via_app_mention 으로 드롭된다.
+        // 그래서 멘션과 함께 올린 파일은 여기서 되찾지 않으면 영영 사라진다.
+        if (!hasFiles && event.type === 'app_mention' && event.channel && event.ts) {
+            const recoverToken = getSlackSendClient().token;
+            if (recoverToken) {
+                const recovered = await recoverSlackAttachments(recoverToken, event.channel, event.ts, event.thread_ts ? { threadTs: event.thread_ts } : {});
+                if (recovered.length) {
+                    event.files = recovered;
+                    hasFiles = true;
+                    log.info(`[slack:recover] ${event.channel} ts=${event.ts}: ${recovered.length} attachment(s)`);
+                }
             }
         }
+        if (!text && !hasFiles)
+            return;
+        if (text)
+            log.info(`[slack:in] ${event.channel}: ${redactOutboundText(text).slice(0, 80)}`);
+        if (!hasFiles && isResetIntent(text)) {
+            const client = getSlackSendClient();
+            const result = submitMessage(text, { origin: 'slack', target });
+            if (client.token) {
+                await sendSlackText(client.token, target, result.action === 'rejected'
+                    ? t('ws.agentBusy', {}, currentLocale())
+                    : t('tg.resetDone', {}, currentLocale()));
+            }
+            return;
+        }
+        prefetchHandedOff = enqueueSlackIngress(slackIngressLaneKey(target), signal => processSlackMessageEvent(event, target, text, signal, {
+            prefetchToken,
+            ...(reservedEventKey ? { eventKey: reservedEventKey } : {}),
+            ...(reservationGeneration !== undefined ? { reservationGeneration } : {}),
+        }));
     }
-    if (!text && !hasFiles)
-        return;
-    if (text)
-        log.info(`[slack:in] ${event.channel}: ${redactOutboundText(text).slice(0, 80)}`);
-    if (!hasFiles && isResetIntent(text)) {
-        const client = getSlackSendClient();
-        const result = submitMessage(text, { origin: 'slack', target });
-        if (client.token) {
-            await sendSlackText(client.token, target, result.action === 'rejected'
-                ? t('ws.agentBusy', {}, currentLocale())
-                : t('tg.resetDone', {}, currentLocale()));
+    finally {
+        if (prefetchToken && !prefetchHandedOff) {
+            releaseThreadPrefetch(event.channel || '', event.thread_ts || '', prefetchToken);
         }
-        return;
     }
-    enqueueSlackIngress(slackIngressLaneKey(target), signal => processSlackMessageEvent(event, target, text, signal));
 }
 // ─── Init / Shutdown ────────────────────────────────
 export async function initSlack() {
@@ -396,6 +569,12 @@ async function disposeSlackRuntime() {
     // Identity is cached per (team, id). A re-init can authenticate against a
     // different workspace, so the cache must not outlive the runtime that filled it.
     resetSlackIdentityCache();
+    // Same reasoning for channel names and thread participants: a workspace
+    // switch would otherwise attribute the previous team's conversations.
+    resetSlackConversationCache();
+    // Prefetch claims are per-runtime: a fresh runtime has no agent session, so
+    // the next message in a thread should get its history again.
+    resetThreadPrefetchClaims();
     if (forwarderHandler) {
         removeBroadcastListener(forwarderHandler);
         forwarderHandler = null;