dsh-theone 0.3.22 → 0.3.23

package/dist/client.js

@@ -620,6 +620,7 @@ function apply(ctx) {
       await ctx.sessions.using(target, { source: "controllerOperation", signal: lifetime.signal }, async (reference) => {
         await reference.ready;
         lifetime.signal.throwIfAborted();
+        await fetch("/api/theone/gateway/hold", { method: "POST", signal: lifetime.signal }).catch(() => void 0);
         const selected = await ctx.modelDirectories.directoryFor(target).select({ provider: "theone", model: "gateway" });
         if (!selected.ok) throw selected.error;
         const renamed = await reference.binding.session.rename(t("gateway.title"));

package/dist/index.d.ts

@@ -119,6 +119,16 @@ export default class TheOne extends Service {
     private routerFor;
     /** Saved settings take effect for the next message; only the background catalog waits for a restart. */
     private applySettings;
+    /**
+     * DSH saves any session's model choice as its global default, so main chat choosing TheOne used
+     * to make every new ordinary chat a TheOne chat. TheOne must not change the user's settings:
+     * before main chat picks its model the default is held, and put back right after.
+     */
+    private heldDefault?;
+    holdDefaultModel(): void;
+    restoreDefaultModel(): Promise<void>;
+    /** Once: undo the default earlier versions left as TheOne, back to the model in use before it. */
+    private repairDefaultModel;
     /** Capture before Web saves the gateway itself as DSH's new default. */
     captureDefaultModel(): void;
     private backingModel;

package/dist/index.js

@@ -266,6 +266,7 @@ export default class TheOne extends Service {
         if (!!config.workerProvider !== !!config.workerModel)
             throw new Error('Set both workerProvider and workerModel, or neither');
         this.captureDefaultModel();
+        this.repairDefaultModel();
         this.router = this.routerFor(config.routerMode);
         if (config.historyCatalog ?? true) {
             this.catalog = new HistoryCatalog(ctx, this.store, () => this.backingModel(), config.catalogIntervalMs);
@@ -593,6 +594,11 @@ export default class TheOne extends Service {
                         await mkdir(this.gatewayDirectory, { recursive: true });
                         return Response.json({ cwd: this.gatewayDirectory }, { headers: { 'cache-control': 'no-store' } });
                     } }));
+                // Main chat is about to pick its model; DSH would save that as the user's default.
+                scope.effect(() => connection.fetch.register({ path: '/api/theone/gateway/hold', methods: ['POST'], requestBody: 'buffered', fetch: async () => {
+                        this.holdDefaultModel();
+                        return Response.json({ held: true });
+                    } }));
                 scope.effect(() => connection.fetch.register({ path: '/api/theone/gateway/prepare', methods: ['POST'], requestBody: 'buffered', fetch: async (request) => {
                         let value;
                         try {
@@ -623,6 +629,7 @@ export default class TheOne extends Service {
                         await scope.workspaceRegistry.unarchiveSession(id);
                         const locale = 'locale' in value && typeof value.locale === 'string' ? value.locale.slice(0, 16) : 'en';
                         this.welcomeGateway(id, locale);
+                        await this.restoreDefaultModel().catch(error => console.warn('TheOne could not restore DSH\'s default model.', error));
                         return Response.json({ prepared: true, workspaceId: null });
                     } }));
             });
@@ -977,6 +984,34 @@ export default class TheOne extends Service {
             catch { /* Released during shutdown. */ }
         this.store.seed(descriptors);
     }
+    /**
+     * DSH saves any session's model choice as its global default, so main chat choosing TheOne used
+     * to make every new ordinary chat a TheOne chat. TheOne must not change the user's settings:
+     * before main chat picks its model the default is held, and put back right after.
+     */
+    heldDefault;
+    holdDefaultModel() {
+        const current = this.ctx.agentDefaultModel.currentSelection();
+        // A default the user set to TheOne themselves stays as it is.
+        this.heldDefault = current.provider && current.provider !== 'theone' ? current : undefined;
+    }
+    async restoreDefaultModel() {
+        const held = this.heldDefault;
+        this.heldDefault = undefined;
+        // Saves run in order, so this lands after the one DSH queued for main chat's selection.
+        if (held)
+            await this.ctx.agentDefaultModel.saveSelection?.(held);
+    }
+    /** Once: undo the default earlier versions left as TheOne, back to the model in use before it. */
+    repairDefaultModel() {
+        const current = this.ctx.agentDefaultModel.currentSelection();
+        if (current.provider !== 'theone')
+            return;
+        const before = this.store.rememberedModel(this.config.gatewayKey);
+        if (!before || !this.store.markOnce('default-model-restored'))
+            return;
+        void this.ctx.agentDefaultModel.saveSelection?.(before)?.catch(error => console.warn('TheOne could not restore DSH\'s default model.', error));
+    }
     /** Capture before Web saves the gateway itself as DSH's new default. */
     captureDefaultModel() {
         const current = this.ctx.agentDefaultModel.currentSelection();

package/dist/store.d.ts

@@ -250,6 +250,8 @@ export declare class ContextStore {
     private purgeFacts;
     /** Notices the user closed; they are not shown again on any browser. */
     dismissNotice(id: string, now?: number): void;
+    /** True the first time `name` is marked, false ever after: for one-time repairs. */
+    markOnce(name: string, now?: number): boolean;
     dismissedNotices(): Set<string>;
     /**
      * Topics kept in the directory but hidden from routing and briefings: every conversation they can

package/dist/store.js

@@ -95,6 +95,7 @@ export class ContextStore {
         context_id TEXT NOT NULL, term TEXT NOT NULL, weight REAL NOT NULL, updated_at INTEGER NOT NULL, PRIMARY KEY(context_id, term)
       );
       CREATE TABLE IF NOT EXISTS dismissed_notices (id TEXT PRIMARY KEY, dismissed_at INTEGER NOT NULL);
+      CREATE TABLE IF NOT EXISTS plugin_flags (name TEXT PRIMARY KEY, set_at INTEGER NOT NULL);
       CREATE TABLE IF NOT EXISTS route_details (
         message_id TEXT PRIMARY KEY, excerpt TEXT NOT NULL, receipt TEXT, corrected_to TEXT, corrected_at INTEGER
       );
@@ -932,6 +933,10 @@ export class ContextStore {
     dismissNotice(id, now = Date.now()) {
         this.db.prepare('INSERT OR IGNORE INTO dismissed_notices VALUES (?, ?)').run(id, now);
     }
+    /** True the first time `name` is marked, false ever after: for one-time repairs. */
+    markOnce(name, now = Date.now()) {
+        return this.db.prepare('INSERT OR IGNORE INTO plugin_flags VALUES (?, ?)').run(name, now).changes === 1;
+    }
     dismissedNotices() {
         return new Set(this.db.prepare('SELECT id FROM dismissed_notices').all().map(row => String(row.id)));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-theone",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "private": false,
   "type": "module",
   "description": "One chat for everything in DeepSeek Harness (DSH): no more hunting for old conversations. Each message goes to the topic it belongs to, with its own context.",