paseo-dsh-direct 0.2.9 → 0.2.10

package/README.md

@@ -33,7 +33,7 @@ Most dsh integrations go through ACP, a generic protocol that every agent can sp
 - Your existing dsh sessions can be imported and resumed in Paseo.
 - dsh's slash commands (`/compact`, `/plan`, ...) appear in Paseo's `/` menu.
 - Paseo's usage meter shows dsh's token counts and how full the context window is.
-- Goal changes, plan mode switches and permission preset changes show up in the conversation as small timeline cards.
+- Goal changes that dsh does not already report in a `/goal` command's own output, plan mode switches and permission preset changes show up in the conversation as small timeline cards.
 
 ## Versioning
 

package/README.zh.md

@@ -33,7 +33,7 @@ paseo plugin update paseo-dsh-direct --yes     # 更新到最新
 - 已有的 dsh 会话可以导入 Paseo 接着用。
 - dsh 的斜杠命令（`/compact`、`/plan` 等）出现在 Paseo 的 `/` 菜单里。
 - Paseo 的用量表显示 dsh 的 token 用量和上下文占用。
-- 目标变化、计划模式切换和权限预设变化会在对话里显示为小的时间线卡片。
+- 目标变化（dsh 自己在 `/goal` 命令输出里已报告的除外）、计划模式切换和权限预设变化会在对话里显示为小的时间线卡片。
 
 ## 版本号
 

package/client/settings-screen.tsx

@@ -5,9 +5,9 @@ import { useRef } from "react";
 import { DSH_SETTINGS } from "../shared/settings.js";
 
 const EXECUTABLE_HINT =
-  "Path or command of dsh. PASEO_DSH_EXECUTABLE overrides this; leave it empty to use the Paseo provider command or dsh on PATH. Changes apply to new sessions.";
+  "Path or command of dsh. PASEO_DSH_EXECUTABLE overrides this; leave it empty to use the Paseo provider command or dsh on PATH.";
 const PROFILE_HINT =
-  'Name of the dsh profile to launch. PASEO_DSH_PROFILE overrides this; leave it empty to use the "paseo" profile. Changes apply to new sessions.';
+  'Name of the dsh profile to launch. PASEO_DSH_PROFILE overrides this; leave it empty to use the "paseo" profile.';
 
 /** Edits the dsh executable and profile that the server reads when it launches a bridge. */
 export default function DshSettingsScreen() {
@@ -88,8 +88,8 @@ export default function DshSettingsScreen() {
           disabled={settings.saving}
         />
         <SettingsAction
-          label="Save"
-          hint={settings.saveError ?? undefined}
+          label="Apply settings"
+          hint={settings.saveError ?? "Changes apply to new sessions."}
           error={settings.saveError}
           actionLabel={settings.saving ? "Saving" : "Save"}
           onPress={save}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-dsh-direct",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "DeepSeek Harness Direct Provider Plugin for Paseo",
   "repository": {
     "type": "git",

package/server/timeline.ts

@@ -35,6 +35,8 @@ export class TimelineProjector {
   private planActive = false;
   private lastPreset: string | undefined;
   private readonly goals = new Map<string, { objective?: string; maxRounds?: number }>();
+  /** Ids of `/goal` commands between their `command/run` and `command/done`; dsh prints their result itself. */
+  private readonly goalCommands = new Set<string>();
 
   /**
    * @param paseoSessionId Paseo session id stamped on every projected event.
@@ -59,6 +61,8 @@ export class TimelineProjector {
     options: { clientMessageId?: string } = {},
   ): SessionEvent[] {
     const timestamp = toTimestamp(event.time);
+    // A `/goal` command whose `command/done` never arrived is over once any of these later events appears.
+    if (["command/run", "user/message", "turn/start", "turn/end"].includes(event.type)) this.goalCommands.clear();
     switch (event.type) {
       case "user/message":
         return [
@@ -149,6 +153,7 @@ export class TimelineProjector {
     const commandId = stringValue(data.commandId);
     const name = stringValue(data.name);
     if (!commandId || !name) return [];
+    if (name === "goal") this.goalCommands.add(commandId);
     const id = `command:${commandId}`;
     // `args` keeps DSH's raw separator whitespace after the command name.
     const text = `/${name}${stringValue(data.args) ?? ""}`;
@@ -165,6 +170,7 @@ export class TimelineProjector {
     const data = event.data;
     const commandId = stringValue(data.commandId);
     const message = stringValue(data.text);
+    if (commandId) this.goalCommands.delete(commandId);
     if (!commandId || !message) return [];
     return [
       this.notice(`command-done:${commandId}`, data.kind === "error" ? "error" : "info", message, timestamp),
@@ -258,7 +264,8 @@ export class TimelineProjector {
       }
     } else if (event.type === "goal/change") {
       const card = this.goalChangeCard(data);
-      if (card) cards.push({ id: `goal:${event.seq}`, kind: CARD_KINDS.goal, data: { ...card } });
+      // A change made while a `/goal` command runs is already reported by that command's own output.
+      if (card && this.goalCommands.size === 0) cards.push({ id: `goal:${event.seq}`, kind: CARD_KINDS.goal, data: { ...card } });
     } else if (event.type === "user/message") {
       const source = objectValue(data.source);
       const round = numberValue(source?.round);