@tonbo/cli 0.1.0 → 0.1.1

package/README.md

@@ -17,12 +17,12 @@ No Harness-specific configuration was found in this project.
 ❯ PI (`pi`)  Run this project with the pi command.
 ? How should this Agent connect to Tonbo?
 ❯ Create a new project  Create it only after you confirm the complete configuration.
-  Use an existing project
+  Use an existing agent
   Set up later
-? Project name [my-agent]:
+? Agent name [my-agent]:
 
 Tonbo Agent configuration:
-  Project:       Create my-agent in my-account (permanent address assigned after creation)
+  Agent:       Create my-agent in my-account (permanent address assigned after creation)
   Harness:       PI
   Execution:     PI CLI (`pi`)
   Model:         claude-sonnet-4-5
@@ -31,7 +31,7 @@ Tonbo Agent configuration:
   Edit configuration  Change the project, Harness, execution mode, model, or SDK entrypoint.
   Cancel
 Created project my-agent and .tonbo.
-Project: my-agent (my-agent-my-account.tonbo.sh)
+Agent: my-agent (my-agent-my-account.tonbo.sh)
 Organization: my-account
 Application: https://my-agent-my-account.tonbo.sh
 Harness: PI
@@ -39,12 +39,12 @@ Mode: PI CLI
 Next: tonbo deploy
 ```
 
-Use the arrow keys and Enter to select a supported Harness and either create or select the one Project owned by this source tree. Project creation and file writes wait until the final review; cancelling leaves both local and cloud state unchanged. `AGENTS.md` is Harness-neutral and never identifies PI by itself. When `.pi/settings.json` exists, the shared source inspector identifies the PI Harness and reports its project-local packages. A regular PI project defaults to the native PI CLI; choose `Edit configuration` only when changing the Project, execution mode, model, or another setting. Unsupported and planned Harnesses are not shown.
+Use the arrow keys and Enter to select a supported Harness and either create or select the one Agent owned by this source tree. Agent creation and file writes wait until the final review; cancelling leaves both local and cloud state unchanged. `AGENTS.md` is Harness-neutral and never identifies PI by itself. When `.pi/settings.json` exists, the shared source inspector identifies the PI Harness and reports its workspace-local packages. A regular PI project defaults to the native PI CLI; choose `Edit configuration` only when changing the Agent, execution mode, model, or another setting. Unsupported and planned Harnesses are not shown.
 
 The generated `.tonbo` is TOML:
 
 ```toml
-# Tonbo Project Agent configuration.
+# Tonbo Agent Agent configuration.
 # Edit this file directly or run `tonbo init` to reconfigure.
 version = 2
 agent = "my-agent-my-account.tonbo.sh"
@@ -59,14 +59,14 @@ kind = "native"
 model = "claude-sonnet-4-5"
 ```
 
-The immutable full Project hostname is the only durable Project authority in the source tree; it is not a credential. This keeps Projects with the same name in different Organizations unambiguous. `deploy`, `run`, `ssh` and `secret` refuse an unbound declaration. `tonbo project use <name-hostname-or-id>` accepts any convenient selector, resolves it through the signed-in account and writes the selected `project-organization.tonbo.sh` hostname into `.tonbo`; rebinding an existing declaration requires interactive confirmation or `--force`. UUIDs remain internal API identities and are never committed by the CLI.
+The immutable full Agent hostname is the only durable Agent authority in the source tree; it is not a credential. This keeps Agents with the same name in different Organizations unambiguous. `deploy`, `run`, `ssh` and `secret` refuse an unbound declaration. `tonbo agent use <name-hostname-or-id>` accepts any convenient selector, resolves it through the signed-in account and writes the selected `project-organization.tonbo.sh` hostname into `.tonbo`; rebinding an existing declaration requires interactive confirmation or `--force`. UUIDs remain internal API identities and are never committed by the CLI.
 
 The default inference model is written without prompting. Override it explicitly with `--model`. Headless initialization makes Harness and driver choices explicit and may bind the resulting declaration with `project use`:
 
 ```console
 tonbo init --harness pi --driver native
 tonbo init --harness pi --driver command --agent-entry dist/agent.mjs
-tonbo project use my-project-my-account.tonbo.sh
+tonbo agent use my-project-my-account.tonbo.sh
 ```
 
 After interactive initialization, deploy the current contents:
@@ -76,7 +76,7 @@ tonbo deploy
 tonbo run "Reply with exactly READY."
 ```
 
-Choose `Use an existing project` during `init` when the Project already exists. `tonbo project create <name>` and `tonbo project use <name-hostname-or-id>` remain explicit automation and recovery commands.
+Choose `Use an existing agent` during `init` when the Agent already exists. `tonbo agent create <name>` and `tonbo agent use <name-hostname-or-id>` remain explicit automation and recovery commands.
 
 `run` creates a durable Session and prints its ID in `--json` output. Pass that identity back to continue the same PI conversation:
 
