@yadsh/dsh-qa-surface 0.15.7 → 0.16.0

package/lib/client/QaSessionController.js

@@ -1,5 +1,6 @@
 import { bytesToBase64 } from "./base64.js";
 import { qaStorageNamespace } from "../shared/session-key.js";
+import { slashDraftTarget } from "../slash/draft-target.js";
 import { resolveSlashRoute } from "./slash/slash-router.js";
 import { SLASH_DISABLED_COPY, slashAttachmentsCopy, slashExecuteFailureCopy, slashHostRefusalCopy, slashRefusalCopy, slashWithheldCopy, } from "./slash/copy.js";
 import { canOpenAsCompatibilityReadOnly, QaPolicyAttestationError, } from "./attestation.js";
@@ -98,6 +99,9 @@ export class QaSessionController {
     listeners = new Set();
     sessions;
     createSessionRemote;
+    forkSessionRemote;
+    forking = false;
+    inheritedThroughSeq;
     conversation;
     connection;
     config;
@@ -150,6 +154,9 @@ export class QaSessionController {
     viewingSubagent = null;
     connectedOnce;
     disposed = false;
+    chatAccess;
+    sharingApi;
+    accessPoll;
     generation = 0;
     /**
      * The session the current chat identity names, or null while the chat it
@@ -203,6 +210,7 @@ export class QaSessionController {
     slashError = null;
     slashLoadedAt = 0;
     slashLoading;
+    slashReadRevision = 0;
     /** Last published view; its identity is the render signal. */
     slashViewCache;
     /** Bumped to re-open a palette the user dismissed; see `QaSlashView`. */
@@ -212,6 +220,7 @@ export class QaSessionController {
     constructor(options) {
         this.sessions = options.sessions;
         this.createSessionRemote = options.createSession;
+        this.forkSessionRemote = options.forkSession;
         this.conversation = options.conversation;
         this.connection = options.connection;
         this.config = options.config;
@@ -243,11 +252,18 @@ export class QaSessionController {
         this.selectedSubrole = options.initialSubrole ?? null;
         this.adminPreview = options.adminPreview === true;
         this.fileUpload = options.fileUpload ?? (() => undefined);
+        this.sharingApi = options.sharingApi;
+        if (this.sharingApi !== undefined && options.accounts !== undefined)
+            this.accessPoll = setInterval(() => {
+                void this.refreshChatAccess();
+            }, 1000);
         this.hostSources = new QaHostSourceBridge(this.sourceApi, () => this.accounts?.token() ?? "");
         this.hostApprovals = new QaHostApprovalBridge(options.approvalApi);
         this.hostQuestions = new QaHostQuestionBridge(options.questionApi);
         this.queueRemote = options.queueStatus;
-        this.timeoutMs = options.timeoutMs ?? 15_000;
+        // Cold account catalogs can outlive one short network round trip.
+        // Keep bootstrap bounded without rejecting a valid slow restoration.
+        this.timeoutMs = options.timeoutMs ?? 60_000;
         this.streamPublisher = new StreamPublisher(options.streamIntervalMs ?? 66);
         this.connectedOnce = this.connection.getSnapshot() !== undefined;
         this.unsubscribeConnection = this.connection.subscribe(() => {
@@ -339,7 +355,7 @@ export class QaSessionController {
      * call this surface makes — while a human command goes to the Host's command
      * runtime and never becomes a model message.
      */
-    async send(text, attachments = [], pick = null) {
+    async send(text, attachments = [], pick = null, fastReview = false) {
         const prompt = text.trim();
         // Images ride the prompt inline; files must be staged first, because the
         // wire carries a receipt rather than bytes.
@@ -405,6 +421,23 @@ export class QaSessionController {
                 return false;
             }
         }
+        if (fastReview) {
+            this.requestQueueNotice = null;
+            const target = await this.liveTarget();
+            if (target === undefined)
+                return false;
+            await this.refreshSlashCatalog(true);
+            if (this.disposed || this.session !== target)
+                return false;
+            const command = this.slashEntries.find((entry) => entry.kind === "command" && entry.name === "no-review");
+            if (command === undefined) {
+                this.operationError =
+                    "Fast недоступен в этом чате. Выключите Fast, чтобы отправить запрос с автоматическим ревью.";
+                this.publish();
+                return false;
+            }
+            return this.sendCommand(`/no-review${prompt === "" ? "" : ` ${prompt}`}`, attachments, files, command, true);
+        }
         this.operationError = null;
         this.requestQueueNotice = null;
         // A running turn has nowhere for a new question to land but its queue, and
@@ -542,7 +575,7 @@ export class QaSessionController {
      * something the deployment does not allow, and retyping the line is a worse
      * answer than leaving it in place to be edited.
      */
-    async sendCommand(line, attachments, files, entry) {
+    async sendCommand(line, attachments, files, entry, requireSuccess = false) {
         if (this.slashApi === undefined) {
             this.operationError = SLASH_DISABLED_COPY;
             this.publish();
@@ -594,6 +627,11 @@ export class QaSessionController {
                 this.publish();
                 return false;
             }
+            if (requireSuccess && result.value.outcome.kind === "error") {
+                this.operationError = result.value.outcome.text;
+                this.publish();
+                return false;
+            }
             this.operationError = null;
             this.publish();
             return true;
@@ -613,31 +651,40 @@ export class QaSessionController {
      * skill registry has no browser-facing change event, so a skill installed
      * while the page is open is only discovered by asking again.
      */
+    slashReadTarget() {
+        if (this.session !== undefined)
+            return String(this.session.sessionId);
+        return this.drafting
+            ? slashDraftTarget(this.selectedSubrole, this.adminPreview)
+            : undefined;
+    }
     async refreshSlashCatalog(force = false) {
-        const session = this.session;
-        if (session === undefined || this.disposed)
+        const sessionId = this.slashReadTarget();
+        if (sessionId === undefined || this.disposed)
             return;
         if (!this.config.slashCommands.enabled || this.compatibilityReadOnly) {
-            this.applySlashCatalog(String(session.sessionId), null);
+            this.applySlashCatalog(sessionId, null);
             return;
         }
         if (this.slashApi === undefined) {
-            this.applySlashCatalog(String(session.sessionId), undefined);
+            this.applySlashCatalog(sessionId, undefined);
             return;
         }
         if (this.slashLoading !== undefined)
             return this.slashLoading;
-        if (!force && this.slashSessionId === String(session.sessionId)) {
+        if (!force && this.slashSessionId === sessionId) {
             if (Date.now() - this.slashLoadedAt < SLASH_CATALOG_STALE_MS)
                 return;
         }
-        const sessionId = String(session.sessionId);
+        const revision = this.slashReadRevision;
         this.slashState = "loading";
         this.publish();
         const operation = (async () => {
             try {
                 const result = await this.slashApi?.catalog(this.accounts?.token() ?? "", sessionId);
-                if (result === undefined)
+                if (result === undefined ||
+                    revision !== this.slashReadRevision ||
+                    this.disposed)
                     return;
                 if (!result.ok) {
                     this.applySlashCatalog(sessionId, undefined);
@@ -647,6 +694,8 @@ export class QaSessionController {
             }
             catch (error) {
                 console.error("dsh-qa-surface: slash catalog failed", error);
+                if (revision !== this.slashReadRevision || this.disposed)
+                    return;
                 this.applySlashCatalog(sessionId, undefined);
             }
         })().finally(() => {
@@ -663,10 +712,8 @@ export class QaSessionController {
      * into refusals.
      */
     applySlashCatalog(sessionId, catalog) {
-        if (this.session === undefined ||
-            String(this.session.sessionId) !== sessionId) {
+        if (this.disposed || this.slashReadTarget() !== sessionId)
             return;
-        }
         this.slashSessionId = sessionId;
         this.slashLoadedAt = Date.now();
         if (catalog === null) {
@@ -696,13 +743,14 @@ export class QaSessionController {
     }
     /** Whether the catalog of the bound chat was read successfully. */
     slashCatalogReady() {
-        return this.slashState === "ready" || this.slashState === "loading";
+        return ((this.slashState === "ready" || this.slashState === "loading") &&
+            this.slashSessionId === this.slashReadTarget());
     }
     /** The slash view of the current state; assembled where the state is. */
     slashView() {
         const enabled = this.config.slashCommands.enabled &&
             !this.compatibilityReadOnly &&
-            this.slashSessionId !== null &&
+            this.slashReadTarget() !== undefined &&
             this.slashApi !== undefined;
         // Identity is the render signal: this runs on every publish, including
         // every stream frame of a running turn, and the composer is memoized on
@@ -786,8 +834,8 @@ export class QaSessionController {
      * hides the marker message, and the consecutive turns read as variants of
      * the original question (switched in the surface).
      */
-    async regenerate() {
-        return this.send(QA_REGENERATE_MARKER);
+    async regenerate(fastReview = false) {
+        return this.send(QA_REGENERATE_MARKER, [], null, fastReview);
     }
     async stop() {
         const target = this.session;
@@ -915,12 +963,14 @@ export class QaSessionController {
         this.unbind();
         this.operationError = null;
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.state = {
             ...QA_SESSION_IDLE_STATE,
             chatKey: this.chatKey,
             chatsRevision: this.chatsRevision,
         };
         this.publish();
+        void this.refreshSlashCatalog(true);
     }
     /**
      * Turn the current draft into a real attested session. Runs inside the
@@ -975,6 +1025,59 @@ export class QaSessionController {
         });
         return attempt;
     }
+    /** Branch a completed answer without submitting or cancelling a turn. */
+    async forkFromAnswer(answerSeq) {
+        const parent = this.session;
+        const remote = this.forkSessionRemote;
+        if (this.disposed ||
+            this.forking ||
+            remote === undefined ||
+            parent === undefined ||
+            this.viewingSubagent !== null ||
+            this.compatibilityReadOnly ||
+            !this.policyReady ||
+            this.config.session.policy === "fixed")
+            return;
+        const operation = this.generation;
+        this.forking = true;
+        try {
+            const result = await remote(this.accounts?.token() ?? "", String(parent.sessionId), answerSeq);
+            if (!result.ok)
+                throw new Error("The Host refused to create the branch.");
+            this.accounts?.onSessionCreated(result.value);
+            this.chats.addChat(result.value);
+            if (this.disposed ||
+                operation !== this.generation ||
+                parent !== this.session)
+                return;
+            ++this.generation;
+            this.drafting = false;
+            this.openChat();
+            this.unbind();
+            this.operationError = null;
+            this.state = {
+                ...QA_SESSION_IDLE_STATE,
+                chatKey: this.chatKey,
+                chatsRevision: this.chatsRevision,
+                phase: "creating",
+            };
+            this.publish();
+            const adoption = this.generation;
+            if (await this.bind(result.value, { operation: adoption }))
+                this.chats.saveActive(result.value);
+        }
+        catch (error) {
+            if (!this.disposed &&
+                (parent === this.session || this.session === undefined)) {
+                this.operationError = "Не удалось создать ветку чата.";
+                console.error("dsh-qa-surface: session operation failed (fork)", error);
+                this.publish();
+            }
+        }
+        finally {
+            this.forking = false;
+        }
+    }
     /**
      * Open one of this browser's indexed chats. The id must be present in the
      * host session list and pass policy attestation; an unknown id is forgotten
@@ -993,6 +1096,7 @@ export class QaSessionController {
         this.unbind();
         this.operationError = null;
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.state = {
             ...QA_SESSION_IDLE_STATE,
             chatKey: this.chatKey,
@@ -1060,6 +1164,7 @@ export class QaSessionController {
         this.unbind();
         this.operationError = null;
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.state = {
             ...QA_SESSION_IDLE_STATE,
             chatKey: this.chatKey,
@@ -1176,6 +1281,7 @@ export class QaSessionController {
         if (this.disposed)
             return;
         this.disposed = true;
+        clearInterval(this.accessPoll);
         this.generation += 1;
         this.streamPublisher.clear();
         this.unsubscribeConnection();
@@ -1334,6 +1440,7 @@ export class QaSessionController {
         const operation = ++this.generation;
         this.unbind();
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.state = { ...this.state, phase: "creating" };
         this.emit();
         try {
@@ -1505,6 +1612,7 @@ export class QaSessionController {
         this.session = binding.session;
         this.conversationBinding = this.conversation.binding(id);
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.compatibilityReadOnly = false;
         this.unsubscribeSession = binding.session.subscribe(() => {
             this.admissionPending = false;
@@ -1733,10 +1841,13 @@ export class QaSessionController {
         // answers for its own sends.
         this.requestQueueNotice = null;
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.compatibilityReadOnly = false;
         // The catalog belongs to the chat that produced it: another chat has a
         // different cwd, composition and role, so carrying it across would offer
         // actions this chat may not have.
+        this.slashLoading = undefined;
+        this.slashReadRevision += 1;
         this.slashSessionId = null;
         this.slashEntries = [];
         this.slashDenied = [];
@@ -1790,6 +1901,7 @@ export class QaSessionController {
                 canSend: connected && !materializing,
                 pendingMessage: this.pendingSubmission?.message ?? null,
                 chatsRevision: this.chatsRevision,
+                slash: this.slashView(),
             };
             this.emit();
             return;
@@ -1807,7 +1919,7 @@ export class QaSessionController {
         const snapshot = this.session.getSnapshot();
         const sessionId = String(this.session.sessionId);
         const conversationSnapshot = this.conversationBinding?.snapshot.getSnapshot();
-        const projectedSourceBundles = projectTurnSources(conversationSnapshot, sessionId, this.sourceAnchor(sessionId));
+        const projectedSourceBundles = projectTurnSources(conversationSnapshot, sessionId, this.sourceAnchor(sessionId), this.config.tools.docsRoot);
         const sourceBundles = this.hostSources.merge(projectedSourceBundles);
         // A delegated child is not attested, so every Host RPC that admits the
         // session refuses it — and its evidence reaches the chat through the
@@ -1826,6 +1938,7 @@ export class QaSessionController {
             chatKey: this.chatKey,
             sessionSnapshot: snapshot,
             conversationSnapshot,
+            inheritedThroughSeq: this.inheritedThroughSeq,
             sourceBundles,
             // The same directory the sources are anchored on: an answer that quotes a
             // file the turn made is masked to the name inside this workspace.
@@ -1875,6 +1988,26 @@ export class QaSessionController {
         }
         this.state = {
             ...projected,
+            chatAccess: this.chatAccess?.sessionId === sessionId ? this.chatAccess : undefined,
+            ...(this.chatAccess?.sessionId === sessionId &&
+                this.chatAccess.mode !== "owner"
+                ? {
+                    canSend: projected.canSend && this.chatAccess.mode === "collaborate",
+                    canStop: false,
+                    canEditQueue: false,
+                    approvals: [],
+                    questions: [],
+                    messages: projected.messages.map((message) => message.role === "assistant"
+                        ? {
+                            ...message,
+                            artifacts: message.artifacts?.map((artifact) => {
+                                const { workflow: _workflow, ...file } = artifact;
+                                return file;
+                            }),
+                        }
+                        : message),
+                }
+                : {}),
             pendingMessage: this.pendingSubmission?.message ?? null,
         };
         this.emit();
@@ -2019,7 +2152,9 @@ export class QaSessionController {
         if (session === undefined)
             return { kind: "refused", reason: null };
         const sessionId = String(session.sessionId);
-        if (!this.config.lockdown.enabled && this.accounts === undefined) {
+        if (!this.config.lockdown.enabled &&
+            this.accounts === undefined &&
+            this.forkSessionRemote === undefined) {
             this.policyReady = true;
             return { kind: "ok", sessionId };
         }
@@ -2028,6 +2163,7 @@ export class QaSessionController {
         // lockdown, and skipping the call is what let a browser that restored
         // another account's chat write into it without ever being asked who spoke.
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.publish();
         const outcome = await attestQaPolicy({
             secureSession: this.secureSessionRemote,
@@ -2039,6 +2175,8 @@ export class QaSessionController {
         if (this.session !== session)
             return { kind: "stale" };
         if (outcome.ok) {
+            this.chatAccess = outcome.chatAccess;
+            this.inheritedThroughSeq = outcome.inheritedThroughSeq;
             this.policyReady = true;
             this.operationError = null;
             this.publish();
@@ -2051,6 +2189,7 @@ export class QaSessionController {
             return { kind: "refused", reason: outcome.reason };
         }
         this.policyReady = false;
+        this.inheritedThroughSeq = undefined;
         this.operationError = CONFIGURATION_ERROR;
         this.publish();
         return { kind: "refused", reason: outcome.reason };
@@ -2059,6 +2198,34 @@ export class QaSessionController {
         for (const listener of this.listeners)
             listener();
     }
+    async refreshChatAccess() {
+        const session = this.session;
+        const token = this.accounts?.token();
+        if (session === undefined ||
+            token == null ||
+            this.sharingApi === undefined ||
+            this.disposed)
+            return;
+        const id = String(session.sessionId);
+        try {
+            const result = await this.sharingApi.access(token, id);
+            if (this.session !== session || this.disposed)
+                return;
+            if (!result.ok) {
+                this.unbind();
+                this.chatAccess = undefined;
+                this.fail("Доступ к чату отозван или аккаунт недоступен.", new QaPolicyAttestationError("session-owned-elsewhere"));
+                return;
+            }
+            if (JSON.stringify(this.chatAccess) !== JSON.stringify(result.value)) {
+                this.chatAccess = result.value;
+                this.publish();
+            }
+        }
+        catch {
+            /* Transport failures do not fabricate a revocation. Server writes still recheck access. */
+        }
+    }
     /**
      * Answer a request the Host parked for this chat. The Host re-checks the
      * request against the chat, so an answer that lost its race is a no-op; the