dsh-deja 0.20.2 → 0.20.4

package/README.md

@@ -1,6 +1,6 @@
 # dsh-deja
 
-English | [中文](README.zh.md)
+English | [中文](docs/zh.md)
 
 DeepSeek Harness can already search its own sessions — that is what the built-in
 `session-query` subsystem does. This plugin answers the other question: what you
@@ -22,9 +22,15 @@ The plugin runs the `deja` binary. It is pulled in as a dependency, so npm
 installs it with the plugin; a `deja` already on `PATH` is used as-is, and
 `DEJA_BIN` overrides both.
 
+If you have the CLI, `deja install --auto` wires dsh too — it adds deja's MCP
+server and a `/deja` command to your profile — and that is the shorter path.
+Having both is fine: this plugin looks for what the installer wrote in
+`$DSH_HOME/plugins/deja/` and contributes only what is missing, so the tools and
+the command are never registered twice.
+
 ## What it adds
 
-Three tools the model can call:
+Six tools the model can call:
 
 | Tool | Answers |
 |---|---|

package/{README.zh.md → docs/zh.md}

@@ -1,6 +1,6 @@
 # dsh-deja
 
-[English](README.md) | 中文
+[English](../README.md) | 中文
 
 DeepSeek Harness 自带的 `session-query` 已经可以检索它自己的会话。这个插件回答的是另一个问题：你在这台机器上**其他**智能体里做过什么。
 
@@ -14,9 +14,12 @@ dsh plugin --profile web add dsh-deja
 
 插件调用 `deja` 可执行文件。它作为依赖随插件一起安装；如果 `PATH` 上已有 `deja` 就直接使用，`DEJA_BIN` 可覆盖两者。
 
+装了 CLI 的话，`deja install --auto` 也会把 dsh 接好——写入 deja 的 MCP 服务端和 `/deja` 命令——那条路更短。
+两边都装也没问题：插件会检查 `$DSH_HOME/plugins/deja/` 下安装器写了什么，只补缺的部分，工具和命令不会注册两次。
+
 ## 提供的能力
 
-三个模型可调用的工具：
+六个模型可调用的工具：
 
 | 工具 | 回答什么 |
 |---|---|

package/index.js

@@ -11,6 +11,8 @@ import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
+import { contributions } from "./lib.js";
+
 const require = createRequire(import.meta.url);
 
 // The tool registry lives in the host. A plugin that throws on a missing peer
@@ -292,11 +294,16 @@ function isHuman(message) {
   return Boolean(message) && (!message.source || message.source.kind === "user");
 }
 
-// cliPluginDir is where `deja install dsh` writes plugins of its own. A user
-// who ran the installer and then added this package has both in the profile:
-// two `/deja` commands and the same recall on the system prompt twice. The
-// files on disk win — the installer keeps them current — and this package then
-// contributes only what they do not: the model-facing tools.
+// `deja install dsh` writes plugins of its own into DSH_HOME and adds them to
+// the profile, so a user who ran the installer and then added this package has
+// both: two `/deja` commands, the same recall on the system prompt twice, and
+// deja's MCP server answering the same six questions the tools here do. What
+// the installer wrote wins — it is the copy `deja install` keeps current — and
+// this package contributes only the parts that are missing.
+//
+// The two halves are separate on purpose: `deja install dsh` writes command.js
+// and the MCP row, and only `deja install dsh-auto` adds auto.js. A profile can
+// have the command from the installer and still want recall from here.
 function cliPluginDir() {
   const home = process.env.DSH_HOME || join(homedir(), ".dsh");
   return join(home, "plugins", "deja");
@@ -311,13 +318,13 @@ function installedByCLI(file) {
 }
 
 function apply(ctx, config) {
-  tools(ctx);
-  // Each half stands down on its own: `deja install dsh` writes command.js,
-  // and only `deja install dsh-auto` adds auto.js, so a profile can have the
-  // command from the installer and still want recall from here.
-  if (!installedByCLI("command.js")) command(ctx);
-  if (installedByCLI("auto.js")) return;
-  if (!config || config.autoRecall !== false) autoRecall(ctx);
+  const adds = contributions(
+    { command: installedByCLI("command.js"), auto: installedByCLI("auto.js") },
+    config,
+  );
+  if (adds.tools) tools(ctx);
+  if (adds.command) command(ctx);
+  if (adds.recall) autoRecall(ctx);
 }
 
 apply.inject = ["tools", "commands", "systemPrompt"];

package/lib.js

@@ -0,0 +1,22 @@
+// The plugin's decision, kept out of index.js because a host is free to treat
+// anything a plugin module exports as part of the plugin — opencode does
+// exactly that with its own — and this is a helper, not a second plugin.
+
+// contributions says what this package adds, given what `deja install` already
+// wrote into DSH_HOME and what the profile turned off. The rule is the same
+// everywhere: fill the gaps, never repeat the installer.
+//
+// command.js and the mcp-deja profile row are written by the same install, so
+// the command file standing there means the model can already reach deja —
+// registering these tools would list every answer twice. auto.js is separate:
+// only `deja install dsh-auto` writes it, so a profile can take the command
+// from the installer and still want recall from here.
+export function contributions(wiring, config) {
+  const wired = wiring || {};
+  const settings = config || {};
+  return {
+    tools: !wired.command,
+    command: !wired.command,
+    recall: settings.autoRecall !== false && !wired.auto,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-deja",
-  "version": "0.20.2",
+  "version": "0.20.4",
   "description": "Brings the session history of nineteen other coding agents into DeepSeek Harness: recall, session digest and per-file history tools over a local index, plus optional automatic recall before each step.",
   "type": "module",
   "main": "index.js",
@@ -10,9 +10,10 @@
   },
   "files": [
     "index.js",
+    "lib.js",
     "cordis.patch.yml",
     "README.md",
-    "README.zh.md",
+    "docs/zh.md",
     "LICENSE"
   ],
   "license": "MIT",