@@ -84,7 +84,7 @@ Choose `Use an existing project` during `init` when the Project already exists.
 tonbo run --session 4d8e9501-... "Continue the previous task."
 ```
 
-Every `tonbo deploy` creates one immutable Deployment: the uploaded source, the `.tonbo` settings and the git provenance of the source root (commit, branch, subject, author and whether the tree was dirty) when the directory is inside a git work tree. Git is optional; without it the Deployment records `tonbo deploy` as its source. Deployments are named by their commit subject, or by their short id (the first eight hex characters) when there is no commit, and every command that takes a Deployment accepts any unambiguous id prefix. The Project's Production pointer names the one Deployment that serves its hostname; `deploy` moves Production to the new Deployment and prints the Deployment, its Production state and the exact standard OpenSSH command for the bound Project and its username:
+Every `tonbo deploy` creates one immutable Deployment: the uploaded source, the `.tonbo` settings and the git provenance of the source root (commit, branch, subject, author and whether the tree was dirty) when the directory is inside a git work tree. Git is optional; without it the Deployment records `tonbo deploy` as its source. Deployments are named by their commit subject, or by their short id (the first eight hex characters) when there is no commit, and every command that takes a Deployment accepts any unambiguous id prefix. The Agent's Production pointer names the one Deployment that serves its hostname; `deploy` moves Production to the new Deployment and prints the Deployment, its Production state and the exact standard OpenSSH command for the bound Agent and its username:
 
 ```console
 $ tonbo deploy
@@ -115,15 +115,15 @@ tonbo deployments rollback             # move Production back to the previous Pr
 tonbo deployments rollback 9b8c1d22    # or to a named one
 ```
 
-`tonbo deployments` (alias `tonbo deployments list`) marks the current Production Deployment with `●` and earlier ones with `○`; `STATUS` is the Deployment's relationship to Production: `current`, `promoting`, `failed`, `stopped`, `previous` or `none`. Promotion and rollback compare-and-swap the Production generation, so two people moving Production at once cannot silently overwrite each other; a conflict is reported and the command can be retried after checking `tonbo deployments`. `tonbo project show` prints the Production Deployment and its state alongside the Project addresses.
+`tonbo deployments` (alias `tonbo deployments list`) marks the current Production Deployment with `●` and earlier ones with `○`; `STATUS` is the Deployment's relationship to Production: `current`, `promoting`, `failed`, `stopped`, `previous` or `none`. Promotion and rollback compare-and-swap the Production generation, so two people moving Production at once cannot silently overwrite each other; a conflict is reported and the command can be retried after checking `tonbo deployments`. `tonbo agent show` prints the Production Deployment and its state alongside the Agent addresses.
 
-Use `tonbo project show` to rediscover the username, application address and SSH command later. `tonbo login` registers public keys found at the conventional `~/.ssh/id_ed25519.pub`, `id_ecdsa.pub` and `id_rsa.pub` paths. Register a key at another path with `tonbo ssh-key add <path.pub>` and revoke a lost or retired key with `tonbo ssh-key remove SHA256:...`. The CLI is not part of the SSH connection; ordinary OpenSSH, `scp` and `rsync` connect directly:
+Use `tonbo agent show` to rediscover the username, application address and SSH command later. `tonbo login` registers public keys found at the conventional `~/.ssh/id_ed25519.pub`, `id_ecdsa.pub` and `id_rsa.pub` paths. Register a key at another path with `tonbo ssh-key add <path.pub>` and revoke a lost or retired key with `tonbo ssh-key remove SHA256:...`. The CLI is not part of the SSH connection; ordinary OpenSSH, `scp` and `rsync` connect directly:
 
 ```console
 ssh my-project.my-account@tonbo.sh
 ```
 
-The SSH user name is the Project qualified by its username; the signed public key identifies the Tonbo user and is checked against membership and IAM at connection time. The CLI resolves the Project name in `.tonbo` and prints the server-authoritative destination, so users never need to remember or assemble a username. The shell and HTTP turns may coexist on the singleton runtime, allowing the shell to observe the Agent while it works. Session writer fencing protects durable conversation history; ordinary workspace files retain Linux process concurrency semantics.
+The SSH user name is the Agent qualified by its username; the signed public key identifies the Tonbo user and is checked against membership and IAM at connection time. The CLI resolves the Agent name in `.tonbo` and prints the server-authoritative destination, so users never need to remember or assemble a username. The shell and HTTP turns may coexist on the singleton runtime, allowing the shell to observe the Agent while it works. Session writer fencing protects durable conversation history; ordinary workspace files retain Linux process concurrency semantics.
 
 Deploy does not create a hidden Session just to prewarm PI. The first real `tonbo run` starts the Session-bound PI RPC process; successful Turns keep that process hot, including across native Session switches. The process is disposable cache rather than durable state: pause, replacement and uncertain failures remove it, and the next Turn restores authority from the durable Session JSONL.
 
@@ -133,7 +133,7 @@ Deploy snapshots regular files under `.tonbo`, excluding `.git`, `node_modules`,
 
 ## Supported PI project shapes
 
-### 1. Project-local Agent
+### 1. Agent-local Agent
 
 Keep the normal PI project layout. Tonbo runs the same `AGENTS.md`, `.pi/APPEND_SYSTEM.md`, `.pi/settings.json`, `.pi/extensions`, `.pi/skills` and `.pi/prompts` that local `pi` loads:
 
@@ -182,7 +182,7 @@ model = "claude-sonnet-4-5"
 
 `tonbo deploy` runs the build command before creating the source snapshot. The entrypoint must keep stdout exclusively for PI RPC and send logs to stderr. It receives `PI_CODING_AGENT_MODULE`, `PI_CODING_AGENT_DIR`, `PI_CODING_AGENT_SESSION_DIR`, `TONBO_PI_SESSION_FILE`, `TONBO_PI_SESSION_ID`, `TONBO_PI_PROVIDER`, `TONBO_PI_MODEL` and `TONBO_PI_RPC_PROTOCOL`. Load the platform PI SDK from `PI_CODING_AGENT_MODULE`, open `TONBO_PI_SESSION_FILE`, create an `AgentSessionRuntime`, and pass it to `runRpcMode()`. This lets the app customize tools and runtime services without forking PI while preserving Tonbo's durable Session and Turn protocol.
 
-For a non-interactive invocation, provide a current Tonbo CLI OAuth access token; the committed `.tonbo` supplies the only Project context:
+For a non-interactive invocation, provide a current Tonbo CLI OAuth access token; the committed `.tonbo` supplies the only Agent context:
 
 ```console
 TONBO_ACCESS_TOKEN=... tonbo --json deploy
