@agi-fans/dsh-tui 0.18.0 → 0.20.0

package/lib/session/interaction-adapter.js

@@ -5,6 +5,7 @@
  * this module only translates their fixed vocabularies to one Tui prompt.
  * @module @agi-fans/dsh-tui/interaction-adapter
  */
+import { UserQuestionError, } from '@deepseek-ai/dsh-user-questions';
 /** Resolve a label/number list while preserving unmatched input as custom text. */
 export function parsePromptAnswer(input, question) {
     const options = question.options ?? [];
@@ -26,29 +27,108 @@ export function parsePromptAnswer(input, question) {
         ...(custom.length === 0 ? {} : { custom: custom.join(question.multiSelect === true ? ', ' : '') }),
     };
 }
-async function askQuestions(tui, request) {
-    const answers = [];
-    for (const question of request.questions) {
-        const raw = await tui.prompt({
-            title: question.intent?.kind === 'plan-review' ? 'Plan review' : (question.header ?? 'Question'),
-            question: question.question,
-            ...(question.detail === undefined ? {} : { detail: question.detail }),
-            ...(question.options === undefined ? {} : { options: question.options }),
-            ...(question.multiSelect === undefined ? {} : { multiSelect: question.multiSelect }),
-            ...(question.intent?.kind === 'plan-review'
-                ? { presentation: 'plan-review', approveValue: question.intent.approve }
-                : {}),
-            allowCustom: true,
-            ...(request.signal === undefined ? {} : { signal: request.signal }),
-        });
-        if (raw === null) {
-            answers.push({ id: question.id, selected: [] });
-            continue;
+/** Collect a complete batch under one Harness wait, including PTC sub-calls. */
+async function askQuestions(tui, request, service) {
+    const lifetime = new AbortController();
+    const signal = request.signal === undefined ? lifetime.signal : AbortSignal.any([lifetime.signal, request.signal]);
+    let timer;
+    let claim;
+    let claimEnded;
+    let wait;
+    const timedOut = () => new UserQuestionError('The question is still awaiting an answer.', 'ASK_TIMED_OUT');
+    try {
+        signal.throwIfAborted();
+        if (request.wait?.timed === true) {
+            if (service === undefined || request.agent === undefined)
+                throw timedOut();
+            claim = service.attachWait(request.agent, request.wait.callId, signal)[Symbol.asyncIterator]();
+            const first = await claim.next();
+            signal.throwIfAborted();
+            if (first.done)
+                throw timedOut();
+            claimEnded = claim.next();
+            // A remote/business stream can also fail independently of its parent.
+            void claimEnded.catch(error => { lifetime.abort(error); });
+            wait = {
+                deadline: Date.now() + first.value.remainingMs,
+                hold: () => { clearTimeout(timer); timer = undefined; wait = undefined; },
+            };
+            timer = setTimeout(() => { lifetime.abort(timedOut()); }, first.value.remainingMs);
+        }
+        const answers = [];
+        for (const [index, question] of request.questions.entries()) {
+            signal.throwIfAborted();
+            const raw = await tui.prompt({
+                title: question.intent?.kind === 'plan-review' ? 'Plan review' : (question.header ?? 'Question'),
+                question: question.question,
+                ...(question.detail === undefined ? {} : { detail: question.detail }),
+                ...(question.options === undefined ? {} : { options: question.options }),
+                ...(question.multiSelect === undefined ? {} : { multiSelect: question.multiSelect }),
+                ...(question.intent?.kind === 'plan-review'
+                    ? { presentation: 'plan-review', approveValue: question.intent.approve }
+                    : {}),
+                ...(request.questions.length > 1 ? { title: `${question.header ?? 'Question'} · ${index + 1}/${request.questions.length}` } : {}),
+                ...(wait === undefined ? {} : { wait }),
+                ...(request.wait?.timed === true ? { dismissLabel: 'Later' } : {}),
+                skippable: question.intent === undefined,
+                allowCustom: true,
+                interrupt: () => { lifetime.abort(new UserQuestionError('The user interrupted the question.', 'ASK_ABORTED')); },
+                signal,
+            });
+            signal.throwIfAborted();
+            if (raw === null) {
+                if (request.wait?.timed === true)
+                    throw timedOut();
+                throw new UserQuestionError('The user dismissed the question.', 'ASK_CANCELLED');
+            }
+            answers.push({ id: question.id, ...parsePromptAnswer(raw, question) });
         }
-        const parsed = parsePromptAnswer(raw, question);
-        answers.push({ id: question.id, ...parsed });
+        return { answers };
+    }
+    finally {
+        clearTimeout(timer);
+        lifetime.abort();
+        if (claimEnded !== undefined)
+            await claimEnded.catch(() => { });
+        await claim?.return?.();
     }
-    return { answers };
+}
+/** Reopen continued questions from the public projection; the original tool stays settled. */
+async function answerPendingQuestions(ctx, tui, agent, signal) {
+    const read = () => ctx.get('sessionProjections')?.snapshot(agent.session).values.userQuestions?.active ?? [];
+    const continued = read().filter(question => question.state === 'continued');
+    if (continued.length === 0)
+        return 'No pending questions in this session.';
+    const id = continued.length === 1 ? continued[0]?.callId : await tui.prompt({
+        title: 'Pending questions',
+        question: 'Choose a question to answer.',
+        options: continued.map(question => ({
+            label: question.questions.map(item => item.header ?? item.question).join(' · '),
+            value: question.callId,
+            preview: question.questions.map(item => item.question).join(' / '),
+        })),
+        presentation: 'fullscreen-list',
+        filterable: true,
+        allowCustom: false,
+        signal,
+    });
+    if (id === null || id === undefined || signal.aborted)
+        return undefined;
+    const question = read().find(item => item.callId === id && item.state === 'continued');
+    if (question === undefined)
+        return 'This question has already been answered.';
+    let answer;
+    try {
+        answer = await askQuestions(tui, { agent, questions: [...question.questions], signal });
+    }
+    catch (error) {
+        if (signal.aborted || (error instanceof UserQuestionError && error.code === 'ASK_CANCELLED'))
+            return undefined;
+        throw error;
+    }
+    signal.throwIfAborted();
+    const accepted = ctx.userQuestions.answer(agent, question.callId, answer);
+    return accepted ? 'Answer queued for the next model step.' : 'This question has already been answered.';
 }
 /**
  * Body of the approval prompt: what the call is, then why it is being asked.
@@ -83,24 +163,75 @@ async function askApproval(tui, request) {
 /** Bind the global question provider and route approvals to the active root agent only. */
 export function bindHumanInteraction(ctx, tui, activeAgent) {
     const disposers = [];
+    const lifetime = new AbortController();
+    let queue = Promise.resolve();
+    const enqueue = (signal, operation) => {
+        const pending = queue.then(() => { signal.throwIfAborted(); return operation(); });
+        queue = pending.catch(() => { });
+        // An unattended queued wait must settle at its Host deadline, even while
+        // an earlier prompt is held. Its eventual queue slot cannot open a stale UI.
+        return new Promise((resolve, reject) => {
+            const abort = () => { reject(signal.reason); };
+            if (signal.aborted)
+                abort();
+            else
+                signal.addEventListener('abort', abort, { once: true });
+            void pending.then(resolve, reject).finally(() => { signal.removeEventListener('abort', abort); });
+        });
+    };
     const questions = ctx.get('userQuestions');
     if (questions !== undefined) {
         disposers.push(ctx.on('user-questions/request', (request, next) => {
             if (request.agent !== undefined && request.agent !== activeAgent())
                 return next();
-            return askQuestions(tui, request);
+            const signal = request.signal === undefined ? lifetime.signal : AbortSignal.any([lifetime.signal, request.signal]);
+            return enqueue(signal, () => askQuestions(tui, { ...request, signal }, questions));
+        }));
+    }
+    const commands = ctx.get('commands');
+    if (questions !== undefined && commands !== undefined) {
+        disposers.push(commands.register({
+            name: 'questions',
+            description: 'Answer questions left pending in this session',
+            handler: invocation => enqueue(AbortSignal.any([invocation.signal, lifetime.signal]), async () => {
+                if (invocation.rawInput.trim() !== '')
+                    return { kind: 'error', text: 'Usage: /questions' };
+                if (invocation.agent !== activeAgent())
+                    return { kind: 'error', text: 'Questions belong to the active session.' };
+                const operation = new AbortController();
+                const off = ctx.on('session/disposed', (session) => {
+                    if (session === invocation.agent.session)
+                        operation.abort();
+                });
+                try {
+                    const signal = AbortSignal.any([invocation.signal, lifetime.signal, operation.signal]);
+                    const text = await answerPendingQuestions(ctx, tui, invocation.agent, signal);
+                    return { kind: 'success', ...(text === undefined ? {} : { text }) };
+                }
+                catch (error) {
+                    if (operation.signal.aborted || invocation.signal.aborted || lifetime.signal.aborted)
+                        return { kind: 'success' };
+                    return { kind: 'error', text: error instanceof Error ? error.message : String(error) };
+                }
+                finally {
+                    off();
+                }
+            }),
         }));
     }
     if (ctx.get('approval') !== undefined) {
         disposers.push(ctx.on('approval/request', async (request, next) => {
             if (request.agent !== activeAgent())
                 return next();
-            return askApproval(tui, request);
+            const signal = request.signal === undefined ? lifetime.signal : AbortSignal.any([lifetime.signal, request.signal]);
+            return enqueue(signal, () => askApproval(tui, { ...request, signal }));
         }));
     }
-    return () => {
-        for (const dispose of disposers.reverse())
+    return async () => {
+        lifetime.abort(new UserQuestionError('The question interface was unloaded.', 'ASK_ABORTED'));
+        for (const dispose of disposers.splice(0).reverse())
             dispose();
+        await queue;
     };
 }
 //# sourceMappingURL=interaction-adapter.js.map

package/lib/session/interaction-adapter.js.map

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

package/lib/session/job-notice.d.ts

@@ -5,6 +5,10 @@
  */
 import type { Agent } from '@deepseek-ai/dsh-agent';
 import type { JobStatus, JobView } from '@deepseek-ai/dsh-jobs';
+import type { TuiNoticeOptions } from '../definition.ts';
+import type { TranscriptState } from '../views/transcript-types.ts';
+/** Merge only an identified job or an unambiguous command still awaiting its result. */
+export declare function mergeJobSettlement(state: TranscriptState, job: NonNullable<TuiNoticeOptions['job']>): TranscriptState | undefined;
 /** Past- or present-tense word for one lifecycle status. */
 export declare const JOB_STATUS_WORD: Record<JobStatus, string>;
 /** One human-facing completion line for a background job. */

package/lib/session/job-notice.js

@@ -3,6 +3,45 @@
  * notice, so one job reads the same in both surfaces.
  * @module @agi-fans/dsh-tui/job-notice
  */
+import { toolArgsObject } from "../chrome/tool-args.js";
+import { truncateToWidth, visibleWidth } from "../chrome/width.js";
+/** Merge only an identified job or an unambiguous command still awaiting its result. */
+export function mergeJobSettlement(state, job) {
+    const identified = [];
+    const pending = [];
+    state.blocks.forEach((block, index) => {
+        if (block.kind !== 'tool')
+            return;
+        if (!/^(bash|shell|pwsh|exec)$/u.test(block.name) && block.presentation?.call?.card !== 'terminal')
+            return;
+        const explicitId = /^started background job (\S+)\s*$/u.exec(block.output)?.[1]
+            ?? /\[still running after \d+ms; moved to background job ([^\s\]]+)\]/u.exec(block.output)?.[1];
+        const id = block.job?.id ?? explicitId;
+        if (id !== undefined) {
+            if (id === job.id)
+                identified.push(index);
+            return;
+        }
+        const args = toolArgsObject(block.args);
+        if (block.status === 'running' && block.startedAt !== undefined && block.startedAt <= job.startedAt
+            && typeof args?.['command'] === 'string' && args['command'] === job.label)
+            pending.push(index);
+    });
+    const matches = identified.length > 0 ? identified : pending;
+    if (matches.length !== 1)
+        return undefined;
+    const index = matches[0];
+    const block = state.blocks[index];
+    if (block.kind !== 'tool')
+        return undefined;
+    const blocks = [...state.blocks];
+    blocks[index] = {
+        ...block,
+        status: job.status === 'completed' && block.status !== 'error' ? 'ok' : 'error',
+        job: { id: job.id, status: job.status, detail: job.detail?.trim() || JOB_STATUS_WORD[job.status] },
+    };
+    return { ...state, blocks };
+}
 /** Past- or present-tense word for one lifecycle status. */
 export const JOB_STATUS_WORD = {
     running: 'running',
@@ -13,9 +52,11 @@ export const JOB_STATUS_WORD = {
 };
 /** One human-facing completion line for a background job. */
 export function formatJobNotice(snapshot) {
-    const label = snapshot.label.trim();
-    const detail = snapshot.detail === undefined ? '' : snapshot.detail.trim();
-    return `Background job ${snapshot.id} ${JOB_STATUS_WORD[snapshot.status]}`
+    const head = `Background job ${snapshot.id} ${JOB_STATUS_WORD[snapshot.status]}`;
+    const detail = truncateToWidth(snapshot.detail?.trim().split('\n')[0] ?? '', 28);
+    const room = Math.max(0, 76 - visibleWidth(head) - (detail === '' ? 0 : visibleWidth(detail) + 3) - 3);
+    const label = room < 8 ? '' : truncateToWidth(snapshot.label.trim().split('\n')[0] ?? '', room);
+    return head
         + (label === '' ? '' : ` · ${label}`)
         + (detail === '' ? '' : ` · ${detail}`);
 }

package/lib/session/job-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-notice.js","sourceRoot":"","sources":["../../src/session/job-notice.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,4DAA4D;AAC5D,MAAM,CAAC,MAAM,eAAe,GAA8B;IACxD,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,QAAQ;CACjB,CAAA;AAED,6DAA6D;AAC7D,MAAM,UAAU,eAAe,CAAC,QAK/B;IACC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;IAC1E,OAAO,kBAAkB,QAAQ,CAAC,EAAE,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;UACtE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC;UACnC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE,CAAC,CAAA;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAC1B,QAA+I,EAC/I,KAAwB,EACxB,MAAyB;IAEzB,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;QAAE,OAAO,SAAS,CAAA;IAClD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,SAAS,CAAA;IAC7D,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;AAClC,CAAC"}
+{"version":3,"file":"job-notice.js","sourceRoot":"","sources":["../../src/session/job-notice.ts"],"names":[],"mappings":"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"}

package/lib/session/message-queue.d.ts

@@ -0,0 +1,22 @@
+/** Pending human input uses Harness inbox mutations and terminal-owned delivery entries. */
+import type { Agent, InboxTarget } from '@deepseek-ai/dsh-agent';
+import { type UserMessage } from '@deepseek-ai/dsh-llm';
+import type { TuiPendingInputs, TuiService, TuiSubmission } from '../definition.ts';
+export interface QueuedMessage {
+    key: string;
+    id: string;
+    target: InboxTarget | 'delivery';
+    text: string;
+    value: UserMessage | TuiSubmission;
+}
+export declare function queuedMessages(agent: Agent, pending: TuiPendingInputs): QueuedMessage[];
+/** Swap adjacent human entries atomically; internal messages remain owned by their plugins. */
+export declare function moveQueuedMessage(agent: Agent, target: InboxTarget, id: string, direction: -1 | 1): boolean;
+export declare function editedQueuedMessage(message: UserMessage, text: string): UserMessage;
+export declare function openMessageQueue(options: {
+    agent: Agent;
+    tui: Pick<TuiService, 'prompt' | 'notice' | 'restoreInput' | 'pendingInputs'>;
+    signal: AbortSignal;
+    assertActive(): void;
+    restore(message: UserMessage): Promise<TuiSubmission>;
+}): Promise<void>;

package/lib/session/message-queue.js

@@ -0,0 +1,157 @@
+import { createUserMessage } from '@deepseek-ai/dsh-llm';
+import { truncateToWidth } from "../chrome/width.js";
+import { blocksText } from "./content-text.js";
+export function queuedMessages(agent, pending) {
+    return [
+        ...['next-step', 'next-turn'].flatMap(target => (target === 'next-step' ? agent.inbox.nextStep : agent.inbox.nextTurn)
+            .filter(message => message.source.kind === 'user')
+            .map(message => ({ key: `${target}:${message.id}`, id: message.id, target, text: blocksText(message.content), value: message }))),
+        ...pending.list().map(({ id, submission }) => ({ key: `delivery:${id}`, id, target: 'delivery', text: submission.text, value: submission })),
+    ];
+}
+/** Swap adjacent human entries atomically; internal messages remain owned by their plugins. */
+export function moveQueuedMessage(agent, target, id, direction) {
+    const messages = target === 'next-step' ? agent.inbox.nextStep : agent.inbox.nextTurn;
+    const humanIndices = messages.flatMap((message, at) => message.source.kind === 'user' ? [at] : []);
+    const source = messages.findIndex(message => message.id === id && message.source.kind === 'user');
+    const neighbor = humanIndices[humanIndices.indexOf(source) + direction];
+    if (source < 0 || neighbor === undefined || Math.abs(source - neighbor) !== 1)
+        return false;
+    const start = Math.min(source, neighbor);
+    const end = Math.max(source, neighbor);
+    const inserted = messages.slice(start, end + 1);
+    const first = inserted[0];
+    inserted[0] = inserted[inserted.length - 1];
+    inserted[inserted.length - 1] = first;
+    agent.inbox.splice(target, start, inserted.length, inserted);
+    return true;
+}
+export function editedQueuedMessage(message, text) {
+    const attachments = message.content.filter(block => block.type !== 'text');
+    if (text.trim() === '' && attachments.length === 0)
+        throw new Error('Enter a message, or delete the queue entry.');
+    const { id: _id, role: _role, ...input } = message;
+    return createUserMessage({ ...input, content: [...(text === '' ? [] : [{ type: 'text', text }]), ...attachments] });
+}
+function queueOptions(rows) {
+    const ordinals = new Map();
+    return rows.map(row => {
+        const ordinal = (ordinals.get(row.target) ?? 0) + 1;
+        ordinals.set(row.target, ordinal);
+        const label = row.target === 'next-step' ? 'Guidance' : row.target === 'next-turn' ? 'Next turn' : 'Waiting';
+        const submission = row.target === 'delivery' ? row.value : undefined;
+        const message = row.target === 'delivery' ? undefined : row.value;
+        const images = submission?.images.length ?? message?.content.filter(block => block.type === 'image').length ?? 0;
+        const files = submission?.files?.length ?? message?.content.filter(block => block.type === 'file').length ?? 0;
+        const attachments = [images > 0 ? `${images} image${images === 1 ? '' : 's'}` : '', files > 0 ? `${files} file${files === 1 ? '' : 's'}` : ''].filter(Boolean).join(' · ');
+        return { label: `${label} · ${ordinal} · ${truncateToWidth(row.text.replace(/\s+/gu, ' ').trim(), 120) || attachments || 'Empty message'}`, value: row.key,
+            preview: row.text.length > 8192 ? row.text.slice(0, 8192) + '\n…' : row.text,
+            description: attachments || (row.target === 'delivery' ? 'Waiting to queue' : row.target === 'next-step' ? 'Before the next model step' : 'After the current turn'), submitLabel: 'edit' };
+    });
+}
+export async function openMessageQueue(options) {
+    const { agent, tui, signal, assertActive, restore } = options;
+    const check = () => { signal.throwIfAborted(); assertActive(); };
+    let selected;
+    let superseded = false;
+    while (!signal.aborted) {
+        check();
+        let rows = [];
+        let choices = [];
+        const refresh = () => {
+            check();
+            const next = queuedMessages(agent, tui.pendingInputs);
+            if (next.length !== rows.length || next.some((row, at) => row.key !== rows[at]?.key || row.value !== rows[at]?.value)) {
+                rows = next;
+                choices = queueOptions(rows);
+            }
+            return choices;
+        };
+        const answer = await tui.prompt({ title: 'Message Queue', question: 'Moves stay within Guidance, Next turn, or Waiting.',
+            notify: false, onSuperseded: () => { superseded = true; }, options: refresh(), refreshOptions: refresh, presentation: 'fullscreen-list', filterable: true, allowCustom: false,
+            ...(selected === undefined ? {} : { initialValue: selected }), emptyText: 'No pending messages.', submitLabel: 'edit', signal,
+            actions: [{ key: 'Alt+D', label: 'delete', valuePrefix: 'delete:' }, { key: 'Alt+Up', label: 'move earlier', valuePrefix: 'up:' }, { key: 'Alt+Down', label: 'move later', valuePrefix: 'down:' }] });
+        if (answer === null)
+            return;
+        check();
+        const action = /^(delete|up|down):/u.exec(answer)?.[1];
+        const key = action === undefined ? answer : answer.slice(action.length + 1);
+        const row = queuedMessages(agent, tui.pendingInputs).find(item => item.key === key);
+        if (row === undefined) {
+            tui.notice('That message is no longer pending.');
+            continue;
+        }
+        selected = key;
+        let editDraft;
+        try {
+            if (action === 'up' || action === 'down') {
+                const direction = action === 'up' ? -1 : 1;
+                if (row.target === 'delivery')
+                    tui.pendingInputs.update(row.id, { kind: 'move', direction });
+                else if (!moveQueuedMessage(agent, row.target, row.id, direction)) {
+                    const group = queuedMessages(agent, tui.pendingInputs).filter(item => item.target === row.target);
+                    const at = group.findIndex(item => item.key === row.key);
+                    if (at >= 0 && group[at + direction] !== undefined)
+                        tui.notice('These entries cannot move across a system-owned queue message.');
+                }
+                continue;
+            }
+            if (action === 'delete') {
+                const removed = row.target === 'delivery' ? tui.pendingInputs.update(row.id, { kind: 'remove' }) : agent.inbox.remove(row.value.id);
+                if (!removed)
+                    tui.notice('That message is no longer pending.');
+                continue;
+            }
+            // Rehydrate first so a raced edit can return intact to the composer; never withdraw an item while reading images.
+            const original = row.target === 'delivery' ? row.value : { ...await restore(row.value), literal: true };
+            check();
+            if (!queuedMessages(agent, tui.pendingInputs).some(item => item.key === row.key && item.value === row.value)) {
+                tui.notice('That message is no longer pending.');
+                continue;
+            }
+            const text = await tui.prompt({ title: 'Edit Queued Message', question: 'Enter saves · Alt+Enter inserts a line · Esc cancels. Images and files are kept.',
+                notify: false, initialInput: row.text, preserveWhitespace: true, allowCustom: true, signal,
+                onSuperseded: input => {
+                    superseded = true;
+                    if (input !== row.text) {
+                        tui.restoreInput({ ...original, text: input });
+                        tui.notice('Queue closed for a request for input. Your edit is an unsent draft; the queued message is unchanged.');
+                    }
+                } });
+            if (text === null) {
+                if (superseded)
+                    return;
+                continue;
+            }
+            check();
+            const draft = { ...original, text };
+            editDraft = draft;
+            let replaced;
+            if (row.target === 'delivery')
+                replaced = tui.pendingInputs.update(row.id, { kind: 'replace', submission: draft });
+            else {
+                const replacement = editedQueuedMessage(row.value, text);
+                replaced = agent.inbox.replace(row.value.id, replacement);
+                if (replaced)
+                    selected = `${row.target}:${replacement.id}`;
+            }
+            if (!replaced) {
+                tui.restoreInput(draft);
+                tui.notice('The message was already taken. Your edit is restored as an unsent draft.');
+                return;
+            }
+        }
+        catch (error) {
+            if (signal.aborted)
+                throw error;
+            assertActive();
+            if (editDraft !== undefined) {
+                tui.restoreInput(editDraft);
+                tui.notice(`Could not save the queue edit; it is restored as an unsent draft. ${error instanceof Error ? error.message : String(error)}`, { level: 'error' });
+                return;
+            }
+            tui.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
+        }
+    }
+}
+//# sourceMappingURL=message-queue.js.map

package/lib/session/message-queue.js.map

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

package/lib/session/project-file-search.js

@@ -2,6 +2,7 @@
 import { execFile } from 'node:child_process';
 import { opendir } from 'node:fs/promises';
 import path from 'node:path';
+import { subsequencePenalty } from "../input/fuzzy-search.js";
 const DEFAULT_CACHE_TTL_MS = 2_000;
 const DEFAULT_MAX_RESULTS = 100;
 const MAX_WALK_ENTRIES = 200_000;
@@ -102,25 +103,6 @@ export async function loadProjectPaths(root, signal) {
         return git;
     return walkedProjectPaths(root, signal);
 }
-function subsequenceScore(query, target) {
-    let queryIndex = 0;
-    let first = -1;
-    let previous = -1;
-    let gaps = 0;
-    for (let index = 0; index < target.length && queryIndex < query.length; index += 1) {
-        if (target[index] !== query[queryIndex])
-            continue;
-        if (first < 0)
-            first = index;
-        if (previous >= 0)
-            gaps += Math.max(0, index - previous - 1);
-        previous = index;
-        queryIndex += 1;
-    }
-    if (queryIndex !== query.length)
-        return undefined;
-    return Math.max(0, first) * 2 + gaps * 3 + target.length - query.length;
-}
 /** Lower scores are better; undefined means the query does not match. */
 export function fuzzyProjectPathScore(query, candidate) {
     const needle = query.trim().toLowerCase().replaceAll('\\', '/');
@@ -139,10 +121,10 @@ export function fuzzyProjectPathScore(query, candidate) {
     const targetContains = target.indexOf(needle);
     if (targetContains >= 0)
         return 100 + targetContains + depthPenalty;
-    const basenameFuzzy = subsequenceScore(needle, basename);
+    const basenameFuzzy = subsequencePenalty(needle, basename);
     if (basenameFuzzy !== undefined)
         return 160 + basenameFuzzy + depthPenalty;
-    const pathFuzzy = subsequenceScore(needle, target);
+    const pathFuzzy = subsequencePenalty(needle, target);
     if (pathFuzzy !== undefined)
         return 260 + pathFuzzy + depthPenalty;
     return undefined;

package/lib/session/project-file-search.js.map

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