bottleship 0.1.0-prototype.0 → 0.1.0-prototype.1

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 Add a section on top with a new version to release it: pushing it to main publishes that version to npm.
 Prerelease versions like `0.1.0-prototype.1` go to the dist-tag named after them (`prototype`), plain versions to `latest`.
 
+## 0.1.0-prototype.1
+
+- The last step of `bottleship init` opens your local agent (Claude Code, Codex, opencode or Cursor) to add bottleship to its global instructions, instead of showing text to copy.
+- `bottleship init --reset` starts over: sets the config aside as `config.json.bak` and asks everything again, and on a terminal offers to forget saved logins.
+- Fixed: a status check could read a box's state while it was being written and report a waiting login as running, or a finished agent as stopped.
+- Fixed: removing a box that was still waiting for its device login left the login process running.
+
 ## 0.1.0-prototype.0
 
 First prototype. `bottleship init` sets up a provider and a coding agent once, then your local agent runs other agents in remote boxes with `new`, `status`, `ask`, `exec` and `rm`.

package/README.md

@@ -34,6 +34,10 @@ bottleship init --yes --provider docker --agent claude --git-name "Ada Lovelace"
 
 For an agent on the device login route (codex by default), the live check stops at the login with `login_needs_human`, since someone has to approve it in a browser. Ask the user to run `bottleship init` in their terminal.
 
+At the end, init opens the user's own agent on this machine (Claude Code, Codex, opencode or Cursor, whichever is installed) with a prompt to add the instructions below to its global instructions (for Cursor, a user rule file `~/.cursor/rules/bottleship.mdc`; Cursor documents that folder, not whether its CLI reads it), so the user only approves the change. With `--yes`, the JSON's `next` asks the calling agent to add `instructions` to its own global instructions file and show the user the change.
+
+Rerunning `bottleship init` only asks what is missing. `bottleship init --reset` starts over: it sets `~/.bottleship/config.json` aside as `config.json.bak` and asks everything again; on a terminal it also offers to forget the saved logins. With `--yes` it never deletes saved logins.
+
 If a secret is missing it fails with `secret_missing`. Then ask the user to run `bottleship init` in their own terminal, where it asks with a hidden prompt. Never ask the user to paste a secret to you.
 
 ### Secrets

package/dist/src/cli.js