@@ -196,7 +196,7 @@ Node.js 22 or newer is required. Human OAuth tokens are stored at `${XDG_CONFIG_
 - [Design documentation map](../../docs/design/README.md)
 - [Agent source inspection and onboarding](../../docs/design/agent-source-onboarding.md)
 - [Shared source inspector](../../packages/agent-source-inspector/README.md)
-- [Project resource model](../../docs/design/project-resource-model.md)
-- [Project Deployments, Production and Rollouts](../../docs/design/project-deployments.md)
+- [Agent resource model](../../docs/design/project-resource-model.md)
+- [Agent Deployments, Production and Rollouts](../../docs/design/project-deployments.md)
 - [ADR-0008: Tonbo CLI onboarding and credential boundaries](../../apps/user-center/docs/decisions/adr-0008-tonbo-cli-onboarding.md)
 - [Management API v1](../../contracts/management/openapi-v1.yaml)

package/dist/bin/tonbo.js

@@ -52,7 +52,7 @@ var TonboApi = class {
   listProjects(oauthToken) {
     return requestJson(
       this.fetcher,
-      `${this.accountOrigin}/api/cli/projects`,
+      `${this.accountOrigin}/api/cli/agents`,
       {
         headers: { authorization: `Bearer ${oauthToken}` }
       }
@@ -70,7 +70,7 @@ var TonboApi = class {
   createProject(oauthToken, name, organizationId) {
     return requestJson(
       this.fetcher,
-      `${this.accountOrigin}/api/cli/projects`,
+      `${this.accountOrigin}/api/cli/agents`,
       {
         method: "POST",
         headers: {
@@ -116,7 +116,7 @@ var TonboApi = class {
   exchangeManagementToken(oauthToken, projectId) {
     return requestJson(
       this.fetcher,
-      `${this.accountOrigin}/api/cli/projects/${projectId}/token`,
+      `${this.accountOrigin}/api/cli/agents/${projectId}/token`,
       {
         method: "POST",
         headers: { authorization: `Bearer ${oauthToken}` }
@@ -136,7 +136,7 @@ var TonboApi = class {
       sha256: bundle.sha256,
       size_bytes: bundle.size_bytes
     };
-    const bundlesPath = `/v1/projects/${projectId}/source-bundles`;
+    const bundlesPath = `/v1/agents/${projectId}/source-bundles`;
     const prepared = await this.management("PUT", `${bundlesPath}/${bundle.sha256}`, token, {
       format: descriptor.format,
       size_bytes: descriptor.size_bytes
@@ -188,25 +188,25 @@ var TonboApi = class {
   createDeployment(projectId, body, token) {
     return this.management(
       "POST",
-      `/v1/projects/${projectId}/deployments`,
+      `/v1/agents/${projectId}/deployments`,
       token,
       body
     ).then((response) => response.data);
   }
   listDeployments(projectId, token) {
-    return this.managementList(`/v1/projects/${projectId}/deployments`, token);
+    return this.managementList(`/v1/agents/${projectId}/deployments`, token);
   }
   getDeployment(projectId, deploymentId, token) {
     return this.management(
       "GET",
-      `/v1/projects/${projectId}/deployments/${deploymentId}`,
+      `/v1/agents/${projectId}/deployments/${deploymentId}`,
       token
     ).then((response) => response.data);
   }
   getProduction(projectId, token) {
     return this.management(
       "GET",
-      `/v1/projects/${projectId}/production`,
+      `/v1/agents/${projectId}/production`,
       token
     ).then(
       (response) => response.data,
@@ -219,14 +219,14 @@ var TonboApi = class {
   putProduction(projectId, body, token) {
     return this.management(
       "PUT",
-      `/v1/projects/${projectId}/production`,
+      `/v1/agents/${projectId}/production`,
       token,
       body
     ).then((response) => response.data);
   }
   listRollouts(projectId, token) {
     return this.managementList(
-      `/v1/projects/${projectId}/production/rollouts`,
+      `/v1/agents/${projectId}/production/rollouts`,
       token
     );
   }
@@ -237,10 +237,10 @@ var TonboApi = class {
     token,
     turnId = randomUUID()
   }) {
-    const projectPath = `/v1/projects/${projectId}`;
+    const projectPath = `/v1/agents/${projectId}`;
     const production = await this.getProduction(projectId, token);
     if (!production)
-      throw new Error("Project has no Production Deployment; run `tonbo deploy` first.");
+      throw new Error("Agent has no Production Deployment; run `tonbo deploy` first.");
     if (production.observed_state !== "running")
       throw new Error(
         `Production is ${production.observed_state}${production.last_error ? ` (${production.last_error})` : ""}; wait for it to be running.`
@@ -269,21 +269,21 @@ var TonboApi = class {
   }) {
     return this.management(
       "GET",
-      `/v1/projects/${projectId}/sessions/${sessionId}/turns/${turnId}/events?after=${after}`,
+      `/v1/agents/${projectId}/sessions/${sessionId}/turns/${turnId}/events?after=${after}`,
       token
     );
   }
   listProjectSecrets(projectId, token) {
     return this.management(
       "GET",
-      `/v1/projects/${projectId}/secrets`,
+      `/v1/agents/${projectId}/secrets`,
       token
     ).then((body) => body.data);
   }
   setProjectSecret(projectId, name, value, token) {
     return this.management(
       "PUT",
-      `/v1/projects/${projectId}/secrets/${encodeURIComponent(name)}`,
+      `/v1/agents/${projectId}/secrets/${encodeURIComponent(name)}`,
       token,
       { value }
     );
@@ -291,7 +291,7 @@ var TonboApi = class {
   deleteProjectSecret(projectId, name, token) {
     return this.management(
       "DELETE",
-      `/v1/projects/${projectId}/secrets/${encodeURIComponent(name)}`,
+      `/v1/agents/${projectId}/secrets/${encodeURIComponent(name)}`,
       token
     );
   }
@@ -1315,7 +1315,7 @@ async function validatePackageSource(root, source) {
       throw error;
     }
     if (!metadata.isDirectory() || metadata.isSymbolicLink()) {
-      throw new Error(`Local PI package ${source} must resolve to a real project directory.`);
+      throw new Error(`Local PI package ${source} must resolve to a real agent directory.`);
     }
     return;
   }
@@ -1506,7 +1506,7 @@ function validateProjectName(name) {
   const valid = name.length >= PROJECT_NAME_RULE.minLength && name.length <= PROJECT_NAME_RULE.maxLength && PROJECT_NAME_PATTERN.test(name) && !RESERVED_PROJECT_NAMES.has(name);
   if (!valid) {
     throw new Error(
-      `Project name must be ${PROJECT_NAME_RULE.minLength}-${PROJECT_NAME_RULE.maxLength} lowercase letters, digits, or single hyphens, start with a letter, and not be reserved.`
+      `Agent name must be ${PROJECT_NAME_RULE.minLength}-${PROJECT_NAME_RULE.maxLength} lowercase letters, digits, or single hyphens, start with a letter, and not be reserved.`
     );
   }
 }
@@ -1526,7 +1526,7 @@ async function resolveProject(deps) {
   const root = await findDeclarationRoot(deps.cwd());
   const declaration = await loadDeclaration(root);
   if (!declaration.agent) {
-    throw new Error("No Project is configured in .tonbo. Run `tonbo project use <project>` first.");
+    throw new Error("No Agent is configured in .tonbo. Run `tonbo agent use <agent>` first.");
   }
   const oauthToken = await deps.auth.accessToken();
   return {
@@ -1541,10 +1541,10 @@ function selectProject(projects, selector) {
   const matches = projects.filter(
     (project) => project.id === selector || project.name === normalized || project.publicHostname === normalized
   );
-  if (matches.length === 0) throw new Error(`Project ${selector} was not found in your account.`);
+  if (matches.length === 0) throw new Error(`Agent ${selector} was not found in your account.`);
   if (matches.length > 1)
-    throw new Error(`Project name ${selector} is ambiguous; use its full hostname or ID.`);
-  if (matches[0].status !== "active") throw new Error(`Project ${selector} is not active.`);
+    throw new Error(`Agent name ${selector} is ambiguous; use its full hostname or ID.`);
+  if (matches[0].status !== "active") throw new Error(`Agent ${selector} is not active.`);
   return matches[0];
 }
 async function initCommand(deps, options) {
@@ -1618,7 +1618,7 @@ async function initCommand(deps, options) {
           value: "save"
         },
         {
-          description: "Change the project, Harness, execution mode, model, or SDK entrypoint.",
+          description: "Change the agent, Harness, execution mode, model, or SDK entrypoint.",
           name: "Edit configuration",
           value: "edit"
         },
@@ -1702,7 +1702,7 @@ async function initCommand(deps, options) {
   } catch (error) {
     if (createdProject) {
       throw new Error(
-        `Created project ${createdProject.name}, but could not write ${DECLARATION_FILENAME}. Fix the file and run \`tonbo project use ${createdProject.publicHostname}\`.`,
+        `Created agent ${createdProject.name}, but could not write ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${createdProject.publicHostname}\`.`,
         { cause: error }
       );
     }
