dsh-trellis 0.1.0 → 0.1.2

package/lib/index.js

@@ -1,146 +1,186 @@
-/**
- * dsh-trellis: Trellis workflow integration for DeepSeek Harness.
- *
- * - Per-turn workflow-state breadcrumb: at every eligible `agent/pre-step`,
- *   resolves the project's Trellis state (.trellis/workflow.md blocks +
- *   active task) and injects the matching [workflow-state:*] body into the
- *   session, exactly where the workspace-instruction baseline lands.
- * - `/trellis-status` and read-only `/trellis-finish` utility commands.
- *   Session rituals remain skills (`/trellis-start`, `/trellis-continue`,
- *   `/trellis-finish-work`) so command registration cannot shadow them.
- * - `trellis_wait`, an event-driven synchronization tool for a continuable
- *   role agent after the main session has exhausted independent work.
- * - A managed DSH_TRELLIS_CONTEXT_ID derived per shell execution from the
- *   native DSH session, so an outer host's inherited TRELLIS_CONTEXT_ID cannot
- *   silently claim the inner session. Utility commands set the same identity.
- *
- * In directories without a Trellis project it injects no breadcrumb; utility
- * commands validate the project only when a user explicitly invokes them.
- *
- * @module dsh-trellis
- */
-import { isDeepStrictEqual } from "node:util";
-import { Config, resolveConfig } from "./config.js";
-import { createBreadcrumbComposer, isBreadcrumbMessage } from "./breadcrumb.js";
-import { registerCommands } from "./commands.js";
-import { registerSessionEnv } from "./session-env.js";
-import { registerWaitTool } from "./wait-tool.js";
-
-export const name = "dsh-trellis";
-
-/** @type {string[]} */
-export const inject = ["commands", "shellEnv", "subagents", "tools"];
-
-export { Config };
-
-function sameBreadcrumbPayload(left, right) {
-  return (
-    isDeepStrictEqual(left.content, right.content) &&
-    isDeepStrictEqual(left.source, right.source)
-  );
-}
-
-/** @param {import("@deepseek-ai/cordis").Context} ctx */
-export function apply(ctx, config = {}) {
-  const resolved = resolveConfig(config);
-  if (!resolved.enabled) return;
-
-  // --- /trellis commands ---------------------------------------------------
-  let disposeCommands = () => {};
-  ctx.effect(() => {
-    if (resolved.commandsEnabled) {
-      disposeCommands = registerCommands(ctx, resolved);
-    }
-    return () => disposeCommands();
-  }, "dsh-trellis.commands");
-
-  // --- native continuable-subagent synchronization -----------------------
-  ctx.effect(
-    () => registerWaitTool(ctx),
-    "dsh-trellis.wait-tool",
-  );
-
-  // --- session-scoped shell identity --------------------------------------
-  ctx.effect(
-    () => registerSessionEnv(ctx),
-    "dsh-trellis.session-env",
-  );
-
-  // --- per-turn breadcrumb injection --------------------------------------
-  const { compose } = createBreadcrumbComposer(resolved, ctx);
-
-  const syncInbox = (agent, desired) => {
-    const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
-    const alreadySupplied =
-      desired === undefined ||
-      agent.session.surface.nodes.some((seq) => {
-        const event = agent.session.events[seq];
-        return (
-          event?.type === "user/message" &&
-          event.data !== undefined &&
-          isBreadcrumbMessage(event.data) &&
-          sameBreadcrumbPayload(event.data, desired)
-        );
-      });
-    if (alreadySupplied) {
-      for (const message of pending) agent.inbox.remove(message.id);
-      return;
-    }
-    const reusable = pending.find((message) =>
-      sameBreadcrumbPayload(message, desired),
-    );
-    if (reusable !== undefined) {
-      for (const message of pending)
-        if (message !== reusable) agent.inbox.remove(message.id);
-      return;
-    }
-    const replaced = pending[0];
-    if (replaced === undefined) agent.inbox.prepend("next-step", desired);
-    else agent.inbox.replace(replaced.id, desired);
-    for (const message of pending.slice(1)) agent.inbox.remove(message.id);
-  };
-
-  ctx.on("agent/pre-step", async ({ agent, messages, step, signal }, next) => {
-    const decision = await next();
-    let desired;
-    try {
-      desired = await compose(agent, messages, signal);
-    } catch (error) {
-      if (signal !== undefined && signal.aborted) throw error;
-      ctx.logger?.warn?.(
-        "dsh-trellis breadcrumb composition failed: %o",
-        error,
-      );
-      return decision;
-    }
-    signal?.throwIfAborted();
-    if (desired === undefined) {
-      const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
-      for (const message of pending) agent.inbox.remove(message.id);
-      return decision;
-    }
-    if (
-      decision.kind === "reject" ||
-      (step === 1 && decision.messages.length === 0)
-    ) {
-      syncInbox(agent, desired);
-      return decision;
-    }
-    const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
-    for (const message of pending) agent.inbox.remove(message.id);
-    if (
-      decision.messages.some((message) =>
-        sameBreadcrumbPayload(message, desired),
-      )
-    ) {
-      return decision;
-    }
-    const lastClaimedIndex = decision.messages.findLastIndex((message) =>
-      messages.includes(message),
-    );
-    return {
-      kind: "enter",
-      messages: decision.messages.toSpliced(lastClaimedIndex + 1, 0, desired),
-    };
-  });
-}
+/**
+ * dsh-trellis: Trellis workflow integration for DeepSeek Harness.
+ *
+ * - Per-turn workflow-state breadcrumb: at every eligible `agent/pre-step`,
+ *   resolves the project's Trellis state (.trellis/workflow.md blocks +
+ *   active task) and injects the matching [workflow-state:*] body into the
+ *   session, exactly where the workspace-instruction baseline lands.
+ * - `/trellis-status` and read-only `/trellis-finish` utility commands.
+ *   Session rituals remain skills (`/trellis-start`, `/trellis-continue`,
+ *   `/trellis-finish-work`) so command registration cannot shadow them.
+ * - `trellis_wait`, an event-driven synchronization tool for a continuable
+ *   role agent after the main session has exhausted independent work.
+ * - A managed DSH_TRELLIS_CONTEXT_ID derived per shell execution from the
+ *   native DSH session, so an outer host's inherited TRELLIS_CONTEXT_ID cannot
+ *   silently claim the inner session. Utility commands set the same identity.
+ *
+ * In directories without a Trellis project it injects no breadcrumb; utility
+ * commands validate the project only when a user explicitly invokes them.
+ *
+ * @module dsh-trellis
+ */
+import { isDeepStrictEqual } from "node:util";
+import { Config, resolveConfig } from "./config.js";
+import { createBreadcrumbComposer, isBreadcrumbMessage } from "./breadcrumb.js";
+import { registerCommands } from "./commands.js";
+import { registerSessionEnv } from "./session-env.js";
+import { registerWaitTool } from "./wait-tool.js";
+
+export const name = "dsh-trellis";
+export const SETTINGS_NAMESPACE = "dsh-trellis";
+
+/** @type {string[]} */
+export const inject = ["commands", "shellEnv", "subagents", "tools"];
+
+export { Config };
+
+function stopAll(disposers) {
+  for (const dispose of disposers.toReversed()) dispose();
+}
+
+function sameBreadcrumbPayload(left, right) {
+  return (
+    isDeepStrictEqual(left.content, right.content) &&
+    isDeepStrictEqual(left.source, right.source)
+  );
+}
+
+/** @param {import("@deepseek-ai/cordis").Context} ctx */
+export function apply(ctx, config = {}) {
+  let stopped = false;
+  let disposeRuntime = () => {};
+
+  const mountRuntime = (nextConfig) => {
+    if (stopped) return;
+    disposeRuntime();
+    const resolved = resolveConfig(nextConfig);
+    if (!resolved.enabled) {
+      disposeRuntime = () => {};
+      return;
+    }
+
+    const disposers = [];
+    try {
+      if (resolved.commandsEnabled) {
+        disposers.push(registerCommands(ctx, resolved));
+      }
+      disposers.push(registerWaitTool(ctx));
+      disposers.push(registerSessionEnv(ctx));
+      disposers.push(registerBreadcrumb(ctx, resolved));
+    } catch (error) {
+      stopAll(disposers);
+      throw error;
+    }
+    disposeRuntime = () => stopAll(disposers);
+  };
+
+  // Keep the composition entry working when no settings provider is mounted.
+  // Once rc.8's settings service appears, its resolved section becomes the
+  // live source and a saved Web card edit remounts only this plugin's runtime.
+  ctx.effect(() => {
+    mountRuntime(config);
+    return () => {
+      stopped = true;
+      disposeRuntime();
+    };
+  }, "dsh-trellis.runtime");
+
+  // Optional by design: rc.6 profiles have no settings service and retain the
+  // loader-config behavior, while rc.8 Web profiles expose this namespace.
+  ctx.inject(["settings"], (settingsCtx) => {
+    const scope = settingsCtx.settings.register(
+      SETTINGS_NAMESPACE,
+      Config,
+      { base: config, applies: "live" },
+    );
+    const adopt = () => mountRuntime(scope.get());
+    adopt();
+    const unwatch = scope.watch(adopt);
+    settingsCtx.effect(
+      () => () => {
+        unwatch();
+        mountRuntime(config);
+      },
+      "dsh-trellis.settings",
+    );
+  });
+}
+
+function registerBreadcrumb(ctx, resolved) {
+  const { compose } = createBreadcrumbComposer(resolved, ctx);
+
+  const syncInbox = (agent, desired) => {
+    const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
+    const alreadySupplied =
+      desired === undefined ||
+      agent.session.surface.nodes.some((seq) => {
+        const event = agent.session.events[seq];
+        return (
+          event?.type === "user/message" &&
+          event.data !== undefined &&
+          isBreadcrumbMessage(event.data) &&
+          sameBreadcrumbPayload(event.data, desired)
+        );
+      });
+    if (alreadySupplied) {
+      for (const message of pending) agent.inbox.remove(message.id);
+      return;
+    }
+    const reusable = pending.find((message) =>
+      sameBreadcrumbPayload(message, desired),
+    );
+    if (reusable !== undefined) {
+      for (const message of pending)
+        if (message !== reusable) agent.inbox.remove(message.id);
+      return;
+    }
+    const replaced = pending[0];
+    if (replaced === undefined) agent.inbox.prepend("next-step", desired);
+    else agent.inbox.replace(replaced.id, desired);
+    for (const message of pending.slice(1)) agent.inbox.remove(message.id);
+  };
+
+  return ctx.on("agent/pre-step", async ({ agent, messages, step, signal }, next) => {
+    const decision = await next();
+    let desired;
+    try {
+      desired = await compose(agent, messages, signal);
+    } catch (error) {
+      if (signal !== undefined && signal.aborted) throw error;
+      ctx.logger?.warn?.(
+        "dsh-trellis breadcrumb composition failed: %o",
+        error,
+      );
+      return decision;
+    }
+    signal?.throwIfAborted();
+    if (desired === undefined) {
+      const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
+      for (const message of pending) agent.inbox.remove(message.id);
+      return decision;
+    }
+    if (
+      decision.kind === "reject" ||
+      (step === 1 && decision.messages.length === 0)
+    ) {
+      syncInbox(agent, desired);
+      return decision;
+    }
+    const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
+    for (const message of pending) agent.inbox.remove(message.id);
+    if (
+      decision.messages.some((message) =>
+        sameBreadcrumbPayload(message, desired),
+      )
+    ) {
+      return decision;
+    }
+    const lastClaimedIndex = decision.messages.findLastIndex((message) =>
+      messages.includes(message),
+    );
+    return {
+      kind: "enter",
+      messages: decision.messages.toSpliced(lastClaimedIndex + 1, 0, desired),
+    };
+  });
+}