@caupulican/pi-adaptative 0.84.1 → 0.85.3

package/examples/extensions/ssh.ts

@@ -10,10 +10,11 @@
  *
  * Requirements:
  *   - SSH key-based auth (no password prompts)
- *   - bash on remote
+ *   - bash and GNU coreutils (sha256sum, stat) on remote
  */
 
 import { spawn } from "node:child_process";
+import { constants } from "node:fs";
 import type { ExtensionAPI } from "@caupulican/pi-adaptative";
 import {
 	type BashOperations,
@@ -22,13 +23,20 @@ import {
 	createReadTool,
 	createWriteTool,
 	type EditOperations,
+	FileMutationIntentController,
+	type FileMutationIntentOperations,
+	type FilePathInspection,
 	type ReadOperations,
 	type WriteOperations,
 } from "@caupulican/pi-adaptative";
 
-function sshExec(remote: string, command: string): Promise<Buffer> {
+function shellQuote(value: string): string {
+	return `'${value.replaceAll("'", `'"'"'`)}'`;
+}
+
+function sshExec(remote: string, command: string, stdin?: string | Buffer): Promise<Buffer> {
 	return new Promise((resolve, reject) => {
-		const child = spawn("ssh", [remote, command], { stdio: ["ignore", "pipe", "pipe"] });
+		const child = spawn("ssh", [remote, command], { stdio: ["pipe", "pipe", "pipe"] });
 		const chunks: Buffer[] = [];
 		const errChunks: Buffer[] = [];
 		child.stdout.on("data", (data) => chunks.push(data));
@@ -41,17 +49,18 @@ function sshExec(remote: string, command: string): Promise<Buffer> {
 				resolve(Buffer.concat(chunks));
 			}
 		});
+		child.stdin.end(stdin);
 	});
 }
 
 function createRemoteReadOps(remote: string, remoteCwd: string, localCwd: string): ReadOperations {
 	const toRemote = (p: string) => p.replace(localCwd, remoteCwd);
 	return {
-		readFile: (p) => sshExec(remote, `cat ${JSON.stringify(toRemote(p))}`),
-		access: (p) => sshExec(remote, `test -r ${JSON.stringify(toRemote(p))}`).then(() => {}),
+		readFile: (p) => sshExec(remote, `cat -- ${shellQuote(toRemote(p))}`),
+		access: (p) => sshExec(remote, `test -r ${shellQuote(toRemote(p))}`).then(() => {}),
 		detectImageMimeType: async (p) => {
 			try {
-				const r = await sshExec(remote, `file --mime-type -b ${JSON.stringify(toRemote(p))}`);
+				const r = await sshExec(remote, `file --mime-type -b -- ${shellQuote(toRemote(p))}`);
 				const m = r.toString().trim();
 				return ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(m) ? m : null;
 			} catch {
@@ -61,21 +70,86 @@ function createRemoteReadOps(remote: string, remoteCwd: string, localCwd: string
 	};
 }
 
+async function writeRemoteContent(remote: string, path: string, content: string, exclusive: boolean): Promise<void> {
+	const noClobber = exclusive ? "set -o noclobber; " : "";
+	await sshExec(remote, `${noClobber}cat > ${shellQuote(path)}`, content);
+}
+
 function createRemoteWriteOps(remote: string, remoteCwd: string, localCwd: string): WriteOperations {
 	const toRemote = (p: string) => p.replace(localCwd, remoteCwd);
 	return {
-		writeFile: async (p, content) => {
-			const b64 = Buffer.from(content).toString("base64");
-			await sshExec(remote, `echo ${JSON.stringify(b64)} | base64 -d > ${JSON.stringify(toRemote(p))}`);
-		},
-		mkdir: (dir) => sshExec(remote, `mkdir -p ${JSON.stringify(toRemote(dir))}`).then(() => {}),
+		createFile: (p, content) => writeRemoteContent(remote, toRemote(p), content, true),
+		mkdir: (dir) => sshExec(remote, `mkdir -p -- ${shellQuote(toRemote(dir))}`).then(() => {}),
 	};
 }
 
 function createRemoteEditOps(remote: string, remoteCwd: string, localCwd: string): EditOperations {
 	const r = createRemoteReadOps(remote, remoteCwd, localCwd);
-	const w = createRemoteWriteOps(remote, remoteCwd, localCwd);
-	return { readFile: r.readFile, access: r.access, writeFile: w.writeFile };
+	const toRemote = (p: string) => p.replace(localCwd, remoteCwd);
+	return {
+		readFile: r.readFile,
+		writeFile: (p, content) => writeRemoteContent(remote, toRemote(p), content, false),
+	};
+}
+
+function createRemoteIntentOps(remote: string, remoteCwd: string, localCwd: string): FileMutationIntentOperations {
+	const toRemote = (p: string) => p.replace(localCwd, remoteCwd);
+	return {
+		async inspect(p, followSymlinks): Promise<FilePathInspection | undefined> {
+			const path = shellQuote(toRemote(p));
+			const kind = followSymlinks
+				? `if [ -f ${path} ]; then printf 'file\\t'; elif [ -d ${path} ]; then printf 'directory\\t'; elif [ -e ${path} ]; then printf 'other\\t'; else exit 44; fi`
+				: `if [ -L ${path} ]; then printf 'other\\t'; elif [ -f ${path} ]; then printf 'file\\t'; elif [ -d ${path} ]; then printf 'directory\\t'; elif [ -e ${path} ]; then printf 'other\\t'; else exit 44; fi`;
+			const follow = followSymlinks ? "-L " : "";
+			try {
+				const output = (
+					await sshExec(
+						remote,
+						`${kind}; stat ${follow}--printf ${shellQuote("%d\\t%i\\t%f\\t%s\\t%y\\t%z")} -- ${path}`,
+					)
+				)
+					.toString("utf8")
+					.trimEnd();
+				const [entryKind, dev, ino, mode, size, mtimeMs, ctimeMs] = output.split("\t");
+				if (
+					(entryKind !== "file" && entryKind !== "directory" && entryKind !== "other") ||
+					!dev ||
+					!ino ||
+					!mode ||
+					!size ||
+					!mtimeMs ||
+					!ctimeMs
+				) {
+					throw new Error(`Unexpected remote stat response for ${p}`);
+				}
+				return { kind: entryKind, identity: { dev, ino, mode, size, mtimeMs, ctimeMs } };
+			} catch (error) {
+				if (String(error).includes("SSH failed (44)")) return undefined;
+				throw error;
+			}
+		},
+		access(p, mode) {
+			const path = shellQuote(toRemote(p));
+			const checks = [
+				mode & constants.R_OK ? `test -r ${path}` : undefined,
+				mode & constants.W_OK ? `test -w ${path}` : undefined,
+			].filter((check): check is string => check !== undefined);
+			return sshExec(remote, checks.length > 0 ? checks.join(" && ") : `test -e ${path}`).then(() => {});
+		},
+		copyFileExclusive(sourcePath, targetPath) {
+			return sshExec(
+				remote,
+				`set -o noclobber; cat -- ${shellQuote(toRemote(sourcePath))} > ${shellQuote(toRemote(targetPath))}`,
+			).then(() => {});
+		},
+		async hashFile(p) {
+			const output = await sshExec(remote, `sha256sum -- ${shellQuote(toRemote(p))}`);
+			const digest = output.toString("utf8").trim().split(/\s+/, 1)[0];
+			if (!digest || !/^[0-9a-f]{64}$/i.test(digest)) throw new Error(`Invalid remote sha256 for ${p}`);
+			return digest.toLowerCase();
+		},
+		removeFile: (p) => sshExec(remote, `rm -- ${shellQuote(toRemote(p))}`).then(() => {}),
+	};
 }
 
 function createRemoteBashOps(remote: string, remoteCwd: string, localCwd: string): BashOperations {
@@ -83,7 +157,7 @@ function createRemoteBashOps(remote: string, remoteCwd: string, localCwd: string
 	return {
 		exec: (command, cwd, { onData, signal, timeout }) =>
 			new Promise((resolve, reject) => {
-				const cmd = `cd ${JSON.stringify(toRemote(cwd))} && ${command}`;
+				const cmd = `cd ${shellQuote(toRemote(cwd))} && ${command}`;
 				const child = spawn("ssh", [remote, cmd], { stdio: ["ignore", "pipe", "pipe"] });
 				let timedOut = false;
 				const timer = timeout
@@ -115,15 +189,35 @@ export default function (pi: ExtensionAPI) {
 	pi.registerFlag("ssh", { description: "SSH remote: user@host or user@host:/path", type: "string" });
 
 	const localCwd = process.cwd();
+	const localFileMutationIntents = new FileMutationIntentController();
 	const localRead = createReadTool(localCwd);
-	const localWrite = createWriteTool(localCwd);
-	const localEdit = createEditTool(localCwd);
+	const localWrite = createWriteTool(localCwd, { intentController: localFileMutationIntents });
+	const localEdit = createEditTool(localCwd, { intentController: localFileMutationIntents });
 	const localBash = createBashTool(localCwd);
 
 	// Resolved lazily on session_start (CLI flags not available during factory)
 	let resolvedSsh: { remote: string; remoteCwd: string } | null = null;
+	let remoteFileTools: { write: ReturnType<typeof createWriteTool>; edit: ReturnType<typeof createEditTool> } | null =
+		null;
 
 	const getSsh = () => resolvedSsh;
+	const getRemoteFileTools = (ssh: { remote: string; remoteCwd: string }) => {
+		if (remoteFileTools) return remoteFileTools;
+		const intentController = new FileMutationIntentController({
+			operations: createRemoteIntentOps(ssh.remote, ssh.remoteCwd, localCwd),
+		});
+		remoteFileTools = {
+			write: createWriteTool(localCwd, {
+				operations: createRemoteWriteOps(ssh.remote, ssh.remoteCwd, localCwd),
+				intentController,
+			}),
+			edit: createEditTool(localCwd, {
+				operations: createRemoteEditOps(ssh.remote, ssh.remoteCwd, localCwd),
+				intentController,
+			}),
+		};
+		return remoteFileTools;
+	};
 
 	pi.registerTool({
 		...localRead,
@@ -144,10 +238,7 @@ export default function (pi: ExtensionAPI) {
 		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 getRemoteFileTools(ssh).write.execute(id, params, signal, onUpdate);
 			}
 			return localWrite.execute(id, params, signal, onUpdate);
 		},
@@ -158,10 +249,7 @@ export default function (pi: ExtensionAPI) {
 		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 getRemoteFileTools(ssh).edit.execute(id, params, signal, onUpdate);
 			}
 			return localEdit.execute(id, params, signal, onUpdate);
 		},
@@ -185,6 +273,7 @@ export default function (pi: ExtensionAPI) {
 		// Resolve SSH config now that CLI flags are available
 		const arg = pi.getFlag("ssh") as string | undefined;
 		if (arg) {
+			remoteFileTools = null;
 			if (arg.includes(":")) {
 				const [remote, path] = arg.split(":");
 				resolvedSsh = { remote, remoteCwd: path };

package/examples/extensions/with-deps/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pi-extension-with-deps",
-  "version": "0.84.1",
+  "version": "0.85.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pi-extension-with-deps",
-      "version": "0.84.1",
+      "version": "0.85.3",
       "dependencies": {
         "ms": "^2.1.3"
       },

package/examples/extensions/with-deps/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-extension-with-deps",
   "private": true,
-  "version": "0.84.1",
+  "version": "0.85.3",
   "type": "module",
   "scripts": {
     "clean": "echo 'nothing to clean'",

package/npm-shrinkwrap.json

@@ -1,17 +1,17 @@
 {
 	"name": "@caupulican/pi-adaptative",
-	"version": "0.84.1",
+	"version": "0.85.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@caupulican/pi-adaptative",
-			"version": "0.84.1",
+			"version": "0.85.3",
 			"license": "MIT",
 			"dependencies": {
-				"@caupulican/pi-agent-core": "^0.84.1",
-				"@caupulican/pi-ai": "^0.84.1",
-				"@caupulican/pi-tui": "^0.84.1",
+				"@caupulican/pi-agent-core": "^0.85.3",
+				"@caupulican/pi-ai": "^0.85.3",
+				"@caupulican/pi-tui": "^0.85.3",
 				"@silvia-odwyer/photon-node": "0.3.4",
 				"chalk": "5.6.2",
 				"cross-spawn": "7.0.6",
@@ -20,6 +20,7 @@
 				"highlight.js": "10.7.3",
 				"hosted-git-info": "9.0.3",
 				"ignore": "7.0.5",
+				"jscpd": "5.0.14",
 				"jiti": "2.7.0",
 				"minimatch": "10.2.5",
 				"proper-lockfile": "4.1.2",
@@ -32,6 +33,7 @@
 				"@mariozechner/clipboard": "0.3.9"
 			},
 			"bin": {
+				"jscpd": "dist/jscpd-cli.js",
 				"pi": "dist/cli.js",
 				"pi-adaptative": "dist/cli.js"
 			},
@@ -475,11 +477,11 @@
 			}
 		},
 		"node_modules/@caupulican/pi-agent-core": {
-			"version": "0.84.1",
-			"resolved": "https://registry.npmjs.org/@caupulican/pi-agent-core/-/pi-agent-core-0.84.1.tgz",
+			"version": "0.85.3",
+			"resolved": "https://registry.npmjs.org/@caupulican/pi-agent-core/-/pi-agent-core-0.85.3.tgz",
 			"license": "MIT",
 			"dependencies": {
-				"@caupulican/pi-ai": "^0.84.1",
+				"@caupulican/pi-ai": "^0.85.3",
 				"ignore": "7.0.5",
 				"typebox": "1.1.38",
 				"yaml": "2.9.0"
@@ -489,8 +491,8 @@
 			}
 		},
 		"node_modules/@caupulican/pi-ai": {
-			"version": "0.84.1",
-			"resolved": "https://registry.npmjs.org/@caupulican/pi-ai/-/pi-ai-0.84.1.tgz",
+			"version": "0.85.3",
+			"resolved": "https://registry.npmjs.org/@caupulican/pi-ai/-/pi-ai-0.85.3.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"@anthropic-ai/sdk": "0.91.1",
@@ -542,8 +544,8 @@
 			}
 		},
 		"node_modules/@caupulican/pi-tui": {
-			"version": "0.84.1",
-			"resolved": "https://registry.npmjs.org/@caupulican/pi-tui/-/pi-tui-0.84.1.tgz",
+			"version": "0.85.3",
+			"resolved": "https://registry.npmjs.org/@caupulican/pi-tui/-/pi-tui-0.85.3.tgz",
 			"license": "MIT",
 			"dependencies": {
 				"get-east-asian-width": "1.6.0",
@@ -1683,6 +1685,104 @@
 				"jiti": "lib/jiti-cli.mjs"
 			}
 		},
+		"node_modules/jscpd": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd/-/jscpd-5.0.14.tgz",
+			"integrity": "sha512-zge+FPZZAymt2Do5Z0+QHyIn4/XcUhrO/W7of9HcHZfx2AK8++dYhLA1uWtwXj47ml3Of8PbcUW4wUWvYMCc3w==",
+			"license": "MIT",
+			"optionalDependencies": {
+				"jscpd-darwin-arm64": "5.0.14",
+				"jscpd-darwin-x64": "5.0.14",
+				"jscpd-linux-arm64-gnu": "5.0.14",
+				"jscpd-linux-x64-gnu": "5.0.14",
+				"jscpd-linux-x64-musl": "5.0.14",
+				"jscpd-windows-x64-msvc": "5.0.14"
+			},
+			"bin": {
+				"jscpd": "run-jscpd.js"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/jscpd-darwin-arm64": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-darwin-arm64/-/jscpd-darwin-arm64-5.0.14.tgz",
+			"integrity": "sha512-Ojjl79SBuj9tEW6WbjZ1a/1ZOR89dneH9yLQYQu8WyWaQownttnx7RYFEHU6aGhS4jIvwUEbr+1wxzFTb37cwg==",
+			"license": "MIT",
+			"os": [
+				"darwin"
+			],
+			"cpu": [
+				"arm64"
+			],
+			"optional": true
+		},
+		"node_modules/jscpd-darwin-x64": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-darwin-x64/-/jscpd-darwin-x64-5.0.14.tgz",
+			"integrity": "sha512-DxFg5XvjMZ81iVeqillnM5apqcGCfNTbroNF+mPLr7RkHLGH6mudLgtO+ILL/hfpZXy1bF9oIY5BSudPmN/k9A==",
+			"license": "MIT",
+			"os": [
+				"darwin"
+			],
+			"cpu": [
+				"x64"
+			],
+			"optional": true
+		},
+		"node_modules/jscpd-linux-arm64-gnu": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-linux-arm64-gnu/-/jscpd-linux-arm64-gnu-5.0.14.tgz",
+			"integrity": "sha512-1uw+XBHEt9pONXNICSp5HpaVWPjG6mQ6deDXaq9Yb0xCNJkX4/8gmn0vhzekIyZD2DspRYKPUolbDsqm/HEdYg==",
+			"license": "MIT",
+			"os": [
+				"linux"
+			],
+			"cpu": [
+				"arm64"
+			],
+			"optional": true
+		},
+		"node_modules/jscpd-linux-x64-gnu": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-linux-x64-gnu/-/jscpd-linux-x64-gnu-5.0.14.tgz",
+			"integrity": "sha512-dFTbyyrm+Z9pcXIVzJQCw8QAgiNqIiO69sm4AfA7/wFdPoizoVzjhaXsYXcSV4bs0aoPiWbNazg0J0HgslT/5A==",
+			"license": "MIT",
+			"os": [
+				"linux"
+			],
+			"cpu": [
+				"x64"
+			],
+			"optional": true
+		},
+		"node_modules/jscpd-linux-x64-musl": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-linux-x64-musl/-/jscpd-linux-x64-musl-5.0.14.tgz",
+			"integrity": "sha512-SayS7qQJvixyy9eR0+UjepkTsUUwqvlsiuSxfIdHgG2qzqoh/thnkgiu4By8fsiiDpQONsQrRrZDwHRQ3GDrBQ==",
+			"license": "MIT",
+			"os": [
+				"linux"
+			],
+			"cpu": [
+				"x64"
+			],
+			"optional": true
+		},
+		"node_modules/jscpd-windows-x64-msvc": {
+			"version": "5.0.14",
+			"resolved": "https://registry.npmjs.org/jscpd-windows-x64-msvc/-/jscpd-windows-x64-msvc-5.0.14.tgz",
+			"integrity": "sha512-DqjxlVkUanlahGgY2lY7Zkrau4BUTI+AwWky+bPGK4kSK2AIOaUziY9Q19u8b58idXmJA9FKK98Fuu4ajNXVjQ==",
+			"license": "MIT",
+			"os": [
+				"win32"
+			],
+			"cpu": [
+				"x64"
+			],
+			"optional": true
+		},
 		"node_modules/json-bigint": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@caupulican/pi-adaptative",
-	"version": "0.84.1",
+	"version": "0.85.3",
 	"description": "Adaptive fork of Pi coding agent for self-evolving agent harness experiments",
 	"type": "module",
 	"piConfig": {
@@ -8,6 +8,7 @@
 		"configDir": ".pi"
 	},
 	"bin": {
+		"jscpd": "dist/jscpd-cli.js",
 		"pi": "dist/cli.js",
 		"pi-adaptative": "dist/cli.js"
 	},
@@ -71,7 +72,7 @@
 	],
 	"scripts": {
 		"clean": "shx rm -rf dist",
-		"build": "node ../../scripts/run-tsc.mjs -p tsconfig.build.json && shx chmod +x dist/cli.js && npm run copy-assets",
+		"build": "node ../../scripts/run-tsc.mjs -p tsconfig.build.json && shx chmod +x dist/cli.js dist/jscpd-cli.js && npm run copy-assets",
 		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/bun/cli.js ./src/utils/image-resize-worker.ts ./src/core/memory/providers/transcript-recall-worker.ts --outfile dist/pi && npm run copy-binary-assets",
 		"copy-assets": "shx mkdir -p dist/modes/interactive/theme && shx cp src/modes/interactive/theme/*.json dist/modes/interactive/theme/ && shx mkdir -p dist/modes/interactive/assets && shx cp src/modes/interactive/assets/*.png dist/modes/interactive/assets/ && shx mkdir -p dist/core/export-html/vendor && shx cp src/core/skill-block.mjs src/core/skill-block.d.mts dist/core/ && shx cp src/core/export-html/template.html src/core/export-html/template.css src/core/export-html/template.js src/core/export-html/session-tree-foundations.mjs src/core/export-html/session-tree-foundations.d.mts dist/core/export-html/ && shx cp src/core/export-html/vendor/*.js dist/core/export-html/vendor/ && shx mkdir -p dist/bundled-resources && shx cp -r src/bundled-resources/* dist/bundled-resources/",
 		"copy-binary-assets": "shx cp package.json dist/ && shx cp README.md dist/ && shx cp CHANGELOG.md dist/ && shx mkdir -p dist/theme && shx cp src/modes/interactive/theme/*.json dist/theme/ && shx mkdir -p dist/assets && shx cp src/modes/interactive/assets/*.png dist/assets/ && shx mkdir -p dist/export-html/vendor && shx cp src/core/skill-block.mjs dist/ && shx cp src/core/export-html/template.html src/core/export-html/template.css src/core/export-html/template.js src/core/export-html/session-tree-foundations.mjs dist/export-html/ && shx cp src/core/export-html/vendor/*.js dist/export-html/vendor/ && shx mkdir -p dist/bundled-resources && shx cp -r src/bundled-resources/* dist/bundled-resources/ && shx cp -r docs dist/ && shx cp -r examples dist/ && shx cp ../../node_modules/@silvia-odwyer/photon-node/photon_rs_bg.wasm dist/",
@@ -81,9 +82,9 @@
 		"postinstall": "node scripts/postinstall-python-runtime.mjs"
 	},
 	"dependencies": {
-		"@caupulican/pi-agent-core": "^0.84.1",
-		"@caupulican/pi-ai": "^0.84.1",
-		"@caupulican/pi-tui": "^0.84.1",
+		"@caupulican/pi-agent-core": "^0.85.3",
+		"@caupulican/pi-ai": "^0.85.3",
+		"@caupulican/pi-tui": "^0.85.3",
 		"@silvia-odwyer/photon-node": "0.3.4",
 		"chalk": "5.6.2",
 		"cross-spawn": "7.0.6",
@@ -92,6 +93,7 @@
 		"highlight.js": "10.7.3",
 		"hosted-git-info": "9.0.3",
 		"ignore": "7.0.5",
+		"jscpd": "5.0.14",
 		"jiti": "2.7.0",
 		"minimatch": "10.2.5",
 		"proper-lockfile": "4.1.2",