@deepseek-ai/dsh-tool-bash-persistent 0.1.0-rc.3 → 0.1.0-rc.7

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write packages/shell/tool-bash-persistent/README.md
-README.md: 37c259443cba566350d8ec7963857d5f6ce7396c
-README.zh.md: 8f3cf4e4d20aad1537b48644cee1a9d5706f4b3c
+README.md: 606920d087b42344f34b70103e167b0046d3cfd5
+README.zh.md: dd88db87cb617fb2f4d35ada9550d0142e32e979

package/README.md

@@ -33,7 +33,7 @@ Prefix-stable while the configured description and schema remain unchanged.
 
 #### What the model sees
 
-Commands share one shell per Agent, so cwd, exported variables, activated environments, functions, and background jobs persist across calls. Results exclude private completion markers and the shell prompt. A nonzero wrapped command appends `[exit code: N]`; a shell that exits before reporting that status instead appends `[shell exited: code N]`, `[shell killed by signal: SIG]`, or `[shell exited]` when the backend supplies neither, then resets and tells the model that the next call starts fresh. Long output keeps the earliest retained prefix plus a clipping notice. If the PTY has already dropped that prefix, the result says so explicitly instead of presenting a tail as complete output. Timeout returns bounded partial output, closes the uncertain shell, and reports the reset.
+Commands share one shell per Agent, so cwd, exported variables, activated environments, functions, and background jobs persist across calls. Results exclude private completion markers. When the shell reads stdin again without having printed the completion marker — after `exec`, an interrupt, or an interactive foreground child whose stdin wait the provider proves — the call returns the captured partial output, which can end with the backend's own prompt text. A nonzero wrapped command appends `[exit code: N]`; a shell that exits before reporting that status instead appends `[shell exited: code N]`, `[shell killed by signal: SIG]`, or `[shell exited]` when the backend supplies neither, then resets and tells the model that the next call starts fresh. Long output keeps the earliest retained prefix plus a clipping notice. If the PTY has already dropped that prefix, the result says so explicitly instead of presenting a tail as complete output. Timeout returns bounded partial output, closes the uncertain shell, and reports the reset.
 
 #### Token effect
 
@@ -46,5 +46,6 @@ Append-only tool results follow the reusable request prefix.
 ## Known Limitations and Deferred Work
 
 - The tool requires an owning Agent and a real PTY backend.
+- An interactive foreground child (for example a REPL) returns early with partial output only where the subprocess provider proves its stdin wait; elsewhere the call runs to `timeoutMs`.
 - Explicit `exit` and timeout discard shell state. Cancellation also resets and discards the result, even when a complete status marker is already observable; the next call starts a fresh shell.
 - Environment facts such as network access and package mirrors belong in the configured `description`, not this package's default.

package/README.zh.md

@@ -33,7 +33,7 @@
 
 #### 模型所见
 
-每个 Agent 的命令共享一个 shell，因此 cwd、导出的环境变量、已激活环境、函数和后台任务会跨调用保留。结果不包含私有完成标记和 shell 提示符。经封装的命令以非零状态结束时，结果会追加 `[exit code: N]`；若 shell 在报告该状态前退出，则改为追加 `[shell exited: code N]`、`[shell killed by signal: SIG]`，或在后端既未提供退出码也未提供信号时追加 `[shell exited]`；随后重置 shell，并告知模型下次调用从新 shell 开始。长输出保留仍可读取的最早前缀并追加截断提示；若 PTY 已丢弃真正的开头，结果会明确说明，而不是把尾部伪装成完整输出。超时返回有界的部分输出、关闭状态不确定的 shell，并报告该重置。
+每个 Agent 的命令共享一个 shell，因此 cwd、导出的环境变量、已激活环境、函数和后台任务会跨调用保留。结果不包含私有完成标记。当 shell 在未打印完成标记的情况下再次读取 stdin 时——例如 `exec`、中断，或提供方能证明其 stdin 等待的交互式前台子进程——调用返回已捕获的部分输出，其末尾可能带有后端自己的提示符文本。经封装的命令以非零状态结束时，结果会追加 `[exit code: N]`；若 shell 在报告该状态前退出，则改为追加 `[shell exited: code N]`、`[shell killed by signal: SIG]`，或在后端既未提供退出码也未提供信号时追加 `[shell exited]`；随后重置 shell，并告知模型下次调用从新 shell 开始。长输出保留仍可读取的最早前缀并追加截断提示；若 PTY 已丢弃真正的开头，结果会明确说明，而不是把尾部伪装成完整输出。超时返回有界的部分输出、关闭状态不确定的 shell，并报告该重置。
 
 #### Token 影响
 
