@addozhang/dsh-discord 0.2.3 → 0.4.0

package/lib/i18n.d.ts

@@ -78,6 +78,7 @@ declare const zh: {
     mainlineSessionRejected: string;
     mainlineSessionUnknown: string;
     mainlinePromptRejected: string;
+    mainlineImageFailed: string;
     mainlinePromptUnknown: string;
     continuationRejected: string;
     continuationUnknown: string;
@@ -109,6 +110,19 @@ declare const zh: {
     modelNotInCatalog: string;
     modelInvalidReasoning: string;
     modelTypedParseFailed: string;
+    sessionResumeNeedsBoundChannel: string;
+    sessionResumeStarted: (threadId: string) => string;
+    sessionResumeAlreadyBound: (threadId: string) => string;
+    sessionResumeFailed: string;
+    sessionResumeAnchor: (title: string) => string;
+    sessionResumeControlChannel: string;
+    sessionResumeSubagent: string;
+    sessionResumeArchived: string;
+    sessionCandidateJustNow: string;
+    sessionCandidateMinutesAgo: (minutes: number) => string;
+    sessionCandidateHoursAgo: (hours: number) => string;
+    sessionCandidateDaysAgo: (days: number) => string;
+    sessionCandidateRunning: string;
     approvalRequired: (label: string) => string;
 };
 export type CopyTable = typeof zh;

package/lib/i18n.js

@@ -84,6 +84,7 @@ const zh = {
     mainlineSessionRejected: '⚠️ DSH 拒绝了会话创建（工作区可能已失效）；请稍后重试或重新 /project bind。',
     mainlineSessionUnknown: '⚠️ 会话创建结果未知；请到 DSH Web 确认后再重试，不会自动重复创建。',
     mainlinePromptRejected: '⚠️ DSH 拒绝了任务提交。',
+    mainlineImageFailed: '⚠️ 附件图片获取失败，任务未提交；请重试或改用文字描述。',
     mainlinePromptUnknown: '⚠️ 任务提交结果未知；为避免重复执行不会自动重发，请确认后重试。',
     continuationRejected: '⚠️ 消息提交被 DSH 拒绝。',
     continuationUnknown: '⚠️ 消息提交结果未知；不会自动重发，请确认后重试。',
@@ -118,6 +119,22 @@ const zh = {
     modelNotInCatalog: '⚠️ 该 provider/模型不在当前会话的目录中。',
     modelInvalidReasoning: '⚠️ 该推理强度对此模型无效。',
     modelTypedParseFailed: '⚠️ 模型需按 `provider/model` 格式填写，或留空进入交互式选择。',
+    // ── /session resume ──────────────────────────────────────────────────
+    sessionResumeNeedsBoundChannel: '⚠️ /session resume 需要在已绑定工作区的项目频道中使用。',
+    sessionResumeStarted: (threadId) => `✅ 会话已恢复到 <#${threadId}>——历史在 Web 界面查看，线程内直接续聊。`,
+    sessionResumeAlreadyBound: (threadId) => `该会话已在 <#${threadId}> 中。`,
+    sessionResumeFailed: '⚠️ 会话恢复失败，请稍后重试。',
+    sessionResumeAnchor: (title) => `📌 恢复会话：${title}`,
+    sessionResumeControlChannel: 'general 是控制频道，不承载会话——请到工作区频道使用 /session resume。',
+    sessionResumeSubagent: '⚠️ 这是 subagent 会话，不能恢复为顶层线程——可在 Web 界面查看。',
+    sessionResumeArchived: '⚠️ 该会话已归档，恢复后不会有任何运行——请在 Web 界面先取消归档。',
+    // Discord autocomplete choices carry no description field, so the age and
+    // running marker ride the candidate label (16.47).
+    sessionCandidateJustNow: '刚刚',
+    sessionCandidateMinutesAgo: (minutes) => `${String(minutes)} 分钟前`,
+    sessionCandidateHoursAgo: (hours) => `${String(hours)} 小时前`,
+    sessionCandidateDaysAgo: (days) => `${String(days)} 天前`,
+    sessionCandidateRunning: '运行中',
     // ── approval / question cards ────────────────────────────────────────
     approvalRequired: (label) => `Approval required — ${label}`,
 };
@@ -191,6 +208,7 @@ const en = {
     mainlineSessionRejected: '⚠️ DSH rejected the session creation (the workspace may be stale); try again later or re-run /project bind.',
     mainlineSessionUnknown: '⚠️ Session creation outcome unknown; confirm on the DSH web console before retrying. It will not be resubmitted automatically.',
     mainlinePromptRejected: '⚠️ DSH rejected the task submission.',
+    mainlineImageFailed: '⚠️ Could not fetch the attached image(s); the task was not submitted. Retry or describe it in text.',
     mainlinePromptUnknown: '⚠️ Task submission outcome unknown; it will not be resent automatically to avoid double execution. Confirm and retry.',
     continuationRejected: '⚠️ The message submission was rejected by DSH.',
     continuationUnknown: '⚠️ Message submission outcome unknown; it will not be resent automatically. Confirm and retry.',
@@ -223,6 +241,20 @@ const en = {
     modelNotInCatalog: "⚠️ That provider/model is not in this session's catalog.",
     modelInvalidReasoning: '⚠️ That reasoning effort is not valid for this model.',
     modelTypedParseFailed: '⚠️ The model must be `provider/model`, or left empty for the interactive cascade.',
+    // ── /session resume ──────────────────────────────────────────────────
+    sessionResumeNeedsBoundChannel: '⚠️ /session resume must run in a bound project channel.',
+    sessionResumeStarted: threadId => `✅ Session resumed into <#${threadId}> — full history lives in the web UI; continue in the thread.`,
+    sessionResumeAlreadyBound: threadId => `This session already lives in <#${threadId}>.`,
+    sessionResumeFailed: '⚠️ Resuming the session failed; try again later.',
+    sessionResumeAnchor: title => `📌 Resumed session: ${title}`,
+    sessionResumeControlChannel: 'general is the control channel and carries no sessions — use /session resume in a workspace channel.',
+    sessionResumeSubagent: '⚠️ That is a subagent session — it cannot be resumed as a top-level thread; view it in the web UI.',
+    sessionResumeArchived: '⚠️ That session is archived — a resumed one never runs; unarchive it in the web UI first.',
+    sessionCandidateJustNow: 'just now',
+    sessionCandidateMinutesAgo: minutes => `${String(minutes)}m ago`,
+    sessionCandidateHoursAgo: hours => `${String(hours)}h ago`,
+    sessionCandidateDaysAgo: days => `${String(days)}d ago`,
+    sessionCandidateRunning: 'running',
     // ── approval / question cards ────────────────────────────────────────
     approvalRequired: label => `Approval required — ${label}`,
 };

package/lib/index.js

@@ -1,7 +1,7 @@
 import { DEFAULT_DISCORD_SETTINGS, DiscordSettingsSchema, installDiscordSettings, normalizeDiscordSettings, } from './settings.js';
 import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { installCancellationRoot } from './lifecycle.js';
-import { ALLOWED_MENTIONS_NONE, DISCORD_SUPPRESS_NOTIFICATIONS_FLAG, OUTBOUND_EPHEMERAL_FLAGS } from './policy/disclosure.js';
+import { ALLOWED_MENTIONS_NONE, DISCORD_SUPPRESS_NOTIFICATIONS_FLAG, OUTBOUND_EPHEMERAL_FLAGS, safeTitle } from './policy/disclosure.js';
 import { validateHostCapabilities } from './startup.js';
 import { createAdapterStatusTracker, installAdapterStatusRpc, } from './features/adapter-status.js';
 import { DISCORD_BOT_TOKEN_REF, describeDiscordCredential, resolveDiscordBotToken } from './credential.js';
@@ -22,14 +22,16 @@ import { createInteractionRouter } from './features/interaction-router.js';
 import { channelBindingKey, parseChannelBindingKey, threadBindingKey, parseThreadBindingKey, discordDomainSpec, CHANNEL_BINDINGS_TABLE, THREAD_BINDINGS_TABLE, INTENTS_TABLE } from './state/domain.js';
 import { planBindingReconciliation } from './features/reconcile-bindings.js';
 import { guildKeysToForget, sweepExpired } from './state/retention.js';
-import { listSessionIds, createClientRespondPort } from './dsh/api-proxy-face.js';
+import { listSessionIds, listSessionSummaries, createClientRespondPort } from './dsh/api-proxy-face.js';
 import { createBindingStore } from './state/bindings.js';
 import { createIntentStore } from './state/intents.js';
 import { createTurnTracker } from './features/turn-ownership.js';
 import { createThreadCreationFlow } from './features/thread-creation.js';
 import { createSessionCreationFlow } from './features/session-creation.js';
+import { createResumeCandidatesPort } from './features/session-resume.js';
 import { createPromptSubmissionFlow } from './features/prompt-submission.js';
 import { createSessionMainline, requestIdFor } from './features/session-mainline.js';
+import { collectImages, createSafeImageDownloadPort } from './features/image-collection.js';
 import { startLiveRender } from './stream/live.js';
 import { planWorkspaceChannel, workspaceChannelName } from './features/workspace-channel.js';
 /** Stable Cordis plugin name for diagnostics. */
@@ -285,7 +287,37 @@ export function apply(ctx, config = DEFAULT_DISCORD_SETTINGS) {
             createSession: request => createSessionViaProxy(apiProxy, request, { log: rpcLog }),
         };
         const dshPromptPort = {
-            submit: request => promptSession(apiProxy, { sessionId: request.sessionId, prompt: request.prompt }, { log: rpcLog, rpcId: request.requestId }),
+            submit: request => promptSession(apiProxy, {
+                sessionId: request.sessionId,
+                prompt: request.prompt,
+                ...(request.images === undefined ? {} : { images: request.images }),
+            }, { log: rpcLog, rpcId: request.requestId }),
+        };
+        /**
+         * The bounded image collection boundary (16.50): downloads ride the
+         * safe-download port (allowlisted CDN hosts, capped sizes, timeout) and
+         * come back base64-encoded for the prompt parts.
+         */
+        const IMAGE_DOWNLOAD_TIMEOUT_MS = 15_000;
+        const imageCollector = {
+            collect: async ({ attachments }) => {
+                const result = await collectImages(createSafeImageDownloadPort(), {
+                    nowMs: Date.now(),
+                    timeoutMs: IMAGE_DOWNLOAD_TIMEOUT_MS,
+                    attachments,
+                });
+                if (result.outcome !== 'collected') {
+                    const reason = result.outcome === 'too-large' ? `too-large:${result.reason}` : result.outcome;
+                    return { outcome: 'failed', reason };
+                }
+                return {
+                    outcome: 'collected',
+                    images: result.downloaded.map(image => ({
+                        mediaType: image.mediaType,
+                        base64: Buffer.from(image.body).toString('base64'),
+                    })),
+                };
+            },
         };
         const composedMainline = createSessionMainline({
             threads: createThreadCreationFlow({
@@ -304,6 +336,7 @@ export function apply(ctx, config = DEFAULT_DISCORD_SETTINGS) {
                 nowMs: () => Date.now(),
             }),
             turns: turnTracker,
+            images: imageCollector,
         });
         /** Mainline outcome → copy key; the string resolves live per language. */
         const MAINLINE_FAILURE_KEYS = {
@@ -313,6 +346,7 @@ export function apply(ctx, config = DEFAULT_DISCORD_SETTINGS) {
             'session-unknown': 'mainlineSessionUnknown',
             'prompt-rejected': 'mainlinePromptRejected',
             'prompt-unknown': 'mainlinePromptUnknown',
+            'image-failed': 'mainlineImageFailed',
         };
         const mainline = {
             admitMention: async (request) => {
@@ -333,9 +367,13 @@ export function apply(ctx, config = DEFAULT_DISCORD_SETTINGS) {
             },
             continueInThread: async (request) => {
                 const result = await composedMainline.continueInThread(request);
-                if (result.outcome === 'rejected' || result.outcome === 'unknown') {
+                if (result.outcome === 'rejected' || result.outcome === 'unknown' || result.outcome === 'image-failed') {
                     rpcLog('discord_continuation_not_queued', { messageId: request.messageId, outcome: result.outcome });
-                    const notice = result.outcome === 'rejected' ? copy.continuationRejected : copy.continuationUnknown;
+                    const notice = result.outcome === 'rejected'
+                        ? copy.continuationRejected
+                        : result.outcome === 'image-failed'
+                            ? copy.mainlineImageFailed
+                            : copy.continuationUnknown;
                     void withRest(rest => rest.request('POST', `/channels/${request.threadId}/messages`, { content: notice, flags: DISCORD_SUPPRESS_NOTIFICATIONS_FLAG, allowed_mentions: ALLOWED_MENTIONS_NONE }))
                         .catch((cause) => { rpcLog('discord_mainline_notice_failed', String(cause)); });
                 }
@@ -702,6 +740,91 @@ export function apply(ctx, config = DEFAULT_DISCORD_SETTINGS) {
             },
             model: createModelPort(apiProxy, { log: rpcLog }),
             modelSelectOperatorOnly: () => current.modelSelectOperatorOnly,
+            resumeCandidates: createResumeCandidatesPort({
+                listSessions: () => listSessionSummaries(apiProxy, { log: rpcLog }),
+                boundSessionIds: () => {
+                    const bound = new Set();
+                    for (const [, record] of threadTable.entries())
+                        bound.add(record.sessionId);
+                    return bound;
+                },
+                copy,
+            }),
+            resumeSession: async ({ sessionId, workspaceId, guildId, parentChannelId, actorId }) => {
+                const rest = await sharedRest();
+                if (rest === undefined)
+                    return { outcome: 'failed' };
+                // threadBindings is the Discord-ownership record: a session with a
+                // binding already lives in a thread (16.44; the owners-store wiring
+                // stays deferred per 16.28).
+                const existingThread = threadForSession(sessionId);
+                if (existingThread !== undefined)
+                    return { outcome: 'already-bound', threadId: existingThread };
+                // The control channel never carries sessions: refuse explicitly so
+                // the user is pointed at the workspace channel (16.44 rev).
+                const listedChannels = await rest.request('GET', `/guilds/${guildId}/channels`);
+                if (listedChannels.outcome === 'completed') {
+                    const category = listedChannels.body.find(channel => channel.type === 4 && channel.name.toLowerCase() === CATEGORY_NAME.toLowerCase());
+                    const control = category !== undefined
+                        ? listedChannels.body.find(channel => channel.type === 0 && channel.parent_id === category.id && channel.name.toLowerCase() === 'general')
+                        : undefined;
+                    if (control !== undefined && control.id === parentChannelId) {
+                        return { outcome: 'refused-control-channel' };
+                    }
+                }
+                const summaries = await listSessionSummaries(apiProxy, { log: rpcLog });
+                if (summaries.outcome !== 'completed')
+                    return { outcome: 'failed' };
+                const summary = summaries.sessions.find(candidate => candidate.sessionId === sessionId);
+                if (summary === undefined || summary.blank)
+                    return { outcome: 'failed' };
+                // Spec scenario "Subagent Session selected": a subagent spawn is
+                // never a top-level writable thread, even if handed in directly
+                // (the candidates already hide it — 16.48).
+                if (summary.origin === 'subagent')
+                    return { outcome: 'refused-subagent' };
+                // Same defense for archived sessions (16.49): adoption would
+                // succeed and the thread would never see a turn.
+                const catalog = await catalogPort.listWorkspaces();
+                if (catalog.outcome === 'completed'
+                    && catalog.archivedSessionIds.includes(sessionId)) {
+                    return { outcome: 'refused-archived' };
+                }
+                const title = summary.title ?? `Resume ${sessionId.slice(0, 8)}`;
+                // Anchor post: a durable marker the resume thread hangs off.
+                const anchor = await rest.request('POST', `/channels/${parentChannelId}/messages`, {
+                    content: copy.sessionResumeAnchor(safeTitle(title)),
+                    flags: DISCORD_SUPPRESS_NOTIFICATIONS_FLAG,
+                    allowed_mentions: ALLOWED_MENTIONS_NONE,
+                });
+                if (anchor.outcome === 'rejected') {
+                    rpcLog('discord_session_resume_anchor_failed', { sessionId, status: `HTTP ${String(anchor.status)}` });
+                    return { outcome: 'failed' };
+                }
+                if (anchor.outcome === 'unknown' || typeof anchor.body.id !== 'string') {
+                    rpcLog('discord_session_resume_anchor_unknown', { sessionId });
+                    return { outcome: 'failed' };
+                }
+                const thread = await rest.request('POST', `/channels/${parentChannelId}/messages/${anchor.body.id}/threads`, {
+                    name: safeTitle(title),
+                });
+                if (thread.outcome === 'rejected') {
+                    rpcLog('discord_session_resume_thread_failed', { sessionId, status: `HTTP ${String(thread.status)}` });
+                    return { outcome: 'failed' };
+                }
+                if (thread.outcome === 'unknown' || typeof thread.body.id !== 'string') {
+                    rpcLog('discord_session_resume_thread_unknown', { sessionId });
+                    return { outcome: 'failed' };
+                }
+                await threadBindingStore.bind(threadBindingKey({ applicationId: applicationIdRef.current, guildId, threadId: thread.body.id }), {
+                    sessionId,
+                    workspaceId,
+                    createdBy: actorId,
+                    createdAtMs: Date.now(),
+                });
+                rpcLog('discord_session_resumed', { sessionId, threadId: thread.body.id, title });
+                return { outcome: 'started', threadId: thread.body.id };
+            },
             log: rpcLog,
             warn: (event, detail) => {
                 emitLog(ctx, 'warn', { event, detail: typeof detail === 'string' ? detail : JSON.stringify(detail ?? null) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addozhang/dsh-discord",
-  "version": "0.2.3",
+  "version": "0.4.0",
   "description": "Discord-first adapter for DeepSeek Harness",
   "license": "MIT",
   "type": "module",
@@ -91,5 +91,16 @@
   "bugs": {
     "url": "https://github.com/addozhang/dsh-discord/issues"
   },
-  "homepage": "https://github.com/addozhang/dsh-discord#readme"
+  "homepage": "https://github.com/addozhang/dsh-discord#readme",
+  "keywords": [
+    "discord",
+    "deepseek",
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "bot",
+    "ai-agent",
+    "claude-code",
+    "coding-agent"
+  ]
 }

package/lib/features/image-submission.d.ts

@@ -1,67 +0,0 @@
-/**
- * Image submission through `session.prompt` (design.md §12, task 12.3).
- * Mixed text/images encode into ordered prompt parts; the model's modality
- * is checked BEFORE any DSH call; and the request id claims an intent so a
- * duplicate Discord delivery never resubmits. Host outcomes map to values
- * with the intent state kept honest (failed on rejection, unknown preserved
- * for reconciliation).
- */
-import { type IntentStore } from '../state/intents.js';
-export type PromptPart = {
-    type: 'text';
-    text: string;
-} | {
-    type: 'image';
-    mediaType: string;
-    data: string;
-};
-export interface DshImagePromptPort {
-    submit(request: {
-        requestId: string;
-        sessionId: string;
-        parts: readonly PromptPart[];
-    }): Promise<{
-        outcome: 'accepted';
-    } | {
-        outcome: 'rejected';
-    } | {
-        outcome: 'unknown';
-    }>;
-}
-export interface ImageSubmissionDeps {
-    prompts: DshImagePromptPort;
-    intents: IntentStore;
-    /** Whether the session's current model accepts image parts. */
-    modality: () => boolean;
-    nowMs: () => number;
-}
-export type ImageSubmissionResult = {
-    outcome: 'accepted';
-} | {
-    outcome: 'rejected';
-} | {
-    outcome: 'unknown';
-} | {
-    outcome: 'already-submitted';
-} | {
-    outcome: 'conflict';
-} | {
-    outcome: 'refused';
-    reason: 'unsupported-modality';
-};
-/** Encode text plus images into ordered prompt parts. */
-export declare function encodePromptParts(text: string, images: ReadonlyArray<{
-    mediaType: string;
-    base64: string;
-}>): PromptPart[];
-export declare function createImageSubmissionFlow(deps: ImageSubmissionDeps): {
-    submit(request: {
-        requestId: string;
-        sessionId: string;
-        text: string;
-        images: ReadonlyArray<{
-            mediaType: string;
-            base64: string;
-        }>;
-    }): Promise<ImageSubmissionResult>;
-};

package/lib/features/image-submission.js

@@ -1,57 +0,0 @@
-/**
- * Image submission through `session.prompt` (design.md §12, task 12.3).
- * Mixed text/images encode into ordered prompt parts; the model's modality
- * is checked BEFORE any DSH call; and the request id claims an intent so a
- * duplicate Discord delivery never resubmits. Host outcomes map to values
- * with the intent state kept honest (failed on rejection, unknown preserved
- * for reconciliation).
- */
-import { hashPayload } from '../state/intents.js';
-/** Encode text plus images into ordered prompt parts. */
-export function encodePromptParts(text, images) {
-    const parts = [];
-    const trimmed = text.trim();
-    if (trimmed !== '')
-        parts.push({ type: 'text', text: trimmed });
-    for (const image of images) {
-        parts.push({ type: 'image', mediaType: image.mediaType, data: image.base64 });
-    }
-    return parts;
-}
-export function createImageSubmissionFlow(deps) {
-    return {
-        async submit(request) {
-            const parts = encodePromptParts(request.text, request.images);
-            // Modality gate: refuse BEFORE the intent claim so an explicit user
-            // retry with a text-only message is a clean new attempt.
-            if (request.images.length > 0 && !deps.modality()) {
-                return { outcome: 'refused', reason: 'unsupported-modality' };
-            }
-            const contentHash = await hashPayload({ sessionId: request.sessionId, parts });
-            const claim = await deps.intents.claim({
-                messageId: request.requestId,
-                contentHash,
-                claimedAtMs: deps.nowMs(),
-            });
-            if (claim.outcome === 'conflict')
-                return { outcome: 'conflict' };
-            if (claim.outcome === 'duplicate')
-                return { outcome: 'already-submitted' };
-            const submitted = await deps.prompts.submit({
-                requestId: request.requestId,
-                sessionId: request.sessionId,
-                parts,
-            });
-            if (submitted.outcome === 'accepted') {
-                await deps.intents.resolve(request.requestId, 'succeeded', deps.nowMs());
-                return { outcome: 'accepted' };
-            }
-            if (submitted.outcome === 'rejected') {
-                await deps.intents.resolve(request.requestId, 'failed', deps.nowMs());
-                return { outcome: 'rejected' };
-            }
-            await deps.intents.resolve(request.requestId, 'unknown', deps.nowMs());
-            return { outcome: 'unknown' };
-        },
-    };
-}