@@ -1711,14 +1711,14 @@ async function initCommand(deps, options) {
   const driverSummary = driver === "command" ? `PI SDK app
 Build: ${buildCommand?.join(" ")}
 Entrypoint: node ${entry}` : inspection.pi.packageCount > 0 ? `PI CLI with ${inspection.pi.packageCount} package${inspection.pi.packageCount === 1 ? "" : "s"}` : "PI CLI";
-  const projectSummary = createdProject ? `Project: ${createdProject.name} (${createdProject.publicHostname})
+  const projectSummary = createdProject ? `Agent: ${createdProject.name} (${createdProject.publicHostname})
 Organization: ${createdProject.organizationName}
 Application: https://${createdProject.publicHostname}
-SSH after deploy: ssh ${createdProject.sshDestination}` : projectPlan.kind === "existing" ? `Project: ${projectPlan.name ? `${projectPlan.name} (${projectPlan.publicHostname})` : projectPlan.publicHostname}${projectPlan.organizationName ? `
+SSH after deploy: ssh ${createdProject.sshDestination}` : projectPlan.kind === "existing" ? `Agent: ${projectPlan.name ? `${projectPlan.name} (${projectPlan.publicHostname})` : projectPlan.publicHostname}${projectPlan.organizationName ? `
 Organization: ${projectPlan.organizationName}` : ""}${projectPlan.sshDestination ? `
-SSH after deploy: ssh ${projectPlan.sshDestination}` : ""}` : "Next: tonbo project create <name>";
+SSH after deploy: ssh ${projectPlan.sshDestination}` : ""}` : "Next: tonbo agent create <name>";
   deps.output({
-    message: `${createdProject ? `Created project ${createdProject.name} and` : exists ? "Updated" : "Created"} ${DECLARATION_FILENAME}.
+    message: `${createdProject ? `Created agent ${createdProject.name} and` : exists ? "Updated" : "Created"} ${DECLARATION_FILENAME}.
 ${projectSummary}
 Harness: PI
 Mode: ${driverSummary}${projectPlan.kind === "later" ? "" : "\nNext: tonbo deploy"}`,
@@ -1728,7 +1728,7 @@ Mode: ${driverSummary}${projectPlan.kind === "later" ? "" : "\nNext: tonbo deplo
 }
 function initSaveLabel(exists, project) {
   if (project.kind === "create") {
-    return exists ? `Create project and replace ${DECLARATION_FILENAME}` : `Create project and ${DECLARATION_FILENAME}`;
+    return exists ? `Create agent and replace ${DECLARATION_FILENAME}` : `Create agent and ${DECLARATION_FILENAME}`;
   }
   return exists ? `Replace ${DECLARATION_FILENAME}` : `Create ${DECLARATION_FILENAME}`;
 }
@@ -1737,16 +1737,16 @@ async function selectInitProject(deps, root) {
     const action = await deps.select("How should this Agent connect to Tonbo?", [
       {
         description: "Create it only after you confirm the complete configuration.",
-        name: "Create a new project",
+        name: "Create a new agent",
         value: "create"
       },
       {
-        description: "Bind this source tree to one project you can access.",
-        name: "Use an existing project",
+        description: "Bind this source tree to one agent you can access.",
+        name: "Use an existing agent",
         value: "existing"
       },
       {
-        description: "Write an unbound declaration and configure its project later.",
+        description: "Write an unbound declaration and configure its agent later.",
         name: "Set up later",
         value: "later"
       }
@@ -1756,7 +1756,7 @@ async function selectInitProject(deps, root) {
       const organization = await selectInitOrganization(deps);
       const defaultName = projectNameSuggestion(path4.basename(root)) || "tonbo-agent";
       for (; ; ) {
-        const answer = (await deps.prompt(`Project name [${defaultName}]: `)).trim().toLowerCase();
+        const answer = (await deps.prompt(`Agent name [${defaultName}]: `)).trim().toLowerCase();
         const name = answer || defaultName;
         try {
           validateProjectName(name);
@@ -1768,7 +1768,7 @@ async function selectInitProject(deps, root) {
           };
         } catch (error) {
           deps.output({
-            message: error instanceof Error ? error.message : "Project name is invalid."
+            message: error instanceof Error ? error.message : "Agent name is invalid."
           });
         }
       }
@@ -1778,11 +1778,11 @@ async function selectInitProject(deps, root) {
       (project2) => project2.status === "active"
     );
     if (projects.length === 0) {
-      deps.output({ message: "No active projects are available. Create a new project instead." });
+      deps.output({ message: "No active agents are available. Create a new agent instead." });
       continue;
     }
     const id = await deps.select(
-      "Which project should this Agent use?",
+      "Which agent should this Agent use?",
       projects.map((project2) => ({
         name: project2.name,
         description: `Organization: ${project2.organizationName} \xB7 ${project2.publicHostname} \xB7 ${project2.id}`,
@@ -1816,7 +1816,7 @@ async function selectInitOrganization(deps) {
     throw new Error("No organization lets you create a project. Ask an admin or owner.");
   if (organizations.length === 1) return organizations[0];
   const id = await deps.select(
-    "Which organization should own the new project?",
+    "Which organization should own the new agent?",
     organizations.map((organization) => ({
       description: organization.role,
       name: organization.name,
@@ -1829,7 +1829,7 @@ async function selectHarness(deps) {
   return await deps.select(
     "Which supported Harness should Tonbo use?",
     supportedHarnesses.map((supported) => ({
-      description: `Run this project with the ${supported.command} command.`,
+      description: `Run this agent with the ${supported.command} command.`,
       name: `${supported.name} (\`${supported.command}\`)`,
       value: supported.id
     }))
@@ -1843,7 +1843,7 @@ function renderInitSummary(project, harness, driver, model, entry, buildCommand)
   const lines = [
     "",
     "Tonbo Agent configuration:",
-    `  Project:       ${initProjectSummary(project)}`,
+    `  Agent:       ${initProjectSummary(project)}`,
     `  Harness:       ${harnessName(harness)}`,
     `  Execution:     ${driver === "native" ? "PI CLI (`pi`)" : "PI SDK app"}`,
     `  Model:         ${model}`
@@ -1935,7 +1935,7 @@ async function projectUseCommand(deps, selector, force = false) {
   const projects = await deps.api.listProjects(oauthToken);
   const project = selectProject(projects, selector);
   if (declaration.agent === project.publicHostname) {
-    deps.output({ message: `.tonbo already uses project ${project.publicHostname}.`, project });
+    deps.output({ message: `.tonbo already uses agent ${project.publicHostname}.`, project });
     return;
   }
   if (declaration.agent && !force) {
@@ -1943,7 +1943,7 @@ async function projectUseCommand(deps, selector, force = false) {
     const currentLabel = current?.publicHostname ?? declaration.agent;
     if (!deps.interactive()) {
       throw new Error(
-        `.tonbo already uses project ${currentLabel}. Pass --force to rebind it to ${project.publicHostname}.`
+        `.tonbo already uses agent ${currentLabel}. Pass --force to rebind it to ${project.publicHostname}.`
       );
     }
     const action = await deps.select(
@@ -1954,19 +1954,19 @@ async function projectUseCommand(deps, selector, force = false) {
       ]
     );
     if (action !== "rebind") {
-      deps.output({ message: `Cancelled. .tonbo still uses project ${currentLabel}.` });
+      deps.output({ message: `Cancelled. .tonbo still uses agent ${currentLabel}.` });
       return;
     }
   }
   await bindDeclarationProject(root, project.publicHostname);
-  deps.output({ message: `Bound .tonbo to project ${project.publicHostname}.`, project });
+  deps.output({ message: `Bound .tonbo to agent ${project.publicHostname}.`, project });
 }
 async function projectCreateCommand(deps, name) {
   const root = await findDeclarationRoot(deps.cwd());
   const declaration = await loadDeclaration(root);
   if (declaration.agent) {
     throw new Error(
-      `.tonbo is already bound to project ${declaration.agent}. Run \`tonbo project use <project>\` to review a rebind.`
+      `.tonbo is already bound to agent ${declaration.agent}. Run \`tonbo agent use <agent>\` to review a rebind.`
     );
   }
   const oauthToken = await deps.auth.accessToken();
@@ -1976,11 +1976,11 @@ async function projectCreateCommand(deps, name) {
     await bindDeclarationProject(root, project.publicHostname);
   } catch (error) {
     throw new Error(
-      `Created project ${project.name}, but could not bind ${DECLARATION_FILENAME}. Fix the file and run \`tonbo project use ${project.publicHostname}\`.`,
+      `Created agent ${project.name}, but could not bind ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${project.publicHostname}\`.`,
       { cause: error }
     );
   }
-  deps.output({ message: `Created project ${project.name} and bound it in .tonbo.`, project });
+  deps.output({ message: `Created agent ${project.name} and bound it in .tonbo.`, project });
 }
 async function deployCommand(deps, options = { promote: true }) {
   const { declaration, oauthToken, project, root } = await resolveProject(deps);
@@ -1999,7 +1999,7 @@ async function deployCommand(deps, options = { promote: true }) {
   const { deployment } = result;
   const shortId = shortDeploymentId(deployment.id);
   const lines = [
-    options.promote ? `Deployed project ${project.name}.` : `Created Deployment ${deploymentName(deployment)} (${shortId}) for project ${project.name} without promoting it.`,
+    options.promote ? `Deployed agent ${project.name}.` : `Created Deployment ${deploymentName(deployment)} (${shortId}) for agent ${project.name} without promoting it.`,
     `Organization: ${project.organizationName}`,
     `Deployment: ${deploymentName(deployment)} (${shortId})`,
     `Source: ${deploymentSourceLabel(deployment)}`,
@@ -2045,7 +2045,7 @@ async function projectShowCommand(deps) {
   const production = await deps.api.getProduction(project.id, token);
   const deployment = production ? await deps.api.getDeployment(project.id, production.deployment_id, token) : null;
   const lines = [
-    `project: ${project.name}`,
+    `agent: ${project.name}`,
     `Organization: ${project.organizationName}`,
     `application: https://${project.publicHostname}`,
     `ssh: ssh ${project.sshDestination}`
@@ -2124,7 +2124,7 @@ async function deploymentsListCommand(deps) {
       formatTimestamp(deployment.created_at),
       deployment.created_by_user_id ? shortDeploymentId(deployment.created_by_user_id) : ""
     ])
-  ) : `No Deployments exist for project ${project.name}. Run \`tonbo deploy\` to create one.`;
+  ) : `No Deployments exist for agent ${project.name}. Run \`tonbo deploy\` to create one.`;
   deps.output({ message, project, production, deployments });
 }
 async function deploymentsShowCommand(deps, prefix) {
@@ -2197,7 +2197,7 @@ async function deploymentsRollbackCommand(deps, prefix) {
     )?.previous_deployment_id;
     if (!previousId) {
       throw new Error(
-        `Project ${project.name} has no previous Production Deployment to roll back to. Name one with \`tonbo deployments rollback <id>\`.`
+        `Agent ${project.name} has no previous Production Deployment to roll back to. Name one with \`tonbo deployments rollback <id>\`.`
       );
     }
     target = await deps.api.getDeployment(project.id, previousId, token);
@@ -2229,7 +2229,7 @@ async function moveProduction(deps, projectId, target, token) {
 function describeProductionMove(project, move, verb) {
   const { deployment, previous } = move;
   const name = `${deploymentName(deployment)} (${shortDeploymentId(deployment.id)})`;
-  const headline = previous?.deployment_id === deployment.id ? `Deployment ${name} is already Production for project ${project.name}; requested it to be running.` : `${verb} ${name} to Production for project ${project.name}${previous ? ` (from ${shortDeploymentId(previous.deployment_id)})` : ""}.`;
+  const headline = previous?.deployment_id === deployment.id ? `Deployment ${name} is already Production for agent ${project.name}; requested it to be running.` : `${verb} ${name} to Production for agent ${project.name}${previous ? ` (from ${shortDeploymentId(previous.deployment_id)})` : ""}.`;
   return `${headline}
 Production: ${productionStateLabel(deployment)}
 Application: https://${project.publicHostname}`;
@@ -2245,7 +2245,7 @@ async function secretListCommand(deps) {
   const { project, token } = await projectManagement(deps);
   const secrets = await deps.api.listProjectSecrets(project.id, token);
   deps.output({
-    message: secrets.length ? secrets.map((secret) => secret.name).join("\n") : "No project secrets are configured.",
+    message: secrets.length ? secrets.map((secret) => secret.name).join("\n") : "No agent secrets are configured.",
     project,
     secrets
   });
@@ -2255,7 +2255,7 @@ async function secretSetCommand(deps, name, options) {
   const { project, token } = await projectManagement(deps);
   const secret = await deps.api.setProjectSecret(project.id, name, value, token);
   deps.output({
-    message: `Set project secret ${secret.name}. Redeploy to replace the active runtime with this value.`,
+    message: `Set agent secret ${secret.name}. Redeploy to replace the active runtime with this value.`,
     project,
     secret
   });
@@ -2263,7 +2263,7 @@ async function secretSetCommand(deps, name, options) {
 async function secretRemoveCommand(deps, name) {
   const { project, token } = await projectManagement(deps);
   await deps.api.deleteProjectSecret(project.id, name, token);
-  deps.output({ message: `Removed project secret ${name}.`, project, name });
+  deps.output({ message: `Removed agent secret ${name}.`, project, name });
 }
 
 // src/credentials.ts
@@ -2523,7 +2523,7 @@ function jsonOutput(program) {
   return program.opts().json === true;
 }
 function createProgram(dependencies = createDependencies) {
-  const program = new Command().name("tonbo").description("Deploy a persistent Project Agent to Tonbo.").version(packageVersion.version).option("--json", "print machine-readable JSON");
+  const program = new Command().name("tonbo").description("Deploy a persistent Agent Agent to Tonbo.").version(packageVersion.version).option("--json", "print machine-readable JSON");
   program.command("init").description("interactively create a Tonbo Agent declaration in this directory").option("--harness <harness>", "Agent Harness (currently pi)").option("--model <model>", "inference model").option("--driver <driver>", "PI driver: native or command").option("--agent-entry <file>", "Node entry file for the command driver").option("--build-command <argv...>", "build command argv for the command driver").option("--force", `replace an existing ${DECLARATION_FILENAME}`).action(
     async (options) => initCommand(dependencies(jsonOutput(program)), options)
   );
@@ -2583,21 +2583,21 @@ function createProgram(dependencies = createDependencies) {
       })
     );
   });
-  const project = program.command("project").description("manage the project bound to this Agent directory");
-  project.command("create <name>").description("create and bind a project to this Agent directory").action(async (name) => projectCreateCommand(dependencies(jsonOutput(program)), name));
-  const sshKey = program.command("ssh-key").description("manage public keys used by native project SSH");
+  const project = program.command("agent").description("manage the agent bound to this Agent directory");
+  project.command("create <name>").description("create and bind a agent to this Agent directory").action(async (name) => projectCreateCommand(dependencies(jsonOutput(program)), name));
+  const sshKey = program.command("ssh-key").description("manage public keys used by native agent SSH");
   sshKey.command("add <public-key>").description("register an OpenSSH public key with the current Tonbo account").action(async (path6) => sshKeyAddCommand(dependencies(jsonOutput(program)), path6));
   sshKey.command("remove <fingerprint>").description("revoke an SSH public key from the current Tonbo account").action(
     async (fingerprint) => sshKeyRemoveCommand(dependencies(jsonOutput(program)), fingerprint)
   );
-  project.command("use <project>").description("write a project ID into this Agent's .tonbo declaration").option("--force", "replace an existing project binding without confirmation").action(
+  project.command("use <agent>").description("write a agent ID into this Agent's .tonbo declaration").option("--force", "replace an existing agent binding without confirmation").action(
     async (selector, options) => projectUseCommand(dependencies(jsonOutput(program)), selector, options.force === true)
   );
-  project.command("show").description("show the project bound to this Agent directory and its connection addresses").action(async () => projectShowCommand(dependencies(jsonOutput(program))));
+  project.command("show").description("show the agent bound to this Agent directory and its connection addresses").action(async () => projectShowCommand(dependencies(jsonOutput(program))));
   program.command("deploy").description("upload this directory as a new Deployment and promote it to Production").option("--no-promote", "create the Deployment without moving Production").action(
     async (options) => deployCommand(dependencies(jsonOutput(program)), { promote: options.promote })
   );
-  const deployments = program.command("deployments").description("list and move between the immutable Deployments of the bound project");
+  const deployments = program.command("deployments").description("list and move between the immutable Deployments of the bound agent");
   deployments.command("list", { isDefault: true }).description("list Deployments, newest first").action(async () => deploymentsListCommand(dependencies(jsonOutput(program))));
   deployments.command("show <deployment>").description("show one Deployment and its Rollouts by id prefix").action(
     async (prefix) => deploymentsShowCommand(dependencies(jsonOutput(program)), prefix)
@@ -2608,10 +2608,10 @@ function createProgram(dependencies = createDependencies) {
   deployments.command("rollback [deployment]").description("move Production back to the previous Production Deployment, or to a named one").action(
     async (prefix) => deploymentsRollbackCommand(dependencies(jsonOutput(program)), prefix)
   );
-  program.command("run <prompt>").description("run one prompt in a durable project session").option("--session <session>", "resume an existing Agent Session UUID").action(
+  program.command("run <prompt>").description("run one prompt in a durable agent session").option("--session <session>", "resume an existing Agent Session UUID").action(
     async (prompt, options) => runCommand(dependencies(jsonOutput(program)), prompt, options)
   );
-  const secret = program.command("secret").description("manage encrypted environment secrets for the project service");
+  const secret = program.command("secret").description("manage encrypted environment secrets for the agent service");
   secret.command("list").action(async () => secretListCommand(dependencies(jsonOutput(program))));
   secret.command("set <name>").description("set a secret from an environment variable (the same name by default)").option("--from-env <name>", "read the value from another environment variable").action(
     async (name, options) => secretSetCommand(dependencies(jsonOutput(program)), name, options)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.1.0",
-  "description": "Deploy one persistent Agent per Project from the command line.",
+  "version": "0.1.1",
+  "description": "Deploy persistent Agents and manage their Machines from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {
     "url": "https://github.com/tonbo-io/cloud/issues"