@@ -46,5 +46,6 @@
 ## 已知限制与延后工作
 
 - 工具需要拥有它的 Agent 和真实 PTY 后端。
+- 交互式前台子进程（例如 REPL）只有在进程管理提供方能证明其 stdin 等待时才会提前返回部分输出；否则调用会一直运行到 `timeoutMs`。
 - 显式 `exit` 与超时会丢弃 shell 状态。取消同样会重置 shell 并丢弃结果，即使已经能观察到完整状态标记也是如此；下次调用创建新 shell。
 - 网络访问、软件包镜像等环境事实应写入配置的 `description`，而非包默认描述。

package/lib/index.js

@@ -68,7 +68,6 @@ var __disposeResources = (function(SuppressedError) {
 const TRUNCATED_MESSAGE = "<response clipped><NOTE>To save on context only part of this file has been shown to you. You should retry this tool after you have searched inside the file with `grep -n` in order to find the line numbers of what you are looking for.</NOTE>";
 const LOST_PREFIX_MESSAGE = "<response clipped><NOTE>The beginning of this command output was dropped by the terminal scrollback limit. The following text is the earliest retained output.</NOTE>\n";
 const SHELL_RESET_MESSAGE = "The persistent bash shell was reset; the next bash call starts from the workspace with a fresh current directory and environment.";
-const SHELL_PROMPT = "__DSH_PERSISTENT_BASH_PROMPT__ ";
 const TIMEOUT_CODE = "PERSISTENT_BASH_TIMEOUT";
 const SCROLLBACK_PAGE_LINES = 1e3;
 const POLL_INTERVAL_MS = 25;
@@ -90,10 +89,8 @@ function quoteForBash(value) {
 function wrapCommand(command, marker) {
 	return `printf '%s\\n' ${quoteForBash(marker.start)}; eval -- ${quoteForBash(command)}; __dsh_persistent_bash_status=$?; printf '%s%s\\n' ${quoteForBash(marker.end)} "$__dsh_persistent_bash_status"`;
 }
-function stripPrompt(text) {
-	let result = text.replace(/\r?\n$/, "");
-	while (result.endsWith(SHELL_PROMPT)) result = result.slice(0, -31);
-	return result.endsWith("\n") ? result.slice(0, -1) : result;
+function trimTrailingNewline(text) {
+	return text.replace(/\r?\n$/, "");
 }
 function commandOutput(snapshot, marker) {
 	const text = snapshot.text;
@@ -103,25 +100,22 @@ function commandOutput(snapshot, marker) {
 	const startMarker = text.lastIndexOf(marker.start, end);
 	const start = startMarker < 0 ? 0 : startMarker + marker.start.length;
 	return {
-		text: stripPrompt(text.slice(start, end).replace(/^\r?\n/, "")),
+		text: trimTrailingNewline(text.slice(start, end).replace(/^\r?\n/, "")),
 		incomplete: startMarker < 0,
 		exitCode: Number(status)
 	};
 }
-function promptCompleted(result) {
-	return result.viewport.endsWith(SHELL_PROMPT) || result.viewport.endsWith(`${SHELL_PROMPT}\r\n`) || result.viewport.endsWith(`${SHELL_PROMPT}\n`);
-}
 function partialOutput(snapshot, marker, fallback, fallbackTruncated = false) {
 	const startMarker = snapshot.text.lastIndexOf(marker.start);
 	if (startMarker >= 0) return {
-		text: stripPrompt(snapshot.text.slice(startMarker + marker.start.length).replace(/^\r?\n/, "")),
+		text: trimTrailingNewline(snapshot.text.slice(startMarker + marker.start.length).replace(/^\r?\n/, "")),
 		incomplete: false
 	};
 	const fallbackStart = fallback.lastIndexOf(marker.start);
 	const afterStart = fallbackStart < 0 ? fallback : fallback.slice(fallbackStart + marker.start.length).replace(/^\r?\n/, "");
 	const fallbackEnd = afterStart.lastIndexOf(marker.end);
 	return {
-		text: stripPrompt((fallbackEnd < 0 ? afterStart : afterStart.slice(0, fallbackEnd)).replaceAll(SHELL_PROMPT, "")),
+		text: trimTrailingNewline(fallbackEnd < 0 ? afterStart : afterStart.slice(0, fallbackEnd)),
 		incomplete: fallbackTruncated || fallbackStart < 0
 	};
 }
@@ -212,7 +206,7 @@ function persistentShells(ctx, config) {
 					}, "tool-bash-persistent owner cache cleanup");
 				}
 				const result = await ctx.terminals.startSend(owner, spawned.sessionId, {
-					text: `stty -echo; PS1=${quoteForBash(SHELL_PROMPT)}`,
+					text: "stty -echo",
 					submit: true,
 					signal: combinedSignal
 				}).done;
@@ -293,7 +287,7 @@ async function executeCommand(ctx, shells, owner, command, config, upstream) {
 				await shells.reset(owner, "persistent bash shell exited");
 				return [renderShellExitStatus(renderCaptured(partialOutput(snapshot, marker, fallback, fallbackTruncated), config.maxOutputChars), result.sessionStatus.exitCode, result.sessionStatus.signal), SHELL_RESET_MESSAGE].filter((part) => part.length > 0).join("\n");
 			}
-			if (promptCompleted(result)) return renderCaptured(partialOutput(retainedScrollback(ctx, owner, id, latest), marker, fallback, fallbackTruncated), config.maxOutputChars);
+			if (result.waitReason === "stdin_read") return renderCaptured(partialOutput(retainedScrollback(ctx, owner, id, latest), marker, fallback, fallbackTruncated), config.maxOutputChars);
 			await pause();
 		}
 	} catch (e_1) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@deepseek-ai/dsh-tool-bash-persistent",
   "description": "Model-facing owner-scoped persistent Bash tool backed by the Harness PTY service",
-  "version": "0.1.0-rc.3",
+  "version": "0.1.0-rc.7",
   "publishConfig": {
-    "access": "restricted"
+    "access": "public"
   },
   "repository": {
     "type": "git",
@@ -31,11 +31,11 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-terminal": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.3",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-terminal": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.7",
     "@deepseek-ai/cordis": "^4.0.1"
   },
   "dependencies": {
@@ -44,18 +44,18 @@
   "devDependencies": {
     "@deepseek-ai/cordis-plugin-include": "^1.0.6",
     "@deepseek-ai/cordis-plugin-loader": "^1.0.2",
-    "@deepseek-ai/dsh-agent": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-terminal": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-terminal-bash": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-sandbox": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-subprocess-local": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-sandbox-policy": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.3",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.3",
+    "@deepseek-ai/dsh-agent": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-invariants": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-terminal": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-terminal-bash": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-sandbox-policy": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-session": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-subprocess-local": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.7",
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-timeout": "^0.1.0-rc.3"
+    "@deepseek-ai/dsh-sandbox": "^0.1.0-rc.7"
   }
 }