dsh-ntr 0.1.6 → 0.2.0

package/lib/client/store.js

@@ -6,6 +6,39 @@
  * Deliberately framework-free: React binds through `useSyncExternalStore`.
  */
 import { DEFAULT_TAG_HALO } from "../protocol.js";
+/** Returned by {@link deadlineRemainingLabel} once the deadline has passed. */
+export const PERMISSION_DEADLINE_EXPIRED = 'expired';
+/**
+ * The asks that belong to one DSH chat conversation. An ask without a
+ * `dshSessionId` belongs to no conversation (an `/acp` RPC-only session), so it
+ * is deliberately absent from every conversation's dock and stays in the
+ * settings-panel ledger.
+ */
+export function permissionsForSession(permissions, dshSessionId) {
+    return permissions.filter(permission => permission.dshSessionId === dshSessionId);
+}
+/**
+ * Compact countdown for one ask, or `undefined` when there is nothing to count
+ * down (`wait` mode, or a frame without a deadline). Pure so the formatting is
+ * testable without a clock: the dock passes `Date.now()` on its tick.
+ *
+ * Past the deadline the answer is {@link PERMISSION_DEADLINE_EXPIRED} rather
+ * than a negative number — the host has already armed the expiry, and a card
+ * counting backwards would claim a deadline that no longer exists.
+ */
+export function deadlineRemainingLabel(deadlineAt, now, mode) {
+    if (mode === 'wait' || deadlineAt === undefined)
+        return undefined;
+    const remainingMs = deadlineAt - now;
+    if (remainingMs <= 0)
+        return PERMISSION_DEADLINE_EXPIRED;
+    const seconds = Math.ceil(remainingMs / 1000);
+    if (seconds < 60)
+        return `${String(seconds)}s`;
+    const minutes = Math.floor(seconds / 60);
+    const rest = seconds % 60;
+    return rest === 0 ? `${String(minutes)}m` : `${String(minutes)}m ${String(rest)}s`;
+}
 const MAX_BLOCKS = 400;
 /** How many observed ACP transcripts stay live at once (insertion-ordered eviction). */
 const MAX_WATCHED = 6;
@@ -298,7 +331,6 @@ export class AcpStore {
         seatCatalogs: {},
         probingModels: {},
         probeErrors: {},
-        approvalRouted: false,
         chatSessions: [],
         tagHalo: { ...DEFAULT_TAG_HALO },
         approvalDeadlines: undefined,
@@ -501,7 +533,7 @@ export class AcpStore {
     /** Snapshot refresh used on panel open and after a stream outage. */
     async resync() {
         try {
-            const [{ agents, approvalRouted }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult] = await Promise.all([
+            const [{ agents }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult] = await Promise.all([
                 this.call('agents/list'),
                 this.call('sessions/list'),
                 // The plugin's OWN default ACP agent — a plugin-private id, not a DSH
@@ -526,7 +558,6 @@ export class AcpStore {
                 sessions,
                 defaultAgent: defaultAgentInfo?.agentId,
                 detectedAgents,
-                approvalRouted: approvalRouted === true,
                 preset: presetResult?.preset ?? undefined,
                 tagHalo: tagHaloResult?.halo ?? { ...DEFAULT_TAG_HALO },
                 approvalDeadlines: deadlinesResult.deadlines,
@@ -1244,12 +1275,21 @@ export class AcpStore {
             this.flashError(error);
         }
     }
+    /**
+     * Answer one ask (`optionId` absent = cancel it). A failure is reported
+     * through the store's notice — the settings panel renders that — AND
+     * rethrown, so the conversation dock can pin the message next to the card
+     * that failed instead of leaving it on a settings page the user may not
+     * have open. Callers that cannot show it (the settings panel) swallow it
+     * after the notice.
+     */
     async respondPermission(requestId, optionId) {
         try {
             await this.call('permission/respond', { requestId, ...(optionId === undefined ? {} : { optionId }) });
         }
         catch (error) {
             this.flashError(error);
+            throw error;
         }
     }
     async stopAgent(agentId) {
@@ -1601,16 +1641,22 @@ export class AcpStore {
                 return this.loadAgentCatalog(event.agentId);
             }
             case 'permission/request': {
-                const title = typeof event.toolCall?.title === 'string'
-                    ? String(event.toolCall.title)
-                    : this.locale('工具调用', 'tool call');
+                // Verbatim copy of the host's frame. The host decides what the ask is
+                // called (`toolName` / `reason`) and which options exist; deriving a
+                // title from `toolCall` here used to make the card say something the
+                // host never said.
+                const permission = {
+                    requestId: event.requestId,
+                    sessionId: event.sessionId,
+                    ...(event.dshSessionId === undefined ? {} : { dshSessionId: event.dshSessionId }),
+                    toolName: event.toolName,
+                    ...(event.reason === undefined ? {} : { reason: event.reason }),
+                    options: event.options,
+                    timeoutMode: event.timeoutMode,
+                    ...(event.deadlineAt === undefined ? {} : { deadlineAt: event.deadlineAt }),
+                };
                 this.mutate({
-                    permissions: [...this.state.permissions.filter(p => p.requestId !== event.requestId), {
-                            requestId: event.requestId,
-                            sessionId: event.sessionId,
-                            title,
-                            options: event.options,
-                        }],
+                    permissions: [...this.state.permissions.filter(p => p.requestId !== event.requestId), permission],
                 });
                 return Promise.resolve();
             }