@tonbo/cli 0.2.0 → 0.3.1

package/dist/bin/tonbo.js

@@ -143,12 +143,12 @@ var TonboApi = class {
     });
     if (prepared.status === "upload") {
       if (!prepared.upload_url) throw new Error("Tonbo did not return a source upload URL.");
+      if (!prepared.upload_headers || prepared.upload_headers["if-none-match"] !== "*")
+        throw new Error("Missing immutable source upload headers.");
       const uploaded = await this.fetcher(prepared.upload_url, {
+        redirect: "error",
         method: "PUT",
-        headers: {
-          "content-type": prepared.content_type ?? "application/vnd.tonbo.source+tar",
-          "x-upsert": "false"
-        },
+        headers: prepared.upload_headers,
         body: new Blob([new Uint8Array(bundle.bytes)])
       });
       let uploadError = null;
@@ -323,7 +323,7 @@ var TonboApi = class {
 import { lstat, readFile } from "node:fs/promises";
 import path from "node:path";
 
-// ../../packages/agent-source-inspector/src/index.ts
+// ../../packages/agent-source-inspector/dist/src/index.js
 var AGENTS_INSTRUCTIONS_PATH = "AGENTS.md";
 var PI_SETTINGS_PATH = ".pi/settings.json";
 var MAX_HARNESS_CONFIG_BYTES = 256 * 1024;
@@ -339,6 +339,8 @@ var supportedExecutionTargets = [
   { driver: "command", harness: "pi" }
 ];
 var AgentSourceInspectionError = class extends Error {
+  code;
+  path;
   constructor(code, path6, message, options) {
     super(message, options);
     this.code = code;
@@ -351,28 +353,16 @@ function parsePiPackageCount(contents) {
   try {
     settings = JSON.parse(contents);
   } catch (error) {
-    throw new AgentSourceInspectionError(
-      "invalid_pi_settings",
-      PI_SETTINGS_PATH,
-      `${PI_SETTINGS_PATH} must contain valid JSON.`,
-      { cause: error }
-    );
+    throw new AgentSourceInspectionError("invalid_pi_settings", PI_SETTINGS_PATH, `${PI_SETTINGS_PATH} must contain valid JSON.`, { cause: error });
   }
   if (!settings || typeof settings !== "object" || Array.isArray(settings)) {
-    throw new AgentSourceInspectionError(
-      "invalid_pi_settings",
-      PI_SETTINGS_PATH,
-      `${PI_SETTINGS_PATH} must contain a JSON object.`
-    );
+    throw new AgentSourceInspectionError("invalid_pi_settings", PI_SETTINGS_PATH, `${PI_SETTINGS_PATH} must contain a JSON object.`);
   }
-  if (!("packages" in settings)) return 0;
+  if (!("packages" in settings))
+    return 0;
   const packages = settings.packages;
   if (!Array.isArray(packages)) {
-    throw new AgentSourceInspectionError(
-      "invalid_pi_settings",
-      PI_SETTINGS_PATH,
-      `${PI_SETTINGS_PATH} packages must be an array.`
-    );
+    throw new AgentSourceInspectionError("invalid_pi_settings", PI_SETTINGS_PATH, `${PI_SETTINGS_PATH} packages must be an array.`);
   }
   return packages.length;
 }
@@ -773,6 +763,42 @@ async function openBrowser(url) {
   return void await exec("xdg-open", [url]);
 }
 
+// ../../packages/agent-source-bundler/dist/src/generated/contracts.js
+var inferenceDefault = { "model": "claude-sonnet-5" };
+var sourceBundleContract = { "version": 1, "format": "tar-v1", "key_prefix": "agent-source-bundles", "content_type": "application/vnd.tonbo.source+tar", "max_bytes": 67108864 };
+var piSessionContract = { "version": 1, "adapter": "pi-jsonl-v3", "format_version": 3, "durable_completion_timeout_seconds": 30, "session_directory": "/sessions", "path_template": "/sessions/{session_id}.jsonl", "preflight_command": ["/usr/local/bin/artifacts", "runtime", "session-preflight"] };
+
+// ../../packages/agent-source-bundler/dist/src/inference-default.js
+var DEFAULT_INFERENCE_MODEL = inferenceDefault.model;
+
+// ../../packages/agent-source-bundler/dist/src/deployment-origin.js
+function deploymentOriginLabel(actor) {
+  return actor === "onboarding" ? "Setup guide" : "tonbo deploy";
+}
+function githubRepositoryUrl(remote) {
+  if (typeof remote !== "string" || !remote || /\s/.test(remote) || [...remote].some((character) => character.charCodeAt(0) < 32))
+    return null;
+  let path6;
+  const ssh = /^git@github\.com:([^?#]+)$/.exec(remote);
+  if (ssh)
+    path6 = ssh[1];
+  else {
+    try {
+      const url = new URL(remote);
+      if (url.hostname !== "github.com" || url.port || !["https:", "ssh:"].includes(url.protocol))
+        return null;
+      path6 = url.pathname.slice(1);
+    } catch {
+      return null;
+    }
+  }
+  path6 = path6.replace(/\/$/, "").replace(/\.git$/, "");
+  const parts = path6.split("/");
+  if (parts.length !== 2 || !/^[a-z\d](?:[a-z\d-]{0,38})$/i.test(parts[0]) || !/^[a-z\d._-]{1,100}$/i.test(parts[1]) || [".", ".."].includes(parts[1]))
+    return null;
+  return `https://github.com/${parts[0]}/${parts[1]}`;
+}
+
 // src/commands.ts
 import path4 from "node:path";
 
@@ -1047,32 +1073,12 @@ var deploymentSchema = {
     }
   }
 };
-var sourceBundleContract = {
-  "version": 1,
-  "format": "tar-v1",
-  "bucket": "agent-source-bundles",
-  "content_type": "application/vnd.tonbo.source+tar",
-  "max_bytes": 67108864
-};
-var piSessionContract = {
-  "version": 1,
-  "adapter": "pi-jsonl-v3",
-  "format_version": 3,
-  "durable_completion_timeout_seconds": 30,
-  "session_directory": "/sessions",
-  "path_template": "/sessions/{session_id}.jsonl",
-  "preflight_command": [
-    "/usr/local/bin/artifacts",
-    "runtime",
-    "session-preflight"
-  ]
-};
 var agentNameContract = {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://contracts.tonbo.dev/agents/agent-name-v1.json",
   "x-tonbo-version": 1,
   "x-tonbo-public-hostname-apex": "tonbo.sh",
-  "x-tonbo-public-hostname-template": "<agent>-<organization>.tonbo.sh",
+  "x-tonbo-public-hostname-template": "<agent>-<organization>-<word>-<word>.tonbo.sh",
   "$defs": {
     "name": {
       "type": "string",
@@ -1111,6 +1117,116 @@ var agentNameContract = {
           "www.tonbo.sh"
         ]
       }
+    },
+    "hostnameWord": {
+      "type": "string",
+      "enum": [
+        "arch",
+        "bark",
+        "beam",
+        "bell",
+        "bird",
+        "blue",
+        "boat",
+        "bold",
+        "book",
+        "calm",
+        "cave",
+        "clay",
+        "coal",
+        "cool",
+        "cove",
+        "dawn",
+        "deer",
+        "dove",
+        "dune",
+        "dusk",
+        "echo",
+        "fern",
+        "fire",
+        "flax",
+        "flow",
+        "foam",
+        "fawn",
+        "frog",
+        "gate",
+        "glow",
+        "gold",
+        "gray",
+        "gulf",
+        "hail",
+        "halo",
+        "hare",
+        "hawk",
+        "hill",
+        "iris",
+        "jade",
+        "kite",
+        "lake",
+        "lamb",
+        "leaf",
+        "lime",
+        "lion",
+        "lobe",
+        "loft",
+        "loom",
+        "luma",
+        "lynx",
+        "mint",
+        "mist",
+        "moon",
+        "moss",
+        "navy",
+        "nest",
+        "nova",
+        "oak",
+        "ocean",
+        "onyx",
+        "opal",
+        "otter",
+        "palm",
+        "peak",
+        "pine",
+        "pond",
+        "pool",
+        "rain",
+        "reed",
+        "reef",
+        "rice",
+        "ring",
+        "rise",
+        "road",
+        "rock",
+        "rose",
+        "ruby",
+        "sage",
+        "sand",
+        "seal",
+        "seed",
+        "silk",
+        "sky",
+        "snow",
+        "soft",
+        "star",
+        "stem",
+        "stone",
+        "surf",
+        "swan",
+        "teal",
+        "tide",
+        "tree",
+        "vale",
+        "vine",
+        "wave",
+        "west",
+        "wind",
+        "wing",
+        "wolf",
+        "wood",
+        "wren",
+        "yarn",
+        "zest"
+      ]
     }
   }
 };
@@ -1144,26 +1260,35 @@ function assertManagedDeploymentSpec(value) {
   }
 }
 
+// ../../packages/agent-source-bundler/dist/src/native-pi.js
+import { stringify } from "smol-toml";
+function nativePiDeclaration(model) {
+  return {
+    version: 2,
+    harness: { runtime: "pi", driver: { kind: "native" } },
+    inference: { model }
+  };
+}
+
 // src/declaration.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { lstat as lstat2, open, readFile as readFile2, rename, rm } from "node:fs/promises";
 import path2 from "node:path";
-import { parse, stringify } from "smol-toml";
+import { parse, stringify as stringify2 } from "smol-toml";
 var DECLARATION_FILENAME = ".tonbo";
-var DEFAULT_INFERENCE_MODEL = "claude-sonnet-4-5";
 function createDeclaration(model = DEFAULT_INFERENCE_MODEL, driver = { kind: "native" }, buildCommand, agentHostname) {
+  const base = nativePiDeclaration(model.trim());
   return parseDeclaration({
-    version: 2,
+    ...base,
     ...agentHostname ? { agent: agentHostname } : {},
-    harness: { runtime: "pi", driver },
-    inference: { model: model.trim() },
+    harness: { ...base.harness, driver },
     ...buildCommand ? { build: { command: buildCommand } } : {}
   });
 }
 function renderDeclaration(declaration) {
   return `# Tonbo Agent configuration.
 # Edit this file directly or run \`tonbo init\` to reconfigure.
-${stringify(declaration)}`;
+${stringify2(declaration)}`;
 }
 async function bindDeclarationAgent(root, agentHostname) {
   const declaration = await loadDeclaration(root);
@@ -1246,7 +1371,7 @@ function buildDeploymentSpec(declaration, source) {
   return spec;
 }
 
-// src/source.ts
+// ../../packages/agent-source-bundler/dist/src/index.js
 import { createHash as createHash2 } from "node:crypto";
 import { lstat as lstat3, readFile as readFile3, readdir } from "node:fs/promises";
 import path3 from "node:path";
@@ -1269,7 +1394,8 @@ var DEFAULT_IGNORES = [
 var EXACT_NPM_VERSION = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
 var GIT_COMMIT = /^[0-9a-f]{40}$/i;
 function packageSource(value, index) {
-  if (typeof value === "string") return value;
+  if (typeof value === "string")
+    return value;
   if (value && typeof value === "object" && "source" in value && typeof value.source === "string")
     return value.source;
   throw new Error(`.pi/settings.json packages[${index}] must be a source string or object.`);
@@ -1279,9 +1405,7 @@ async function validatePackageSource(root, source) {
     const specifier = source.slice(4);
     const separator = specifier.lastIndexOf("@");
     if (separator <= 0 || !EXACT_NPM_VERSION.test(specifier.slice(separator + 1))) {
-      throw new Error(
-        `PI package ${source} must pin an exact npm version, for example npm:my-agent@1.2.3.`
-      );
+      throw new Error(`PI package ${source} must pin an exact npm version, for example npm:my-agent@1.2.3.`);
     }
     return;
   }
@@ -1313,9 +1437,7 @@ async function validatePackageSource(root, source) {
     }
     return;
   }
-  throw new Error(
-    `PI package ${source} must use an exact npm version, a full Git commit, or a agent-local path.`
-  );
+  throw new Error(`PI package ${source} must use an exact npm version, a full Git commit, or a agent-local path.`);
 }
 async function validatePiPackages(root) {
   const filename = path3.join(root, ".pi", "settings.json");
@@ -1323,23 +1445,26 @@ async function validatePiPackages(root) {
   try {
     settings = JSON.parse(await readFile3(filename, "utf8"));
   } catch (error) {
-    if (error.code === "ENOENT") return;
+    if (error.code === "ENOENT")
+      return;
     throw new Error(`Could not read ${filename} as JSON.`, { cause: error });
   }
-  if (!settings || typeof settings !== "object" || !("packages" in settings)) return;
+  if (!settings || typeof settings !== "object" || !("packages" in settings))
+    return;
   const packages = settings.packages;
-  if (!Array.isArray(packages)) throw new Error(`${filename} packages must be an array.`);
-  await Promise.all(
-    packages.map((value, index) => validatePackageSource(root, packageSource(value, index)))
-  );
+  if (!Array.isArray(packages))
+    throw new Error(`${filename} packages must be an array.`);
+  await Promise.all(packages.map((value, index) => validatePackageSource(root, packageSource(value, index))));
 }
 async function findDeclarationRoot(start) {
   let candidate = path3.resolve(start);
   for (; ; ) {
     try {
-      if ((await lstat3(path3.join(candidate, ".tonbo"))).isFile()) return candidate;
+      if ((await lstat3(path3.join(candidate, ".tonbo"))).isFile())
+        return candidate;
     } catch (error) {
-      if (error.code !== "ENOENT") throw error;
+      if (error.code !== "ENOENT")
+        throw error;
     }
     const parent = path3.dirname(candidate);
     if (parent === candidate) {
@@ -1353,7 +1478,8 @@ async function sourceIgnore(root) {
   try {
     matcher.add(await readFile3(path3.join(root, ".tonboignore"), "utf8"));
   } catch (error) {
-    if (error.code !== "ENOENT") throw error;
+    if (error.code !== "ENOENT")
+      throw error;
   }
   return matcher;
 }
@@ -1366,11 +1492,10 @@ async function collectFiles(root) {
     for (const entry of entries) {
       const relative = relativeDirectory ? `${relativeDirectory}/${entry.name}` : entry.name;
       const ignored = matcher.ignores(relative + (entry.isDirectory() ? "/" : ""));
-      if (ignored) continue;
+      if (ignored)
+        continue;
       if (relative === SESSION_SOURCE_DIRECTORY || relative.startsWith(`${SESSION_SOURCE_DIRECTORY}/`)) {
-        throw new Error(
-          `Source path ${SESSION_SOURCE_DIRECTORY}/ is reserved for durable PI history. Rename it or exclude it with .tonboignore.`
-        );
+        throw new Error(`Source path ${SESSION_SOURCE_DIRECTORY}/ is reserved for durable PI history. Rename it or exclude it with .tonboignore.`);
       }
       const absolute = path3.join(directory, entry.name);
       if (entry.isDirectory()) {
@@ -1379,9 +1504,7 @@ async function collectFiles(root) {
       }
       const metadata = await lstat3(absolute);
       if (!metadata.isFile()) {
-        throw new Error(
-          `Source path ${relative} is not a regular file. V1 does not follow symlinks or special files.`
-        );
+        throw new Error(`Source path ${relative} is not a regular file. V1 does not follow symlinks or special files.`);
       }
       files.push({
         absolute,
@@ -1399,19 +1522,15 @@ async function collectFiles(root) {
 }
 function addEntry(pack, file, contents) {
   return new Promise((resolve, reject) => {
-    pack.entry(
-      {
-        gid: 0,
-        mode: file.mode,
-        mtime: /* @__PURE__ */ new Date(0),
-        name: file.relative,
-        size: contents.length,
-        type: "file",
-        uid: 0
-      },
-      contents,
-      (error) => error ? reject(error) : resolve()
-    );
+    pack.entry({
+      gid: 0,
+      mode: file.mode,
+      mtime: /* @__PURE__ */ new Date(0),
+      name: file.relative,
+      size: contents.length,
+      type: "file",
+      uid: 0
+    }, contents, (error) => error ? reject(error) : resolve());
   });
 }
 async function buildSourceBundle(root) {
@@ -1428,9 +1547,7 @@ async function buildSourceBundle(root) {
   pack.on("data", (chunk) => {
     size += chunk.length;
     if (size > MAX_BUNDLE_BYTES) {
-      pack.destroy(
-        new Error(`Source bundle exceeds ${MAX_BUNDLE_BYTES} bytes after ignore rules.`)
-      );
+      pack.destroy(new Error(`Source bundle exceeds ${MAX_BUNDLE_BYTES} bytes after ignore rules.`));
       return;
     }
     chunks.push(chunk);
@@ -2066,7 +2183,7 @@ function deploymentName(deployment) {
 }
 function deploymentSourceLabel(deployment) {
   const git = deployment.origin.git;
-  if (!git) return "tonbo deploy";
+  if (!git) return deploymentOriginLabel(deployment.origin.actor);
   const sha = git.commit_sha.slice(0, 7);
   return git.ref ? `${sha} \xB7 ${git.ref}` : sha;
 }
@@ -2369,15 +2486,17 @@ var AUTHOR_MAX_LENGTH = 255;
 async function collectGitProvenance(root, run = defaultGitRunner) {
   const commitSha = await read(run, ["rev-parse", "HEAD"], root);
   if (!commitSha || !COMMIT_SHA.test(commitSha)) return null;
-  const [ref, subject, author, status] = await Promise.all([
+  const [ref, subject, author, status, remote] = await Promise.all([
     read(run, ["rev-parse", "--abbrev-ref", "HEAD"], root),
     read(run, ["log", "-1", "--format=%s"], root),
     read(run, ["log", "-1", "--format=%an"], root),
     // Only the deployed tree matters: changes elsewhere in the repository do
     // not alter the uploaded bundle.
-    read(run, ["status", "--porcelain", "--", "."], root)
+    read(run, ["status", "--porcelain", "--", "."], root),
+    read(run, ["remote", "get-url", "origin"], root)
   ]);
   return {
+    ...githubRepositoryUrl(remote) ? { repository_url: githubRepositoryUrl(remote) } : {},
     commit_sha: commitSha,
     ref: ref === "HEAD" ? null : clamp(ref, REF_MAX_LENGTH),
     subject: clamp(subject, SUBJECT_MAX_LENGTH),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Deploy persistent Agents and manage their Machines from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {
@@ -22,12 +22,12 @@
     "access": "public"
   },
   "scripts": {
-    "build": "pnpm run build:source-inspector && node scripts/generate-contracts.mjs --check && tsc -p tsconfig.json && node scripts/bundle.mjs",
-    "build:source-inspector": "pnpm --filter @tonbo/agent-source-inspector build",
+    "build": "pnpm run build:source-tools && node scripts/generate-contracts.mjs --check && tsc -p tsconfig.json && node scripts/bundle.mjs",
+    "build:source-tools": "pnpm --filter @tonbo/agent-source-inspector --filter @tonbo/agent-source-bundler build",
     "generate:contracts": "node scripts/generate-contracts.mjs",
-    "lint": "pnpm run build:source-inspector && eslint . --max-warnings=0",
+    "lint": "pnpm run build:source-tools && eslint . --max-warnings=0",
     "test": "pnpm build && node --test dist/test/*.test.js",
-    "typecheck": "pnpm run build:source-inspector && node scripts/generate-contracts.mjs --check && tsc -p tsconfig.json --noEmit"
+    "typecheck": "pnpm run build:source-tools && node scripts/generate-contracts.mjs --check && tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
     "@inquirer/select": "4.4.2",
@@ -40,9 +40,9 @@
   "devDependencies": {
     "@tonbo/agent-source-inspector": "workspace:*",
     "@types/node": "^20.19.37",
-    "@types/tar-stream": "^3.1.4",
     "esbuild": "0.25.4",
-    "typescript": "catalog:"
+    "typescript": "catalog:",
+    "@tonbo/agent-source-bundler": "workspace:*"
   },
   "engines": {
     "node": ">=22"