@@ -16,6 +16,7 @@ const HELP = `bottleship: run coding agents in remote sandboxes ("boxes"), like
        [--host H]                  (ssh) the host boxes run on
        [--i-understand-no-isolation]  (local, ssh) the user accepts agents running unsandboxed
        [--provider custom --name N]  scaffolds ~/.bottleship/providers/N.ts for your own sandboxes
+       [--reset]                   start over: sets config.json aside as config.json.bak (on a terminal, offers to forget saved logins)
                                    one-time setup; a human runs it in a terminal, or an agent with --yes
   new "<task>" [--repo owner/name | --no-repo] [--provider P] [--agent A]
                                    new box: clones the repo (default: the cwd's origin; local: a worktree), starts the agent
@@ -154,8 +155,8 @@ async function cmdRm(argv) {
     return { removed: `${provider}:${box}` };
 }
 async function cmdInit(argv, ui) {
-    const { values } = args(argv, { yes: { type: "boolean", short: "y" }, provider: { type: "string" }, host: { type: "string" }, name: { type: "string" }, agent: { type: "string" }, "git-name": { type: "string" }, "git-email": { type: "string" }, "i-understand-no-isolation": { type: "boolean" } });
-    const result = await init({ provider: values.provider, host: values.host, name: values.name, agent: values.agent, gitName: values["git-name"], gitEmail: values["git-email"], noIsolation: values["i-understand-no-isolation"] }, ui);
+    const { values } = args(argv, { yes: { type: "boolean", short: "y" }, provider: { type: "string" }, host: { type: "string" }, name: { type: "string" }, agent: { type: "string" }, "git-name": { type: "string" }, "git-email": { type: "string" }, "i-understand-no-isolation": { type: "boolean" }, reset: { type: "boolean" } });
+    const result = await init({ provider: values.provider, host: values.host, name: values.name, agent: values.agent, gitName: values["git-name"], gitEmail: values["git-email"], noIsolation: values["i-understand-no-isolation"], reset: values.reset }, ui);
     if (!result.ok)
         process.exitCode = 1;
     return result;

package/dist/src/init.d.ts

@@ -8,5 +8,6 @@ export interface InitFlags {
     gitName?: string;
     gitEmail?: string;
     noIsolation?: boolean;
+    reset?: boolean;
 }
 export declare function init(flags: InitFlags, ui?: UI): Promise<Record<string, unknown>>;

package/dist/src/init.js

@@ -1,13 +1,14 @@
 // One-time onboarding: provider, agent, git identity, secrets, then a live check.
 // Re-running it only asks for what is missing. Without a UI it never prompts.
 import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { CONFIG_FILE, HOME, ROOT } from "./paths.js";
 import { BsError, DEFAULTS, getAgent, getProvider, isSource, loadConfig, neededSecrets, noIsolationAccepted, noIsolationError, readUserConfig, unisolated, writeUserConfig } from "./config.js";
-import { describe, hasSecret, storeSecret } from "./secrets.js";
+import { describe, forgetSecret, hasSecret, storeSecret } from "./secrets.js";
 import { agentState, loginState, missingSecrets, newBoxId, setupAndStart, templateSpec, waitAgent } from "./boxes.js";
 import { c } from "./ui.js";
+import { shq } from "../presets/providers/util.js";
 export const INSTRUCTIONS = `## Remote agents with bottleship
 
 You can run other coding agents in remote sandboxes ("boxes") with the \`bottleship\` CLI, like subagents. Every command prints JSON; errors carry a \`fix\`.
@@ -87,7 +88,57 @@ function storeAndPoint(raw, secret, value) {
         raw.env = { ...(raw.env ?? DEFAULTS.env), [secret.name]: source };
     return source;
 }
+// local agents that keep a global instructions file, and how to open one with a prompt
+const section = (file) => `Add the section below to your global instructions file ${file}, so you can use bottleship in every project. If the file already has a "## Remote agents with bottleship" section, replace it; keep everything else as it is, and create the file if it does not exist. Show me the change before you write it.\n\n${INSTRUCTIONS}`;
+// Cursor reads user rule files from ~/.cursor/rules (https://cursor.com/help/customization/rules), so bottleship gets a rule of its own
+const cursorRule = (file) => `Write the text below as the Cursor user rule file ${file}, so you can use bottleship in every project. Give it this frontmatter, then the text: "---" / "description: How to run coding agents in remote boxes with bottleship" / "alwaysApply: true" / "---". Replace the file if it exists. Show me the file before you write it.\n\n${INSTRUCTIONS}`;
+const LOCAL_AGENTS = [
+    { name: "claude", file: "~/.claude/CLAUDE.md", prompt: section, open: (prompt) => `claude ${shq(prompt)}` },
+    { name: "codex", file: "~/.codex/AGENTS.md", prompt: section, open: (prompt) => `codex ${shq(prompt)}` },
+    { name: "opencode", file: "~/.config/opencode/AGENTS.md", prompt: section, open: (prompt) => `opencode --prompt ${shq(prompt)}` },
+    { name: "cursor-agent", file: "~/.cursor/rules/bottleship.mdc", prompt: cursorRule, open: (prompt) => `cursor-agent ${shq(prompt)}` },
+];
+const onPath = (bin) => (process.env.PATH ?? "").split(":").some((d) => d && existsSync(join(d, bin)));
+const TEACH_YOURSELF = 'Add `instructions` to your own global instructions file (e.g. ~/.claude/CLAUDE.md for Claude Code, ~/.codex/AGENTS.md for Codex, a rule file ~/.cursor/rules/bottleship.mdc with `alwaysApply: true` for Cursor), replacing an older "## Remote agents with bottleship" section, and show the user the change.';
+// the last step: the user's own agent adds the instructions to its global file, or the user copies them
+async function teachLocalAgent(ui) {
+    const found = LOCAL_AGENTS.filter((a) => onPath(a.name));
+    const pick = found.length
+        ? await ui.choose("Which agent on this machine should learn about bottleship?", [...found.map((a) => ({ value: a.name, hint: `${a.prompt === cursorRule ? "writes" : "adds a section to"} ${a.file}` })), { value: "skip", hint: "show the text to copy instead" }], found[0].name)
+        : "skip";
+    const local = found.find((a) => a.name === pick);
+    if (local)
+        await ui.handOver(local.open(local.prompt(local.file)));
+    else
+        ui.note("Add this to your agent's global instructions (e.g. ~/.claude/CLAUDE.md)", INSTRUCTIONS);
+}
+// the store names of saved logins the config refers to, for reset to offer forgetting
+function savedLogins(cfg) {
+    const names = new Set();
+    const walk = (v) => {
+        if (!v || typeof v !== "object")
+            return;
+        if ("store" in v && typeof v.store === "string" && hasSecret({ store: v.store }))
+            names.add(v.store);
+        Object.values(v).forEach(walk);
+    };
+    walk(cfg);
+    return [...names].sort();
+}
+async function reset(ui) {
+    if (!existsSync(CONFIG_FILE))
+        return;
+    if (ui && !(await ui.confirm("Start over? Your current setup is set aside and every question comes back.")))
+        throw new BsError("reset_cancelled", "nothing changed", "bottleship init");
+    const saved = savedLogins(loadConfig(readUserConfig()));
+    renameSync(CONFIG_FILE, `${CONFIG_FILE}.bak`);
+    // only a human on the terminal can forget saved logins
+    if (ui && saved.length && (await ui.confirm(`Also forget the saved logins (${saved.join(", ")})?`)))
+        saved.forEach(forgetSecret);
+}
 export async function init(flags, ui) {
+    if (flags.reset)
+        await reset(ui);
     const raw = readUserConfig();
     let cfg = loadConfig(raw);
     ui?.intro();
@@ -198,12 +249,12 @@ export async function init(flags, ui) {
         if (failed)
             ui.fail(`${failed.step} failed`, JSON.stringify(failed.error));
         else {
-            ui.note("Add this to your agent's global instructions (e.g. ~/.claude/CLAUDE.md)", INSTRUCTIONS);
+            await teachLocalAgent(ui);
             ui.say(`config  ${c.dim(CONFIG_FILE)}\nboxes   ${provider} running ${agent}, committing as ${git.name} <${git.email}>`);
             ui.close(c.green("All set. Tell your agent to start something in a box."));
         }
     }
-    return { ok, config: CONFIG_FILE, provider, agent, git, secrets, checks, instructions: INSTRUCTIONS };
+    return { ok, config: CONFIG_FILE, provider, agent, git, secrets, checks, instructions: INSTRUCTIONS, ...(ok && { next: TEACH_YOURSELF }) };
 }
 // boxes push and open PRs with GH_TOKEN: a fine-grained token by default, the gh CLI's token only after a warning
 async function useGhAuthToken(ui) {

package/dist/src/secrets.d.ts

@@ -3,3 +3,4 @@ export declare function describe(source: SecretSource): string;
 export declare function readSecret(source: SecretSource): string;
 export declare function storeSecret(name: string, value: string): string;
 export declare function hasSecret(source: SecretSource): boolean;
+export declare function forgetSecret(name: string): void;

package/dist/src/secrets.js

@@ -1,6 +1,6 @@
 // Reads and stores secret values on this machine. Sources are described in types.ts (SecretSource).
 import { execFileSync } from "node:child_process";
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { HOME } from "./paths.js";
 const SERVICE = "bottleship";
@@ -56,3 +56,13 @@ export function hasSecret(source) {
         return false;
     }
 }
+export function forgetSecret(name) {
+    if (useKeychain()) {
+        try {
+            sh("security", ["delete-generic-password", "-s", SERVICE, "-a", name]);
+        }
+        catch { }
+    }
+    else
+        rmSync(join(FILE_DIR, name), { force: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bottleship",
-  "version": "0.1.0-prototype.0",
+  "version": "0.1.0-prototype.1",
   "description": "Run coding agents in remote sandboxes, like subagents, from your local coding agent.",
   "license": "MIT",
   "author": "Joshua Knauber",