@bastani/atomic 0.9.19-alpha.5 → 0.9.19-alpha.7

package/examples/extensions/ssh.ts

@@ -14,10 +14,12 @@
  */
 
 import { spawn } from "node:child_process";
+import { dirname } from "node:path";
 import type { ExtensionAPI } from "@bastani/atomic";
 import {
 	type BashOperations,
 	createBashTool,
+	createCodingTools,
 	createEditTool,
 	createReadTool,
 	createWriteTool,
@@ -64,11 +66,48 @@ function createRemoteReadOps(remote: string, remoteCwd: string, localCwd: string
 function createRemoteWriteOps(remote: string, remoteCwd: string, localCwd: string): WriteOperations {
 	const toRemote = (p: string) => p.replace(localCwd, remoteCwd);
 	return {
-		writeFile: async (p, content) => {
+		writeFile: async (p, content, options) => {
 			const b64 = Buffer.from(content).toString("base64");
-			await sshExec(remote, `echo ${JSON.stringify(b64)} | base64 -d > ${JSON.stringify(toRemote(p))}`);
+			const target = JSON.stringify(toRemote(p));
+			// `set -C` is the shell's noclobber, so `>` on an existing path fails instead of
+			// truncating it. That is the remote equivalent of `O_EXCL`, and it is what keeps the
+			// create path from silently taking a file that appeared since the read below.
+			const redirect = options?.exclusive ? `set -C; base64 -d > ${target}` : `base64 -d > ${target}`;
+			try {
+				await sshExec(remote, `echo ${JSON.stringify(b64)} | { ${redirect}; }`);
+			} catch (error) {
+				// A remote shell reports noclobber as a bare non-zero exit, carrying no `code` to read.
+				// `write` renders an exclusive-create failure as a `target_exists` conflict only when the
+				// rejection carries `EEXIST`, so the collision has to be named here; otherwise this backend
+				// alone surfaces an opaque SSH error where every other one reports a typed conflict.
+				if (!options?.exclusive) throw error;
+				// Re-probe rather than assume the failure was a collision. A permission error, a full disk,
+				// or a dropped connection fail the same write, and each of those stays itself.
+				const probe = await sshExec(
+					remote,
+					`{ test -e ${target} || test -L ${target}; } && echo yes || echo no`,
+				).catch(() => undefined);
+				if (probe?.toString().trim() !== "yes") throw error;
+				throw Object.assign(new Error(`EEXIST: file already exists, open '${toRemote(p)}'`), { code: "EEXIST" });
+			}
 		},
 		mkdir: (dir) => sshExec(remote, `mkdir -p ${JSON.stringify(toRemote(dir))}`).then(() => {}),
+		// Reads the same filesystem the write lands on, which is the point: checking the local
+		// disk would let `write` decide what to do about a remote file by looking at a different
+		// machine. A missing path is `undefined`; anything else, including an unreadable one,
+		// stays a failure.
+		readFile: async (p) => {
+			const target = JSON.stringify(toRemote(p));
+			// `write` has already created the parent, so failure to enter it must remain
+			// an error. A subshell preserves the cwd used to resolve relative targets.
+			const parent = JSON.stringify(toRemote(dirname(p)));
+			const probe = await sshExec(
+				remote,
+				`(cd ${parent}) && { { test -e ${target} || test -L ${target}; } && echo yes || echo no; }`,
+			);
+			if (probe.toString().trim() === "no") return undefined;
+			return (await sshExec(remote, `cat ${target}`)).toString("utf8");
+		},
 	};
 }
 
@@ -122,66 +161,42 @@ export default function (pi: ExtensionAPI) {
 
 	// Resolved lazily on session_start (CLI flags not available during factory)
 	let resolvedSsh: { remote: string; remoteCwd: string } | null = null;
+	// The bundle shares one snapshot store across read/edit/write until the next session.
+	let tools = createCodingTools(localCwd);
 
 	const getSsh = () => resolvedSsh;
 
 	pi.registerTool({
 		...localRead,
 		async execute(id, params, signal, onUpdate, _ctx) {
-			const ssh = getSsh();
-			if (ssh) {
-				const tool = createReadTool(localCwd, {
-					operations: createRemoteReadOps(ssh.remote, ssh.remoteCwd, localCwd),
-				});
-				return tool.execute(id, params, signal, onUpdate);
-			}
-			return localRead.execute(id, params, signal, onUpdate);
+			return tools.find((tool) => tool.name === "read")!.execute(id, params, signal, onUpdate);
 		},
 	});
 
 	pi.registerTool({
 		...localWrite,
 		async execute(id, params, signal, onUpdate, _ctx) {
-			const ssh = getSsh();
-			if (ssh) {
-				const tool = createWriteTool(localCwd, {
-					operations: createRemoteWriteOps(ssh.remote, ssh.remoteCwd, localCwd),
-				});
-				return tool.execute(id, params, signal, onUpdate);
-			}
-			return localWrite.execute(id, params, signal, onUpdate);
+			return tools.find((tool) => tool.name === "write")!.execute(id, params, signal, onUpdate);
 		},
 	});
 
 	pi.registerTool({
 		...localEdit,
 		async execute(id, params, signal, onUpdate, _ctx) {
-			const ssh = getSsh();
-			if (ssh) {
-				const tool = createEditTool(localCwd, {
-					operations: createRemoteEditOps(ssh.remote, ssh.remoteCwd, localCwd),
-				});
-				return tool.execute(id, params, signal, onUpdate);
-			}
-			return localEdit.execute(id, params, signal, onUpdate);
+			return tools.find((tool) => tool.name === "edit")!.execute(id, params, signal, onUpdate);
 		},
 	});
 
 	pi.registerTool({
 		...localBash,
 		async execute(id, params, signal, onUpdate, _ctx) {
-			const ssh = getSsh();
-			if (ssh) {
-				const tool = createBashTool(localCwd, {
-					operations: createRemoteBashOps(ssh.remote, ssh.remoteCwd, localCwd),
-				});
-				return tool.execute(id, params, signal, onUpdate);
-			}
-			return localBash.execute(id, params, signal, onUpdate);
+			return tools.find((tool) => tool.name === "bash")!.execute(id, params, signal, onUpdate);
 		},
 	});
 
 	pi.on("session_start", async (_event, ctx) => {
+		tools = createCodingTools(localCwd);
+		resolvedSsh = null;
 		// Resolve SSH config now that CLI flags are available
 		const arg = pi.getFlag("ssh") as string | undefined;
 		if (arg) {
@@ -194,6 +209,13 @@ export default function (pi: ExtensionAPI) {
 				const pwd = (await sshExec(remote, "pwd")).toString().trim();
 				resolvedSsh = { remote, remoteCwd: pwd };
 			}
+			const { remote, remoteCwd } = resolvedSsh;
+			tools = createCodingTools(localCwd, {
+				read: { operations: createRemoteReadOps(remote, remoteCwd, localCwd) },
+				write: { operations: createRemoteWriteOps(remote, remoteCwd, localCwd) },
+				edit: { operations: createRemoteEditOps(remote, remoteCwd, localCwd) },
+				bash: { operations: createRemoteBashOps(remote, remoteCwd, localCwd) },
+			});
 			ctx.ui.setStatus("ssh", ctx.ui.theme.fg("accent", `SSH: ${resolvedSsh.remote}:${resolvedSsh.remoteCwd}`));
 			ctx.ui.notify(`SSH mode: ${resolvedSsh.remote}:${resolvedSsh.remoteCwd}`, "info");
 		}

package/npm-shrinkwrap.json

@@ -1,23 +1,23 @@
 {
 	"name": "@bastani/atomic",
-	"version": "0.9.19-alpha.5",
+	"version": "0.9.19-alpha.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@bastani/atomic",
-			"version": "0.9.19-alpha.5",
+			"version": "0.9.19-alpha.7",
 			"license": "MIT",
 			"dependencies": {
-				"@bastani/atomic-natives": "0.9.19-alpha.5",
-				"@bastani/pi-ai": "0.9.19-alpha.5",
+				"@bastani/atomic-natives": "0.9.19-alpha.7",
+				"@bastani/pi-ai": "0.9.19-alpha.7",
 				"@dbos-inc/dbos-sdk": "4.25.14",
 				"@earendil-works/pi-agent-core": "0.85.1",
 				"@earendil-works/pi-client": "0.85.1",
 				"@earendil-works/pi-protocol": "0.85.1",
 				"@earendil-works/pi-tui": "0.85.1",
 				"@modelcontextprotocol/ext-apps": "^1.7.5",
-				"@modelcontextprotocol/sdk": "^1.30.0",
+				"@modelcontextprotocol/sdk": "1.30.0",
 				"@mozilla/readability": "^0.6.0",
 				"@silvia-odwyer/photon-node": "0.3.4",
 				"chalk": "6.0.0",
@@ -518,18 +518,18 @@
 			}
 		},
 		"node_modules/@bastani/atomic-natives": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives/-/atomic-natives-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives/-/atomic-natives-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"optionalDependencies": {
-				"@bastani/atomic-natives-darwin-arm64": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-darwin-x64": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-linux-arm64-gnu": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-linux-arm64-musl": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-linux-x64-gnu": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-linux-x64-musl": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-win32-arm64-msvc": "0.9.19-alpha.5",
-				"@bastani/atomic-natives-win32-x64-msvc": "0.9.19-alpha.5"
+				"@bastani/atomic-natives-darwin-arm64": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-darwin-x64": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-linux-arm64-gnu": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-linux-arm64-musl": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-linux-x64-gnu": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-linux-x64-musl": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-win32-arm64-msvc": "0.9.19-alpha.7",
+				"@bastani/atomic-natives-win32-x64-msvc": "0.9.19-alpha.7"
 			},
 			"engines": {
 				"bun": ">=1.4.2",
@@ -537,8 +537,8 @@
 			}
 		},
 		"node_modules/@bastani/atomic-natives-darwin-arm64": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-arm64/-/atomic-natives-darwin-arm64-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-arm64/-/atomic-natives-darwin-arm64-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"darwin"
@@ -549,8 +549,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-darwin-x64": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-x64/-/atomic-natives-darwin-x64-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-darwin-x64/-/atomic-natives-darwin-x64-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"darwin"
@@ -561,8 +561,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-arm64-gnu": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-gnu/-/atomic-natives-linux-arm64-gnu-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-gnu/-/atomic-natives-linux-arm64-gnu-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -576,8 +576,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-arm64-musl": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-musl/-/atomic-natives-linux-arm64-musl-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-arm64-musl/-/atomic-natives-linux-arm64-musl-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -591,8 +591,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-x64-gnu": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-gnu/-/atomic-natives-linux-x64-gnu-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-gnu/-/atomic-natives-linux-x64-gnu-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -606,8 +606,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-linux-x64-musl": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-musl/-/atomic-natives-linux-x64-musl-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-linux-x64-musl/-/atomic-natives-linux-x64-musl-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"linux"
@@ -621,8 +621,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-win32-arm64-msvc": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-arm64-msvc/-/atomic-natives-win32-arm64-msvc-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-arm64-msvc/-/atomic-natives-win32-arm64-msvc-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"win32"
@@ -633,8 +633,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/atomic-natives-win32-x64-msvc": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-x64-msvc/-/atomic-natives-win32-x64-msvc-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/atomic-natives-win32-x64-msvc/-/atomic-natives-win32-x64-msvc-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"os": [
 				"win32"
@@ -645,8 +645,8 @@
 			"optional": true
 		},
 		"node_modules/@bastani/pi-ai": {
-			"version": "0.9.19-alpha.5",
-			"resolved": "https://registry.npmjs.org/@bastani/pi-ai/-/pi-ai-0.9.19-alpha.5.tgz",
+			"version": "0.9.19-alpha.7",
+			"resolved": "https://registry.npmjs.org/@bastani/pi-ai/-/pi-ai-0.9.19-alpha.7.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"@anthropic-ai/sdk": "0.124.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/atomic",
-  "version": "0.9.19-alpha.5",
+  "version": "0.9.19-alpha.7",
   "description": "Atomic coding agent CLI with read, bash, edit, write tools and session management",
   "type": "module",
   "atomicConfig": {
@@ -79,15 +79,15 @@
     "prepublishOnly": "bun run clean && bun run build && bun run shrinkwrap"
   },
   "dependencies": {
-    "@bastani/atomic-natives": "0.9.19-alpha.5",
-    "@bastani/pi-ai": "0.9.19-alpha.5",
+    "@bastani/atomic-natives": "0.9.19-alpha.7",
+    "@bastani/pi-ai": "0.9.19-alpha.7",
     "@dbos-inc/dbos-sdk": "4.25.14",
     "@earendil-works/pi-agent-core": "0.85.1",
     "@earendil-works/pi-client": "0.85.1",
     "@earendil-works/pi-protocol": "0.85.1",
     "@earendil-works/pi-tui": "0.85.1",
     "@modelcontextprotocol/ext-apps": "^1.7.5",
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/sdk": "1.30.0",
     "@mozilla/readability": "^0.6.0",
     "@silvia-odwyer/photon-node": "0.3.4",
     "chalk": "6.0.0",