dsh-theone 0.3.19 → 0.3.20

package/README.md

@@ -18,18 +18,10 @@ How many sessions are sitting in your DSH sidebar? Getting back to last week's w
 
 **TheOne takes care of that.** You just talk in one main chat:
 
-```text
-You: FP8 still crashes for Qwen on the 9070 XT
-     → Qwen / RX 9070 XT
-You: also fill in the ablation table in chapter 3 of the paper
-     → Video Attention Thesis
-You: and add the Qwen speed numbers from earlier
-     → Video Attention Thesis · reference: Qwen / RX 9070 XT
-You: wrong topic, that was the GPU one
-     → Qwen / RX 9070 XT        (the previous message is redone there, and remembered)
-```
-
-<sub>Illustration. By default, a one-line notice appears only when the topic changes.</sub>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/YunongDai2005/dsh-theone/main/docs/images/theone-architecture-en-dark.svg">
+  <img alt="How TheOne works: main chat sends each message through the router to its topic session; answers stream back, and the topic directory keeps progress, constraints and links" src="https://raw.githubusercontent.com/YunongDai2005/dsh-theone/main/docs/images/theone-architecture-en-light.svg" width="100%">
+</picture>
 
 Each project gets its own background session that reasons, runs tools and compacts on its own. What you see is always one ordinary conversation.
 

package/README.zh.md

@@ -18,18 +18,10 @@
 
 **TheOne 把这些都交给它。** 你只管在一个主聊天里说话：
 
-```text
-你：Qwen 在 9070 XT 上跑 FP8 还是报错
-    → Qwen / RX 9070 XT
-你：顺便把论文第三章的消融表补上
-    → 视频注意力论文
-你：把刚才 Qwen 的测速结果也放进去
-    → 视频注意力论文 · 参考：Qwen / RX 9070 XT
-你：分错了，是显卡那个的
-    → Qwen / RX 9070 XT        （上一条交给它重新处理，以后也记住了）
-```
-
-<sub>示意。默认只在切换话题时显示一行提示。</sub>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/YunongDai2005/dsh-theone/main/docs/images/theone-architecture-zh-dark.svg">
+  <img alt="TheOne 的结构：主聊天把每条消息交给分配话题，送到对应的后台会话，结果实时回到主聊天；话题目录保存进展、约束和关联" src="https://raw.githubusercontent.com/YunongDai2005/dsh-theone/main/docs/images/theone-architecture-zh-light.svg" width="100%">
+</picture>
 
 每件事都有自己的后台会话，在里面推理、调用工具、压缩上下文；你看到的始终是一个普通的对话。
 

package/dist/client-locales.d.ts

