@calamity-inc/slave 0.3.0 → 0.3.2

package/README.md

@@ -30,10 +30,11 @@ Options:
 Single-character flags can be combined, so `slave -cw prompt` is equivalent to `slave -c -w prompt`.
 
 Subcommands:
-- `--create-profile <name> <provider> <model>` — creates a profile
+- `--create-profile <name> <provider> <model>` — create a profile
 	- `provider` can be `openai`, `anthropic`, or an OpenAI-compatible base URL like `http://127.0.0.1:1234/v1` for [LM Studio](https://lmstudio.ai/developers).
-- `--delete-profile <name>` — deletes a profile
-- `--update-api-key <provider>` — updates an API Key
+- `--list-profiles` — list all profiles
+- `--delete-profile <name>` — delete a profile
+- `--update-api-key <provider>` — update an API Key
 
 ## Security
 
@@ -46,3 +47,13 @@ The model can't run commands on your system; it only gets limited access to your
 However, these restrictions are only as good as your practices; you should:
 - Only run `slave` in Git-tracked folders and be sure that anything you don't want to lose is committed or at least staged so you can always revert any changes made by the model.
 - Review changes to your code before running anything, including tests.
+
+## Logs
+
+Each invocation that prompts a model creates a log file:
+
+- Linux: `~/.local/state/slave-nodejs`, or `$XDG_STATE_HOME/slave-nodejs` if `XDG_STATE_HOME` is set
+- macOS: `~/Library/Logs/slave-nodejs`
+- Windows: `%LOCALAPPDATA%\slave-nodejs\Log`
+
+When a new log file is created, any log file older than 30 days is deleted.

package/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { execFileSync, spawnSync } from "node:child_process";
+import { randomInt } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { createInterface } from "node:readline/promises";
@@ -13,8 +14,8 @@ import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
 import OpenAI from "openai";
 
+const { data: configDir, log: logDir } = envPaths("slave");
 
-const configDir = envPaths("slave").data;
 const state = fs.existsSync(path.join(configDir, "state.json")) ? JSON.parse(fs.readFileSync(path.join(configDir, "state.json"), "utf8")) : {};
 state.profiles ??= {};
 state.apiKeys ??= {};
@@ -31,7 +32,37 @@ const promptForApiKey = async (provider) => {
 const saveState = () => {
 	fs.mkdirSync(configDir, { recursive: true });
 	fs.writeFileSync(path.join(configDir, "state.json"), JSON.stringify(state, null, 2), { encoding: "utf8", mode: 0o600 });
-	fs.chmodSync(path.join(configDir, "state.json"), 0o600);
+};
+
+const rotateLogs = () => {
+	const cutoff = Date.now() - 30 * 24 * 60 * 60 * 1000; // 30 days
+	for (const name of fs.readdirSync(logDir)) {
+		try {
+			if (fs.statSync(path.join(logDir, name)).mtimeMs < cutoff) {
+				fs.unlinkSync(path.join(logDir, name));
+			}
+		}
+		catch (e) {
+			// another process may have removed it already; ignore.
+		}
+	}
+};
+
+let logFh;
+const logWrite = (line) => {
+	if (!logFh) {
+		const now = new Date();
+		const pad = (n) => String(n).padStart(2, '0');
+		const logfileName = `${now.getUTCFullYear()}-${pad(now.getUTCMonth() + 1)}-${pad(now.getUTCDate())}T${pad(now.getUTCHours())}-${pad(now.getUTCMinutes())}-${pad(now.getUTCSeconds())}Z.txt`;
+		fs.mkdirSync(logDir, { recursive: true });
+		logFh = fs.openSync(path.join(logDir, logfileName), "a", 0o600);
+		rotateLogs();
+	}
+	fs.writeSync(logFh, line + "\n");
+};
+const logWriteBoth = (line) => {
+	console.log(line);
+	logWrite(line);
 };
 
 const slaveignore = ignore();
@@ -79,17 +110,12 @@ const writeFileFromModel = (filePath, data, usesCRLF) => {
 	fs.writeFileSync(filePath, usesCRLF ? normalized.replaceAll("\n", "\r\n") : normalized, "utf8");
 };
 
-let used_docker;
+let sandbox_name;
 const ensureSandbox = () => {
-	if (!used_docker) {
-		try {
-			// `docker pull ghcr.io/calamity-inc/slave-sandbox` is not needed to get the image, but would be needed to update it.
-			execFileSync("docker", ["run", "-d", "--name", "slave-sandbox", "ghcr.io/calamity-inc/slave-sandbox", "sleep", "infinity"], { encoding: "utf8" });
-		}
-		catch (e) {
-			// container may already exist if it was not cleaned up previously. this is okay-ish.
-		}
-		used_docker = true;
+	if (!sandbox_name) {
+		sandbox_name = "slave-sandbox-" + Array.from({ length: 10 }, () => "abcdefghijklmnopqrstuvwxyz0123456789"[randomInt(36)]).join("");
+		// `docker pull ghcr.io/calamity-inc/slave-sandbox` is not needed to get the image, but would be needed to update it.
+		execFileSync("docker", ["run", "-d", "--name", sandbox_name, "ghcr.io/calamity-inc/slave-sandbox", "sleep", "infinity"], { encoding: "utf8" });
 	}
 };
 
@@ -132,9 +158,14 @@ const functions = {
 			.filter(file => !isOutOfReach(file));
 		const res = [];
 		for (const file of files) {
-			const matches = readFileForModel(file).split(substring).length - 1;
-			if (matches) {
-				res.push(`${file} has ${matches} match${matches == 1 ? "" : "es"}`);
+			try {
+				const matches = readFileForModel(file).split(substring).length - 1;
+				if (matches) {
+					res.push(`${file} has ${matches} match${matches == 1 ? "" : "es"}`);
+				}
+			}
+			catch (e) {
+				// file might be busy, skip it
 			}
 		}
 		return res.join("\n");
@@ -147,7 +178,11 @@ const functions = {
 		if (!fs.existsSync(path) || !fs.statSync(path).isFile()) {
 			return "No such file";
 		}
-		return readFileForModel(path);
+		const cont = readFileForModel(path);
+		if (cont.length > 10485760) {
+			return "File is over 10485760 characters long";
+		}
+		return cont;
 	},
 	writeFile: ({ path, data }) => {
 		path = fixPath(path, "write");
@@ -174,7 +209,11 @@ const functions = {
 	},
 	sandboxExec: ({ command, args }) => {
 		ensureSandbox();
-		const result = spawnSync("docker", [ "exec", "slave-sandbox", command, ...args ], { encoding: "utf8" });
+		args ??= [];
+		if (typeof args == "string") {
+			args = JSON.parse(args);
+		}
+		const result = spawnSync("docker", [ "exec", sandbox_name, command, ...args ], { encoding: "utf8" });
 		const output = (result.stdout ?? "") + (result.stderr ?? "");
 		if (result.error) {
 			return (output || result.error.message).trimEnd();
@@ -194,7 +233,7 @@ const functions = {
 		}
 		ensureSandbox();
 		try {
-			execFileSync("docker", ["cp", "-L", hostPath, `slave-sandbox:${sbxPath}`], { encoding: "utf8" });
+			execFileSync("docker", ["cp", "-L", hostPath, `${sandbox_name}:${sbxPath}`], { encoding: "utf8" });
 			return "OK";
 		}
 		catch (e) {
@@ -210,7 +249,7 @@ const functions = {
 			return "Host path must point to a file";
 		}
 		ensureSandbox();
-		execFileSync("docker", ["cp", "-L", `slave-sandbox:${sbxPath}`, hostPath], { encoding: "utf8" });
+		execFileSync("docker", ["cp", "-L", `${sandbox_name}:${sbxPath}`, hostPath], { encoding: "utf8" });
 		return "OK";
 	},
 	/*system: ({ command }) => {
@@ -370,14 +409,19 @@ const toolToAnthropic = (t) => {
 	}
 };
 
+const printJunk = (line) => {
+	logWrite(line);
+	line = line.replaceAll("\r", "<CR>").replaceAll("\n", "<NL>").replaceAll("\t", "    ");
+	if (line.length > 80) {
+		line = line.substring(0, 77) + "...";
+	}
+	console.log(line);
+}
+
 const useTool = (name, args, argsStr) => {
-	console.log("$ " + name + argsStr);
+	printJunk("$ " + name + argsStr);
 	const output = String(functions[name](args));
-	let consoleOutput = output.replaceAll("\r", "<CR>").replaceAll("\n", "<NL>");
-	if (name == "readFile" && consoleOutput.length > 80) {
-		consoleOutput = consoleOutput.substring(0, 77) + "...";
-	}
-	console.log(consoleOutput);
+	printJunk(output);
 	return output;
 };
 
@@ -429,14 +473,14 @@ const anthropic_generateResponseOptionallyUsingTools = async (client, model, inp
 
 	let message = await client.messages.create({
 		model,
-		max_tokens: 4096,
+		max_tokens: 20000,
 		cache_control: { type: "ephemeral" },
 		messages: state,
 		tools: anthropicTools,
 	});
 	state.push({ role: message.role, content: message.content });
 
-	while (message.stop_reason == "tool_use" || message.stop_reason == "max_tokens" || message.stop_reason == "pause_turn") {
+	while (message.stop_reason == "tool_use" || message.stop_reason == "pause_turn") {
 		const toolCalls = message.content.filter((item) => item.type == "tool_use");
 		if (toolCalls.length) {
 			const outputs = toolCalls.map((call) => {
@@ -450,9 +494,13 @@ const anthropic_generateResponseOptionallyUsingTools = async (client, model, inp
 			used_tools = true;
 		}
 
+		/*if (message.stop_reason == "max_tokens" && message.content[message.content.length].type == "thinking") {
+			state.push({ role: "user", content: "Please continue from where you left off." });
+		}*/
+
 		message = await client.messages.create({
 			model,
-			max_tokens: 4096,
+			max_tokens: 20000,
 			cache_control: { type: "ephemeral" },
 			messages: state,
 			tools: anthropicTools,
@@ -460,6 +508,12 @@ const anthropic_generateResponseOptionallyUsingTools = async (client, model, inp
 		state.push({ role: message.role, content: message.content });
 	}
 
+	if (message.stop_reason != "end_turn") {
+		logWrite(`unexpected stop_reason: ${message.stop_reason}\n${JSON.stringify(message, null, 2)}`);
+		console.log(message);
+		throw new Error(`unexpected stop_reason: ${message.stop_reason}`);
+	}
+
 	//console.log(message);
 	return {
 		output_text: message.content.find((item) => item.type == "text").text,
@@ -477,6 +531,9 @@ const markdownToConsoleText = (md) => {
 	return text;
 };
 
+const profileToString = (profile) => {
+	return profile.provider.startsWith("http") ? `${profile.model} via ${profile.provider}` : `${profile.provider}/${profile.model}`;
+};
 
 const program = new Command();
 program
@@ -491,8 +548,9 @@ program
 	.option("-s, --sandbox", "allow the model to use a docker container")
 	.option("-p, --profile <name>", "profile name", "default")
 	.option("--create-profile <name> <provider> <model>", "create a profile")
-	.option("--delete-profile <name>", "delete a profile") // TODO
-	.option("--update-api-key <provider>", "update an API key") // TODO
+	.option("--list-profiles", "list all profiles")
+	.option("--delete-profile <name>", "delete a profile")
+	.option("--update-api-key <provider>", "update an API key")
 	.helpOption("-?, --help", "display help")
 	.parse();
 const options = program.opts();
@@ -516,6 +574,16 @@ if (options.createProfile) {
 	console.log(`${isCreate ? "Created" : "Updated"} ${options.createProfile} profile.`);
 	process.exit(0);
 }
+if (options.listProfiles) {
+	const names = Object.keys(state.profiles);
+	if (names.length == 0) {
+		console.log("No profiles.");
+	}
+	for (const name of names) {
+		console.log(`${name}: ${profileToString(state.profiles[name])}`);
+	}
+	process.exit(0);
+}
 if (options.deleteProfile) {
 	delete state.profiles[options.deleteProfile];
 	saveState();
@@ -542,13 +610,15 @@ if (!profile) {
 
 let prompt = program.args.join(" ").trim();
 let previous_provider_state;
-const overrides = [profile.provider.startsWith("http") ? `${profile.model} via ${profile.provider}` : `${profile.provider}/${profile.model}`];
+const overrides = [profileToString(profile)];
 state.providerStates[profile.provider] ??= {};
 if (options.continue || options.cont) {
 	previous_provider_state = state.providerStates[profile.provider].previous;
+	sandbox_name = state.providerStates[profile.provider].sandbox_name;
 }
 else if (options.amend) {
 	previous_provider_state = state.providerStates[profile.provider].previous_previous;
+	sandbox_name = state.providerStates[profile.provider].sandbox_name;
 }
 const filesystemEnabled = options.fs !== false && !options.nofs;
 initTools(filesystemEnabled, options.sandbox, options.web);
@@ -561,25 +631,21 @@ if (!filesystemEnabled) {
 if (options.sandbox) {
 	overrides.push("sandbox enabled");
 }
-let stdinText = "";
-if (!process.stdin.isTTY) {
-	const chunks = [];
-	for await (const chunk of process.stdin) {
-		chunks.push(chunk);
-	}
-	stdinText = Buffer.concat(chunks).toString("utf8");
-}
 if (!prompt) {
 	console.log("No prompt given.");
 	process.exit(1);
 }
 
-console.log((previous_provider_state ? "FOLLOW-UP" : "PROMPT") + ": " + prompt);
-if (stdinText) {
+logWriteBoth((previous_provider_state ? "FOLLOW-UP" : "PROMPT") + ": " + prompt);
+if (!process.stdin.isTTY) {
+	const chunks = [];
+	for await (const chunk of process.stdin) {
+		chunks.push(chunk);
+	}
+	prompt = `${Buffer.concat(chunks).toString("utf8")}\n\n${prompt}`;
 	overrides.push("stdin provided");
-	prompt = `${stdinText}\n\n${prompt}`;
 }
-console.log(`(${overrides.join(", ")})\n`);
+logWriteBoth(`(${overrides.join(", ")})\n`);
 
 //console.log({ model: profile.model, prompt, previous_provider_state });
 
@@ -601,11 +667,13 @@ else {
 }
 state.providerStates[profile.provider].previous_previous = previous_provider_state;
 state.providerStates[profile.provider].previous = response.state;
+if (state.providerStates[profile.provider].sandbox_name && state.providerStates[profile.provider].sandbox_name != sandbox_name) {
+	execFileSync("docker", ["rm", "-f", state.providerStates[profile.provider].sandbox_name], { encoding: "utf8" });
+}
+state.providerStates[profile.provider].sandbox_name = sandbox_name;
 saveState();
 if (response.used_tools) {
-	if (used_docker) {
-		execFileSync("docker", ["rm", "-f", "slave-sandbox"], { encoding: "utf8" });
-	}
-	console.log();
+	logWriteBoth("");
 }
 console.log(markdownToConsoleText(response.output_text) + "\n");
+logWrite(response.output_text);

package/package.json

@@ -4,7 +4,7 @@
 		"type": "git",
 		"url": "git+https://github.com/calamity-inc/slave.git"
 	},
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"type": "module",
 	"bin": {
 		"slave": "index.js"