@@ -39,6 +39,8 @@ export declare const zh: {
     readonly 'update.busy': "有回复正在进行，等它结束后再点更新。";
     readonly 'update.tooNew': "DSH 的安全策略只允许安装发布满 24 小时的版本，这一版还太新。过一阵再点一次即可。";
     readonly 'update.network': "连不上下载源，请检查网络后点击重试。";
+    readonly 'update.otherAge': "pnpm 拒绝安装：{names} 也是发布不满 24 小时的版本，不归 TheOne 放行。等它满 24 小时后再点一次。";
+    readonly 'update.ageStill': "已为 TheOne 放行，pnpm 仍然拒绝：{detail}。完整日志在 DSH 配置目录的 .plugin-manager/logs 里。";
     readonly 'update.failed': "更新失败";
     readonly 'update.hint': "当前 {current}，可更新到 {latest}。点击一键更新，不用重启 DSH。";
     readonly 'update.manualHint': "当前 {current}，最新 {latest}。这份插件不是从 GitHub 或 npm 安装的，请在「插件」页面重新安装。";

package/dist/client-locales.js

@@ -39,6 +39,8 @@ export const zh = {
     'update.busy': '有回复正在进行，等它结束后再点更新。',
     'update.tooNew': 'DSH 的安全策略只允许安装发布满 24 小时的版本，这一版还太新。过一阵再点一次即可。',
     'update.network': '连不上下载源，请检查网络后点击重试。',
+    'update.otherAge': 'pnpm 拒绝安装：{names} 也是发布不满 24 小时的版本，不归 TheOne 放行。等它满 24 小时后再点一次。',
+    'update.ageStill': '已为 TheOne 放行，pnpm 仍然拒绝：{detail}。完整日志在 DSH 配置目录的 .plugin-manager/logs 里。',
     'update.failed': '更新失败',
     'update.hint': '当前 {current}，可更新到 {latest}。点击一键更新，不用重启 DSH。',
     'update.manualHint': '当前 {current}，最新 {latest}。这份插件不是从 GitHub 或 npm 安装的，请在「插件」页面重新安装。',
@@ -248,6 +250,8 @@ export const en = {
     'update.busy': 'A reply is in progress. Update once it finishes.',
     'update.tooNew': 'DSH only installs versions published at least 24 hours ago, as a safety policy, and this one is newer. Try again later.',
     'update.network': 'Could not reach the download source. Check the network and click to retry.',
+    'update.otherAge': 'pnpm refused: {names} is also less than 24 hours old, and only TheOne is exempted. Try again once it is a day old.',
+    'update.ageStill': 'TheOne is exempted, but pnpm still refused: {detail}. The full log is in .plugin-manager/logs in the DSH profile folder.',
     'update.failed': 'Update failed',
     'update.hint': 'You have {current}; {latest} is available. Click to update without restarting DSH.',
     'update.manualHint': 'You have {current}; {latest} is available. This copy was not installed from GitHub or npm, so reinstall it from the Plugins page.',

package/dist/client.js

@@ -123,6 +123,8 @@ var zh = {
   "update.busy": "\u6709\u56DE\u590D\u6B63\u5728\u8FDB\u884C\uFF0C\u7B49\u5B83\u7ED3\u675F\u540E\u518D\u70B9\u66F4\u65B0\u3002",
   "update.tooNew": "DSH \u7684\u5B89\u5168\u7B56\u7565\u53EA\u5141\u8BB8\u5B89\u88C5\u53D1\u5E03\u6EE1 24 \u5C0F\u65F6\u7684\u7248\u672C\uFF0C\u8FD9\u4E00\u7248\u8FD8\u592A\u65B0\u3002\u8FC7\u4E00\u9635\u518D\u70B9\u4E00\u6B21\u5373\u53EF\u3002",
   "update.network": "\u8FDE\u4E0D\u4E0A\u4E0B\u8F7D\u6E90\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u70B9\u51FB\u91CD\u8BD5\u3002",
+  "update.otherAge": "pnpm \u62D2\u7EDD\u5B89\u88C5\uFF1A{names} \u4E5F\u662F\u53D1\u5E03\u4E0D\u6EE1 24 \u5C0F\u65F6\u7684\u7248\u672C\uFF0C\u4E0D\u5F52 TheOne \u653E\u884C\u3002\u7B49\u5B83\u6EE1 24 \u5C0F\u65F6\u540E\u518D\u70B9\u4E00\u6B21\u3002",
+  "update.ageStill": "\u5DF2\u4E3A TheOne \u653E\u884C\uFF0Cpnpm \u4ECD\u7136\u62D2\u7EDD\uFF1A{detail}\u3002\u5B8C\u6574\u65E5\u5FD7\u5728 DSH \u914D\u7F6E\u76EE\u5F55\u7684 .plugin-manager/logs \u91CC\u3002",
   "update.failed": "\u66F4\u65B0\u5931\u8D25",
   "update.hint": "\u5F53\u524D {current}\uFF0C\u53EF\u66F4\u65B0\u5230 {latest}\u3002\u70B9\u51FB\u4E00\u952E\u66F4\u65B0\uFF0C\u4E0D\u7528\u91CD\u542F DSH\u3002",
   "update.manualHint": "\u5F53\u524D {current}\uFF0C\u6700\u65B0 {latest}\u3002\u8FD9\u4EFD\u63D2\u4EF6\u4E0D\u662F\u4ECE GitHub \u6216 npm \u5B89\u88C5\u7684\uFF0C\u8BF7\u5728\u300C\u63D2\u4EF6\u300D\u9875\u9762\u91CD\u65B0\u5B89\u88C5\u3002",
@@ -332,6 +334,8 @@ var en = {
   "update.busy": "A reply is in progress. Update once it finishes.",
   "update.tooNew": "DSH only installs versions published at least 24 hours ago, as a safety policy, and this one is newer. Try again later.",
   "update.network": "Could not reach the download source. Check the network and click to retry.",
+  "update.otherAge": "pnpm refused: {names} is also less than 24 hours old, and only TheOne is exempted. Try again once it is a day old.",
+  "update.ageStill": "TheOne is exempted, but pnpm still refused: {detail}. The full log is in .plugin-manager/logs in the DSH profile folder.",
   "update.failed": "Update failed",
   "update.hint": "You have {current}; {latest} is available. Click to update without restarting DSH.",
   "update.manualHint": "You have {current}; {latest} is available. This copy was not installed from GitHub or npm, so reinstall it from the Plugins page.",
@@ -598,7 +602,7 @@ function apply(ctx) {
         cache: "no-store",
         ...body ? { headers: { "content-type": "application/json" }, body: JSON.stringify(body) } : {}
       });
-      if (response.ok || response.status === 409) setUpdate(await response.json());
+      if (response.ok || response.status === 409 || response.status === 400) setUpdate(await response.json());
       if (update?.state === "reloading") void awaitReload(update.current);
     } catch {
     }
@@ -715,13 +719,13 @@ function apply(ctx) {
     const waiting = !!status?.waiting && !status.available && !status.state;
     if (!status || !status.available && !status.state && !waiting) return null;
     const label = waiting ? t2("update.waiting") : status.state === "installing" ? t2("update.installing") : status.state === "reloading" ? t2("update.reloading") : status.state === "restart" ? t2("update.restart") : status.state === "failed" ? t2("update.failed") : t2("update.available");
-    const hint = waiting ? t2("update.waitingHint", { latest: status.waiting.version }) : status.error === "GATEWAY_BUSY" ? t2("update.busy") : status.state === "reloading" ? t2("update.reloadingHint") : status.state === "restart" ? t2("update.restartHint") : status.state === "failed" ? status.error === "MINIMUM_RELEASE_AGE" ? t2("update.tooNew") : status.error === "NETWORK" ? t2("update.network") : t2("update.failedHint", { error: status.error ?? "" }) : status.installable ? t2("update.hint", { current: status.current, latest: status.latest ?? "" }) : t2("update.manualHint", { current: status.current, latest: status.latest ?? "" });
+    const hint = waiting ? t2("update.waitingHint", { latest: status.waiting.version }) : status.error === "GATEWAY_BUSY" ? t2("update.busy") : status.state === "reloading" ? t2("update.reloadingHint") : status.state === "restart" ? t2("update.restartHint") : status.state === "failed" ? status.error === "OTHER_RELEASE_AGE" ? t2("update.otherAge", { names: status.detail ?? "" }) : status.error === "MINIMUM_RELEASE_AGE" ? status.exempt ? t2("update.ageStill", { detail: status.detail ?? "" }) : t2("update.tooNew") : status.error === "NETWORK" ? t2("update.network") : t2("update.failedHint", { error: status.detail ?? status.error ?? "" }) : status.installable ? t2("update.hint", { current: status.current, latest: status.latest ?? "" }) : t2("update.manualHint", { current: status.current, latest: status.latest ?? "" });
     const title = `${label} \xB7 ${hint}`;
     const act = (event) => {
       event.preventDefault();
       event.stopPropagation();
       if (status.state === "installing" || status.state === "reloading" || status.state === "restart") return;
-      if (waiting || status.state === "failed" && status.error === "MINIMUM_RELEASE_AGE") {
+      if (!status.exempt && (waiting || status.state === "failed" && status.error === "MINIMUM_RELEASE_AGE")) {
         openReleaseAgeDialog(status);
         return;
       }

package/dist/update.d.ts

@@ -12,8 +12,10 @@ export interface UpdateStatus {
     source: UpdateSource;
     /** installing → reloading (TheOne restarts itself; DSH keeps running), restart (applies after DSH restarts) or failed. */
     state?: 'installing' | 'reloading' | 'restart' | 'failed';
-    /** Why it failed: MINIMUM_RELEASE_AGE, NETWORK, or the plugin manager's own code. */
+    /** Why it failed: MINIMUM_RELEASE_AGE, OTHER_RELEASE_AGE (another package is too new), NETWORK, or the plugin manager's own code. */
     error?: string;
+    /** pnpm's own words about the failure, or the packages it refused. */
+    detail?: string;
     /** A newer npm version that pnpm will accept only once it is a day old, and when that is. */
     waiting?: {
         version: string;
@@ -31,6 +33,11 @@ export declare function releaseAgeExemptions(text: string): string[];
  * kept as it was. Throws for a layout it does not recognise rather than guess.
  */
 export declare function withReleaseAgeExemption(text: string, name?: string): string;
+/**
+ * The packages pnpm refused for being too new, as `name@version`, read from its output
+ * ("dsh-theone@0.3.13 was published at …").
+ */
+export declare function releaseAgeViolations(output: string): string[];
 /**
  * pnpm, which DSH installs plugins with, refuses npm versions published less than a day ago
  * (minimumReleaseAge, a supply-chain safeguard). Updates from npm wait until then.
@@ -66,6 +73,7 @@ export declare class Updater {
     private checked?;
     private state?;
     private error?;
+    private detail?;
     private pending?;
     /**
      * @param workspace - this DSH profile's pnpm-workspace.yaml, where pnpm reads the release-age
@@ -76,6 +84,8 @@ export declare class Updater {
     get exempt(): boolean;
     /** Exempt TheOne, and only TheOne, from pnpm's release-age rule in this profile. */
     allowFresh(): void;
+    /** Add exact `name@version` exemptions too, the form pnpm writes itself; returns whether the file changed. */
+    private exemptExact;
     get source(): UpdateSource;
     /** The latest known status; checks again at most every six hours (or now, when forced). */
     status(force?: boolean): Promise<UpdateStatus>;

package/dist/update.js

@@ -43,6 +43,13 @@ export function withReleaseAgeExemption(text, name = PACKAGE_NAME) {
     lines.splice(end, 0, `${indent}- ${name}`);
     return lines.join(newline);
 }
+/**
+ * The packages pnpm refused for being too new, as `name@version`, read from its output
+ * ("dsh-theone@0.3.13 was published at …").
+ */
+export function releaseAgeViolations(output) {
+    return [...new Set([...output.matchAll(/^\s*((?:@[\w.-]+\/)?[\w.-]+@\d[\w.+-]*) was published at/gm)].map(match => match[1]))];
+}
 /**
  * pnpm, which DSH installs plugins with, refuses npm versions published less than a day ago
  * (minimumReleaseAge, a supply-chain safeguard). Updates from npm wait until then.
@@ -75,6 +82,8 @@ export function installSource(spec) {
     return 'other';
 }
 const HOUR = 3600000;
+const installed = (result) => result.application === 'applied' || result.application === 'restart-required';
+const outputOf = (result) => `${result.packageResult?.output ?? ''}\n${result.error?.message ?? ''}`;
 /** Checks for a newer TheOne and installs it through DSH's own plugin manager. */
 export class Updater {
     current;
@@ -85,6 +94,7 @@ export class Updater {
     checked;
     state;
     error;
+    detail;
     pending;
     /**
      * @param workspace - this DSH profile's pnpm-workspace.yaml, where pnpm reads the release-age
@@ -130,6 +140,25 @@ export class Updater {
         if (this.state === 'failed') {
             this.state = undefined;
             this.error = undefined;
+            this.detail = undefined;
+        }
+    }
+    /** Add exact `name@version` exemptions too, the form pnpm writes itself; returns whether the file changed. */
+    exemptExact(entries) {
+        const file = this.workspace();
+        if (!file)
+            return false;
+        try {
+            const text = readFileSync(file, 'utf8');
+            const next = entries.reduce((current, entry) => withReleaseAgeExemption(current, entry), text);
+            if (next === text)
+                return false;
+            writeFileSync(`${file}.theone-tmp`, next, { mode: 0o600 });
+            renameSync(`${file}.theone-tmp`, file);
+            return true;
+        }
+        catch {
+            return false;
         }
     }
     get source() { return installSource(this.spec()); }
@@ -155,9 +184,19 @@ export class Updater {
         const spec = this.source === 'github' ? `github:${REPOSITORY}#${this.checked.sha}` : `${PACKAGE_NAME}@${status.latest}`;
         this.state = 'installing';
         this.error = undefined;
+        this.detail = undefined;
         try {
-            const result = await installer.installBundle(spec, { enabled: true });
-            if (result.application === 'applied' || result.application === 'restart-required') {
+            let result = await installer.installBundle(spec, { enabled: true });
+            let output = outputOf(result);
+            // pnpm also checks the lockfile, where the installed TheOne may itself be under a day old. If an
+            // exempt TheOne is still refused, exempt the exact versions involved, as pnpm does, and try once more.
+            const refused = /MINIMUM_RELEASE_AGE/.test(output) ? releaseAgeViolations(output) : [];
+            if (!installed(result) && this.source === 'npm' && this.exempt && refused.length && refused.every(entry => entry.startsWith(`${PACKAGE_NAME}@`))
+                && this.exemptExact([...refused, `${PACKAGE_NAME}@${this.current}`, `${PACKAGE_NAME}@${status.latest}`])) {
+                result = await installer.installBundle(spec, { enabled: true });
+                output = outputOf(result);
+            }
+            if (installed(result)) {
                 this.state = reload ? 'reloading' : 'restart';
                 reload?.(result.bundle ?? PACKAGE_NAME);
             }
@@ -165,10 +204,12 @@ export class Updater {
                 this.state = 'failed';
                 const error = result.error;
                 // pnpm's own reasons are clearer than the plugin manager's generic failure.
-                const output = `${result.packageResult?.output ?? ''}\n${error?.message ?? ''}`;
-                this.error = /MINIMUM_RELEASE_AGE/.test(output) ? 'MINIMUM_RELEASE_AGE'
+                const violations = /MINIMUM_RELEASE_AGE/.test(output) ? releaseAgeViolations(output) : [];
+                const others = violations.filter(entry => !entry.startsWith(`${PACKAGE_NAME}@`));
+                this.error = others.length ? 'OTHER_RELEASE_AGE' : /MINIMUM_RELEASE_AGE/.test(output) ? 'MINIMUM_RELEASE_AGE'
                     : /UND_ERR|ECONNRESET|ETIMEDOUT|ENOTFOUND|EAI_AGAIN|ERR_PNPM_META_FETCH_FAIL|network/i.test(output) ? 'NETWORK'
                         : String(error?.code ?? error?.message ?? result.application).slice(0, 120);
+                this.detail = (others.length ? others.join(', ') : output.match(/ERR_PNPM_\w+[^\n]*(?:\n[^\n]+)?/)?.[0] ?? '').trim().slice(0, 300) || undefined;
             }
         }
         catch (error) {
@@ -188,7 +229,8 @@ export class Updater {
         return { current: this.current, ...(latest ? { latest } : {}), available, source, ...waiting,
             ...(source === 'npm' ? { exempt, canExempt: !!this.workspace() } : {}),
             installable: available && (source === 'npm' || (source === 'github' && !!this.checked?.sha)),
-            ...(this.state ? { state: this.state } : {}), ...(this.error ?? this.checked?.error ? { error: this.error ?? this.checked?.error } : {}) };
+            ...(this.state ? { state: this.state } : {}), ...(this.error ?? this.checked?.error ? { error: this.error ?? this.checked?.error } : {}),
+            ...(this.detail ? { detail: this.detail } : {}) };
     }
     async check() {
         const signal = AbortSignal.timeout(10000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-theone",
-  "version": "0.3.19",
+  "version": "0.3.20",
   "private": false,
   "type": "module",
   "description": "Automatic context routing for DeepSeek Harness",