@tonbo/cli 0.1.2 → 0.2.0

package/README.md

@@ -12,11 +12,11 @@ The CLI deploys an Agent directly from a local directory without requiring Git o
 ```console
 tonbo login
 tonbo init
-No Harness-specific configuration was found in this project.
+No Harness-specific configuration was found in this agent.
 ? Which supported Harness should Tonbo use?
-❯ PI (`pi`)  Run this project with the pi command.
+❯ PI (`pi`)  Run this agent with the pi command.
 ? How should this Agent connect to Tonbo?
-❯ Create a new project  Create it only after you confirm the complete configuration.
+❯ Create a new agent  Create it only after you confirm the complete configuration.
   Use an existing agent
   Set up later
 ? Agent name [my-agent]:
@@ -26,11 +26,11 @@ Tonbo Agent configuration:
   Harness:       PI
   Execution:     PI CLI (`pi`)
   Model:         claude-sonnet-4-5
-? Create project and .tonbo with this configuration?
-❯ Create project and .tonbo
-  Edit configuration  Change the project, Harness, execution mode, model, or SDK entrypoint.
+? Create agent and .tonbo with this configuration?
+❯ Create agent and .tonbo
+  Edit configuration  Change the agent, Harness, execution mode, model, or SDK entrypoint.
   Cancel
-Created project my-agent and .tonbo.
+Created agent my-agent and .tonbo.
 Agent: my-agent (my-agent-my-account.tonbo.sh)
 Organization: my-account
 Application: https://my-agent-my-account.tonbo.sh
@@ -39,7 +39,7 @@ Mode: PI CLI
 Next: tonbo deploy
 ```
 
-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.
+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 agent 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:
 
@@ -59,14 +59,14 @@ kind = "native"
 model = "claude-sonnet-4-5"
 ```
 
-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 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 `agent-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 `agent use`:
 
 ```console
 tonbo init --harness pi --driver native
 tonbo init --harness pi --driver command --agent-entry dist/agent.mjs
-tonbo agent use my-project-my-account.tonbo.sh
+tonbo agent use my-agent-my-account.tonbo.sh
 ```
 
 After interactive initialization, deploy the current contents:
@@ -88,12 +88,12 @@ Every `tonbo deploy` creates one immutable Deployment: the uploaded source, the
 
 ```console
 $ tonbo deploy
-Deployed project my-project.
+Deployed agent my-agent.
 Organization: my-account
 Deployment: Fix greeting (0f3a7c21)
 Source: 0123456 · main
 Production: promoting (generation 4)
-Application: https://my-project-my-account.tonbo.sh
+Application: https://my-agent-my-account.tonbo.sh
 
 Agent process: starts with the first turn and stays warm while the runtime is active.
 
@@ -101,7 +101,7 @@ Start the Agent:
   tonbo run "<prompt>"
 
 Connect with SSH:
-  ssh my-project.my-account@tonbo.sh
+  ssh my-agent.my-account@tonbo.sh
 ```
 
 When the new Deployment has the same contents as the Production Deployment it replaces, `deploy` says so; the record is still created. `tonbo deploy --no-promote` creates the Deployment without moving Production, for example to stage a build and promote it later:
@@ -120,7 +120,7 @@ tonbo deployments rollback 9b8c1d22    # or to a named one
 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
+ssh my-agent.my-account@tonbo.sh
 ```
 
 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.
@@ -131,11 +131,11 @@ The platform injects scoped inference access and owns PI Session capture. Do not
 
 Deploy snapshots regular files under `.tonbo`, excluding `.git`, `node_modules`, PI package caches, local environment files and patterns in `.tonboignore`. Coding tools start in the persistent Artifacts workspace, while `AGENTS.md` and trusted `.pi` extensions, skills, prompts and settings load from the Deployment's uploaded source.
 
-## Supported PI project shapes
+## Supported PI agent shapes
 
 ### 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:
+Keep the normal PI agent 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:
 
 ```console
 pi
@@ -144,9 +144,9 @@ tonbo deploy
 tonbo run "Start the task."
 ```
 
-### 2. PI Package project
+### 2. PI Package agent
 
-Use PI's project-local package declaration as the single source of truth. A package is a PI resource, not another Tonbo execution mode: `tonbo init` recognizes `.pi/settings.json`, then the native PI driver loads the packages. Install an immutable package reference locally, verify it with PI, and deploy the project; Tonbo excludes `.pi/npm` and `.pi/git` caches and restores packages inside the isolated runtime:
+Use PI's agent-local package declaration as the single source of truth. A package is a PI resource, not another Tonbo execution mode: `tonbo init` recognizes `.pi/settings.json`, then the native PI driver loads the packages. Install an immutable package reference locally, verify it with PI, and deploy the agent; Tonbo excludes `.pi/npm` and `.pi/git` caches and restores packages inside the isolated runtime:
 
 ```console
 pi install -l npm:@acme/my-pi-agent@1.2.3
@@ -196,8 +196,8 @@ 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)
-- [Agent resource model](../../docs/design/project-resource-model.md)
-- [Agent Deployments, Production and Rollouts](../../docs/design/project-deployments.md)
+- [Agent resource model](../../docs/design/agent-resource-model.md)
+- [Agent Deployments, Production and Rollouts](../../docs/design/agent-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)
 
@@ -217,4 +217,4 @@ tonbo --json machine release <machine-uuid>
 
 Only one active Agent binding per Machine and one Machine per Agent are currently supported. Unbinding drains execution and completes physical deletion, final usage settlement and storage credential revocation before the Machine becomes available. Wait for `available: true` in `machine show` before rebinding. Cross-Agent reassignment resets rootfs; the destination mounts its own Agent Workspace and Sessions. Hidden pause/resume within the same Agent retains rootfs and process state. Release also drains an existing binding automatically; it does not delete Agent files or Sessions.
 
-`tonbo agent list` lists accessible Agents without requiring a local `.tonbo` file. JSON command output uses `agent` for one Agent and `agents` for the list; there is no duplicate `project` output alias.
+`tonbo agent list` lists accessible Agents without requiring a local `.tonbo` file. JSON command output uses `agent` for one Agent and `agents` for the list; there is no duplicate `agent` output alias.

package/dist/bin/tonbo.js

@@ -49,14 +49,14 @@ var TonboApi = class {
       ...body === void 0 ? {} : { body: JSON.stringify(body) }
     });
   }
-  listProjects(oauthToken) {
+  listAgents(oauthToken) {
     return requestJson(
       this.fetcher,
       `${this.accountOrigin}/api/cli/agents`,
       {
         headers: { authorization: `Bearer ${oauthToken}` }
       }
-    ).then((body) => body.projects);
+    ).then((body) => body.agents);
   }
   listOrganizations(oauthToken) {
     return requestJson(
@@ -67,7 +67,7 @@ var TonboApi = class {
       }
     ).then((body) => body.organizations);
   }
-  createProject(oauthToken, name, organizationId) {
+  createAgent(oauthToken, name, organizationId) {
     return requestJson(
       this.fetcher,
       `${this.accountOrigin}/api/cli/agents`,
@@ -79,7 +79,7 @@ var TonboApi = class {
         },
         body: JSON.stringify(organizationId ? { name, orgId: organizationId } : { name })
       }
-    ).then((body) => body.project);
+    ).then((body) => body.agent);
   }
   registerSshKey(oauthToken, key) {
     return requestJson(
@@ -113,10 +113,10 @@ var TonboApi = class {
       }
     ).then((body) => body.key);
   }
-  exchangeManagementToken(oauthToken, projectId) {
+  exchangeManagementToken(oauthToken, agentId) {
     return requestJson(
       this.fetcher,
-      `${this.accountOrigin}/api/cli/agents/${projectId}/token`,
+      `${this.accountOrigin}/api/cli/agents/${agentId}/token`,
       {
         method: "POST",
         headers: { authorization: `Bearer ${oauthToken}` }
@@ -126,7 +126,7 @@ var TonboApi = class {
   async deploy({
     bundle,
     origin,
-    projectId,
+    agentId,
     promote,
     spec,
     token
@@ -136,7 +136,7 @@ var TonboApi = class {
       sha256: bundle.sha256,
       size_bytes: bundle.size_bytes
     };
-    const bundlesPath = `/v1/agents/${projectId}/source-bundles`;
+    const bundlesPath = `/v1/agents/${agentId}/source-bundles`;
     const prepared = await this.management("PUT", `${bundlesPath}/${bundle.sha256}`, token, {
       format: descriptor.format,
       size_bytes: descriptor.size_bytes
@@ -166,14 +166,14 @@ var TonboApi = class {
         throw error;
       }
     }
-    let deployment = await this.createDeployment(projectId, { spec, origin }, token);
-    const previous = await this.getProduction(projectId, token);
-    const previousDeployment = previous ? await this.getDeployment(projectId, previous.deployment_id, token) : null;
+    let deployment = await this.createDeployment(agentId, { spec, origin }, token);
+    const previous = await this.getProduction(agentId, token);
+    const previousDeployment = previous ? await this.getDeployment(agentId, previous.deployment_id, token) : null;
     const unchanged = previousDeployment?.spec_sha256 === deployment.spec_sha256;
     let production = previous;
     if (promote) {
       production = await this.putProduction(
-        projectId,
+        agentId,
         {
           deployment_id: deployment.id,
           desired_state: "running",
@@ -181,32 +181,32 @@ var TonboApi = class {
         },
         token
       );
-      deployment = await this.getDeployment(projectId, deployment.id, token);
+      deployment = await this.getDeployment(agentId, deployment.id, token);
     }
     return { deployment, production, unchanged };
   }
-  createDeployment(projectId, body, token) {
+  createDeployment(agentId, body, token) {
     return this.management(
       "POST",
-      `/v1/agents/${projectId}/deployments`,
+      `/v1/agents/${agentId}/deployments`,
       token,
       body
     ).then((response) => response.data);
   }
-  listDeployments(projectId, token) {
-    return this.managementList(`/v1/agents/${projectId}/deployments`, token);
+  listDeployments(agentId, token) {
+    return this.managementList(`/v1/agents/${agentId}/deployments`, token);
   }
-  getDeployment(projectId, deploymentId, token) {
+  getDeployment(agentId, deploymentId, token) {
     return this.management(
       "GET",
-      `/v1/agents/${projectId}/deployments/${deploymentId}`,
+      `/v1/agents/${agentId}/deployments/${deploymentId}`,
       token
     ).then((response) => response.data);
   }
-  getProduction(projectId, token) {
+  getProduction(agentId, token) {
     return this.management(
       "GET",
-      `/v1/agents/${projectId}/production`,
+      `/v1/agents/${agentId}/production`,
       token
     ).then(
       (response) => response.data,
@@ -216,44 +216,38 @@ var TonboApi = class {
       }
     );
   }
-  putProduction(projectId, body, token) {
+  putProduction(agentId, body, token) {
     return this.management(
       "PUT",
-      `/v1/agents/${projectId}/production`,
+      `/v1/agents/${agentId}/production`,
       token,
       body
     ).then((response) => response.data);
   }
-  listRollouts(projectId, token) {
-    return this.managementList(
-      `/v1/agents/${projectId}/production/rollouts`,
-      token
-    );
+  listRollouts(agentId, token) {
+    return this.managementList(`/v1/agents/${agentId}/production/rollouts`, token);
   }
   async run({
-    projectId,
+    agentId,
     prompt,
     sessionId,
     token,
     turnId = randomUUID()
   }) {
-    const projectPath = `/v1/agents/${projectId}`;
-    const production = await this.getProduction(projectId, token);
+    const agentPath = `/v1/agents/${agentId}`;
+    const production = await this.getProduction(agentId, token);
     if (!production)
       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.`
       );
-    const session = sessionId ? { id: sessionId } : (await this.management(
-      "POST",
-      `${projectPath}/sessions`,
-      token,
-      { deployment_id: production.deployment_id }
-    )).data;
+    const session = sessionId ? { id: sessionId } : (await this.management("POST", `${agentPath}/sessions`, token, {
+      deployment_id: production.deployment_id
+    })).data;
     const turn = (await this.management(
       "POST",
-      `${projectPath}/sessions/${session.id}/turns`,
+      `${agentPath}/sessions/${session.id}/turns`,
       token,
       { prompt },
       turnId
@@ -262,36 +256,36 @@ var TonboApi = class {
   }
   turnEvents({
     after = 0,
-    projectId,
+    agentId,
     sessionId,
     token,
     turnId
   }) {
     return this.management(
       "GET",
-      `/v1/agents/${projectId}/sessions/${sessionId}/turns/${turnId}/events?after=${after}`,
+      `/v1/agents/${agentId}/sessions/${sessionId}/turns/${turnId}/events?after=${after}`,
       token
     );
   }
-  listProjectSecrets(projectId, token) {
+  listAgentSecrets(agentId, token) {
     return this.management(
       "GET",
-      `/v1/agents/${projectId}/secrets`,
+      `/v1/agents/${agentId}/secrets`,
       token
     ).then((body) => body.data);
   }
-  setProjectSecret(projectId, name, value, token) {
+  setAgentSecret(agentId, name, value, token) {
     return this.management(
       "PUT",
-      `/v1/agents/${projectId}/secrets/${encodeURIComponent(name)}`,
+      `/v1/agents/${agentId}/secrets/${encodeURIComponent(name)}`,
       token,
       { value }
     );
   }
-  deleteProjectSecret(projectId, name, token) {
+  deleteAgentSecret(agentId, name, token) {
     return this.management(
       "DELETE",
-      `/v1/agents/${projectId}/secrets/${encodeURIComponent(name)}`,
+      `/v1/agents/${agentId}/secrets/${encodeURIComponent(name)}`,
       token
     );
   }
@@ -879,10 +873,10 @@ var piAgentSchema = {
     }
   }
 };
-var projectServiceSchema = {
+var agentServiceSchema = {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://contracts.tonbo.dev/agents/project-service-v1.schema.json",
-  "title": "Tonbo Project application service v1",
+  "$id": "https://contracts.tonbo.dev/agents/agent-service-v1.schema.json",
+  "title": "Tonbo Agent application service v1",
   "type": "object",
   "additionalProperties": false,
   "required": [
@@ -982,10 +976,10 @@ var declarationSchema = {
       }
     },
     "service": {
-      "$ref": "https://contracts.tonbo.dev/agents/project-service-v1.schema.json"
+      "$ref": "https://contracts.tonbo.dev/agents/agent-service-v1.schema.json"
     },
     "agent": {
-      "$ref": "https://contracts.tonbo.dev/agents/project-name-v1.json#/$defs/publicHostname"
+      "$ref": "https://contracts.tonbo.dev/agents/agent-name-v1.json#/$defs/publicHostname"
     },
     "harness": {
       "$ref": "https://contracts.tonbo.dev/agents/pi-agent-v1.schema.json"
@@ -995,7 +989,7 @@ var declarationSchema = {
 var deploymentSchema = {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://contracts.tonbo.dev/agents/managed-deployment-v1.schema.json",
-  "title": "Managed Project Deployment v1",
+  "title": "Managed Agent Deployment v1",
   "type": "object",
   "additionalProperties": false,
   "required": [
@@ -1049,7 +1043,7 @@ var deploymentSchema = {
       }
     },
     "service": {
-      "$ref": "https://contracts.tonbo.dev/agents/project-service-v1.schema.json"
+      "$ref": "https://contracts.tonbo.dev/agents/agent-service-v1.schema.json"
     }
   }
 };
@@ -1073,12 +1067,12 @@ var piSessionContract = {
     "session-preflight"
   ]
 };
-var projectNameContract = {
+var agentNameContract = {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://contracts.tonbo.dev/agents/project-name-v1.json",
+  "$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": "<project>-<organization>.tonbo.sh",
+  "x-tonbo-public-hostname-template": "<agent>-<organization>.tonbo.sh",
   "$defs": {
     "name": {
       "type": "string",
@@ -1129,8 +1123,8 @@ ajv.addKeyword({ keyword: "x-tonbo-public-hostname-apex" });
 ajv.addKeyword({ keyword: "x-tonbo-public-hostname-template" });
 ajv.addSchema(kubernetesProfilesSchema);
 ajv.addSchema(piAgentSchema);
-ajv.addSchema(projectNameContract);
-ajv.addSchema(projectServiceSchema);
+ajv.addSchema(agentNameContract);
+ajv.addSchema(agentServiceSchema);
 var validateDeclaration = ajv.compile(declarationSchema);
 var validateDeploymentSpec = ajv.compile(deploymentSchema);
 function validationMessage(label, errors) {
@@ -1157,10 +1151,10 @@ import path2 from "node:path";
 import { parse, stringify } 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, projectHostname) {
+function createDeclaration(model = DEFAULT_INFERENCE_MODEL, driver = { kind: "native" }, buildCommand, agentHostname) {
   return parseDeclaration({
     version: 2,
-    ...projectHostname ? { agent: projectHostname } : {},
+    ...agentHostname ? { agent: agentHostname } : {},
     harness: { runtime: "pi", driver },
     inference: { model: model.trim() },
     ...buildCommand ? { build: { command: buildCommand } } : {}
@@ -1171,9 +1165,9 @@ function renderDeclaration(declaration) {
 # Edit this file directly or run \`tonbo init\` to reconfigure.
 ${stringify(declaration)}`;
 }
-async function bindDeclarationProject(root, projectHostname) {
+async function bindDeclarationAgent(root, agentHostname) {
   const declaration = await loadDeclaration(root);
-  const bound = parseDeclaration({ ...declaration, agent: projectHostname });
+  const bound = parseDeclaration({ ...declaration, agent: agentHostname });
   await saveDeclaration(root, bound, true);
   return bound;
 }
@@ -1303,7 +1297,7 @@ async function validatePackageSource(root, source) {
     const resolved = path3.resolve(settingsDirectory, source);
     const relative = path3.relative(root, resolved);
     if (relative === ".." || relative.startsWith(`..${path3.sep}`) || path3.isAbsolute(relative)) {
-      throw new Error(`Local PI package ${source} resolves outside the deployed project.`);
+      throw new Error(`Local PI package ${source} resolves outside the deployed agent.`);
     }
     let metadata;
     try {
@@ -1320,7 +1314,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 project-local path.`
+    `PI package ${source} must use an exact npm version, a full Git commit, or a agent-local path.`
   );
 }
 async function validatePiPackages(root) {
@@ -1498,31 +1492,31 @@ async function readDefaultSshPublicKeys(sshDirectory = join(homedir(), ".ssh"))
   return keys;
 }
 
-// src/project-name.ts
-var PROJECT_NAME_RULE = projectNameContract.$defs.name;
-var PROJECT_NAME_PATTERN = new RegExp(PROJECT_NAME_RULE.pattern);
-var RESERVED_PROJECT_NAMES = new Set(PROJECT_NAME_RULE.not.enum);
-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);
+// src/agent-name.ts
+var AGENT_NAME_RULE = agentNameContract.$defs.name;
+var AGENT_NAME_PATTERN = new RegExp(AGENT_NAME_RULE.pattern);
+var RESERVED_AGENT_NAMES = new Set(AGENT_NAME_RULE.not.enum);
+function validateAgentName(name) {
+  const valid = name.length >= AGENT_NAME_RULE.minLength && name.length <= AGENT_NAME_RULE.maxLength && AGENT_NAME_PATTERN.test(name) && !RESERVED_AGENT_NAMES.has(name);
   if (!valid) {
     throw new Error(
-      `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.`
+      `Agent name must be ${AGENT_NAME_RULE.minLength}-${AGENT_NAME_RULE.maxLength} lowercase letters, digits, or single hyphens, start with a letter, and not be reserved.`
     );
   }
 }
-function projectNameSuggestion(value) {
+function agentNameSuggestion(value) {
   let name = value.normalize("NFKD").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").replace(/-+/g, "-");
   if (!/^[a-z]/.test(name)) name = `agent-${name}`;
-  name = name.slice(0, PROJECT_NAME_RULE.maxLength).replace(/-+$/g, "");
-  if (name.length < PROJECT_NAME_RULE.minLength) {
-    name = `${name || "agent"}-agent`.slice(0, PROJECT_NAME_RULE.maxLength);
+  name = name.slice(0, AGENT_NAME_RULE.maxLength).replace(/-+$/g, "");
+  if (name.length < AGENT_NAME_RULE.minLength) {
+    name = `${name || "agent"}-agent`.slice(0, AGENT_NAME_RULE.maxLength);
   }
-  if (RESERVED_PROJECT_NAMES.has(name)) name = `${name}-agent`;
+  if (RESERVED_AGENT_NAMES.has(name)) name = `${name}-agent`;
   return name;
 }
 
 // src/commands.ts
-async function resolveProject(deps) {
+async function resolveAgent(deps) {
   const root = await findDeclarationRoot(deps.cwd());
   const declaration = await loadDeclaration(root);
   if (!declaration.agent) {
@@ -1532,14 +1526,14 @@ async function resolveProject(deps) {
   return {
     declaration,
     oauthToken,
-    project: selectProject(await deps.api.listProjects(oauthToken), declaration.agent),
+    agent: selectAgent(await deps.api.listAgents(oauthToken), declaration.agent),
     root
   };
 }
-function selectProject(projects, selector) {
+function selectAgent(agents, selector) {
   const normalized = selector.toLowerCase();
-  const matches = projects.filter(
-    (project) => project.id === selector || project.name === normalized || project.publicHostname === normalized
+  const matches = agents.filter(
+    (agent) => agent.id === selector || agent.name === normalized || agent.publicHostname === normalized
   );
   if (matches.length === 0) throw new Error(`Agent ${selector} was not found in your account.`);
   if (matches.length > 1)
@@ -1573,7 +1567,7 @@ async function initCommand(deps, options) {
       throw new Error("No Harness-specific configuration found. Pass --harness pi.");
     } else {
       deps.output({
-        message: "No Harness-specific configuration was found in this project."
+        message: "No Harness-specific configuration was found in this agent."
       });
       harness = await selectHarness(deps);
     }
@@ -1599,19 +1593,19 @@ async function initCommand(deps, options) {
   entry ||= "dist/agent.mjs";
   let model = options.model?.trim() || existingDeclaration?.inference.model || DEFAULT_INFERENCE_MODEL;
   let buildCommand = driver === "command" ? options.buildCommand ?? existingDeclaration?.build?.command ?? ["npm", "run", "build"] : void 0;
-  let projectPlan = existingDeclaration?.agent ? {
+  let agentPlan = existingDeclaration?.agent ? {
     kind: "existing",
     publicHostname: existingDeclaration.agent
   } : { kind: "later" };
   if (interactive && !existingDeclaration?.agent) {
-    projectPlan = await selectInitProject(deps, root);
+    agentPlan = await selectInitAgent(deps, root);
   }
   if (interactive) {
     while (true) {
       deps.output({
-        message: renderInitSummary(projectPlan, harness, driver, model, entry, buildCommand)
+        message: renderInitSummary(agentPlan, harness, driver, model, entry, buildCommand)
       });
-      const saveLabel = initSaveLabel(exists, projectPlan);
+      const saveLabel = initSaveLabel(exists, agentPlan);
       const action = await deps.select(`${saveLabel} with this configuration?`, [
         {
           name: saveLabel,
@@ -1633,9 +1627,9 @@ async function initCommand(deps, options) {
       if (action === "save") break;
       const setting = await deps.select("What would you like to change?", [
         {
-          description: initProjectSummary(projectPlan),
-          name: "Project",
-          value: "project"
+          description: initAgentSummary(agentPlan),
+          name: "Agent",
+          value: "agent"
         },
         { description: harnessName(harness), name: "Harness", value: "harness" },
         {
@@ -1647,7 +1641,7 @@ async function initCommand(deps, options) {
         ...driver === "command" ? [{ description: entry, name: "PI SDK entry file", value: "entry" }] : [],
         { name: "Back to review", value: "back" }
       ]);
-      if (setting === "project") projectPlan = await selectInitProject(deps, root);
+      if (setting === "agent") agentPlan = await selectInitAgent(deps, root);
       if (setting === "harness") harness = await selectHarness(deps);
       if (setting === "driver") {
         driver = await deps.select(
@@ -1672,22 +1666,18 @@ async function initCommand(deps, options) {
       }
     }
   }
-  let projectHostname = projectPlan.kind === "existing" ? projectPlan.publicHostname : void 0;
-  let createdProject;
-  if (projectPlan.kind === "create") {
+  let agentHostname = agentPlan.kind === "existing" ? agentPlan.publicHostname : void 0;
+  let createdAgent;
+  if (agentPlan.kind === "create") {
     const oauthToken = await deps.auth.accessToken();
-    createdProject = await deps.api.createProject(
-      oauthToken,
-      projectPlan.name,
-      projectPlan.organizationId
-    );
-    projectHostname = createdProject.publicHostname;
+    createdAgent = await deps.api.createAgent(oauthToken, agentPlan.name, agentPlan.organizationId);
+    agentHostname = createdAgent.publicHostname;
   }
   const configuredDeclaration = createDeclaration(
     model,
     driver === "native" ? { kind: "native" } : { kind: "command", protocol: "pi-rpc-v1", command: ["node", entry] },
     buildCommand,
-    projectHostname
+    agentHostname
   );
   const declaration = parseDeclaration({
     ...configuredDeclaration,
@@ -1700,9 +1690,9 @@ async function initCommand(deps, options) {
   try {
     await saveDeclaration(root, declaration, overwrite);
   } catch (error) {
-    if (createdProject) {
+    if (createdAgent) {
       throw new Error(
-        `Created agent ${createdProject.name}, but could not write ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${createdProject.publicHostname}\`.`,
+        `Created agent ${createdAgent.name}, but could not write ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${createdAgent.publicHostname}\`.`,
         { cause: error }
       );
     }
@@ -1711,28 +1701,28 @@ 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 ? `Agent: ${createdProject.name} (${createdProject.publicHostname})
-Organization: ${createdProject.organizationName}
-Application: https://${createdProject.publicHostname}
-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 agent create <name>";
+  const agentSummary = createdAgent ? `Agent: ${createdAgent.name} (${createdAgent.publicHostname})
+Organization: ${createdAgent.organizationName}
+Application: https://${createdAgent.publicHostname}
+SSH after deploy: ssh ${createdAgent.sshDestination}` : agentPlan.kind === "existing" ? `Agent: ${agentPlan.name ? `${agentPlan.name} (${agentPlan.publicHostname})` : agentPlan.publicHostname}${agentPlan.organizationName ? `
+Organization: ${agentPlan.organizationName}` : ""}${agentPlan.sshDestination ? `
+SSH after deploy: ssh ${agentPlan.sshDestination}` : ""}` : "Next: tonbo agent create <name>";
   deps.output({
-    message: `${createdProject ? `Created agent ${createdProject.name} and` : exists ? "Updated" : "Created"} ${DECLARATION_FILENAME}.
-${projectSummary}
+    message: `${createdAgent ? `Created agent ${createdAgent.name} and` : exists ? "Updated" : "Created"} ${DECLARATION_FILENAME}.
+${agentSummary}
 Harness: PI
-Mode: ${driverSummary}${projectPlan.kind === "later" ? "" : "\nNext: tonbo deploy"}`,
+Mode: ${driverSummary}${agentPlan.kind === "later" ? "" : "\nNext: tonbo deploy"}`,
     declaration,
     path: path4.join(root, DECLARATION_FILENAME)
   });
 }
-function initSaveLabel(exists, project) {
-  if (project.kind === "create") {
+function initSaveLabel(exists, agent) {
+  if (agent.kind === "create") {
     return exists ? `Create agent and replace ${DECLARATION_FILENAME}` : `Create agent and ${DECLARATION_FILENAME}`;
   }
   return exists ? `Replace ${DECLARATION_FILENAME}` : `Create ${DECLARATION_FILENAME}`;
 }
-async function selectInitProject(deps, root) {
+async function selectInitAgent(deps, root) {
   for (; ; ) {
     const action = await deps.select("How should this directory connect to Tonbo?", [
       {
@@ -1754,12 +1744,12 @@ async function selectInitProject(deps, root) {
     if (action === "later") return { kind: "later" };
     if (action === "create") {
       const organization = await selectInitOrganization(deps);
-      const defaultName = projectNameSuggestion(path4.basename(root)) || "tonbo-agent";
+      const defaultName = agentNameSuggestion(path4.basename(root)) || "tonbo-agent";
       for (; ; ) {
         const answer = (await deps.prompt(`Agent name [${defaultName}]: `)).trim().toLowerCase();
         const name = answer || defaultName;
         try {
-          validateProjectName(name);
+          validateAgentName(name);
           return {
             kind: "create",
             name,
@@ -1774,36 +1764,36 @@ async function selectInitProject(deps, root) {
       }
     }
     const oauthToken = await deps.auth.accessToken();
-    const projects = (await deps.api.listProjects(oauthToken)).filter(
-      (project2) => project2.status === "active"
+    const agents = (await deps.api.listAgents(oauthToken)).filter(
+      (agent2) => agent2.status === "active"
     );
-    if (projects.length === 0) {
+    if (agents.length === 0) {
       deps.output({ message: "No active agents are available. Create a new agent instead." });
       continue;
     }
     const id = await deps.select(
       "Which agent should this directory use?",
-      projects.map((project2) => ({
-        name: project2.name,
-        description: `Organization: ${project2.organizationName} \xB7 ${project2.publicHostname} \xB7 ${project2.id}`,
-        value: project2.id
+      agents.map((agent2) => ({
+        name: agent2.name,
+        description: `Organization: ${agent2.organizationName} \xB7 ${agent2.publicHostname} \xB7 ${agent2.id}`,
+        value: agent2.id
       }))
     );
-    const project = selectProject(projects, id);
+    const agent = selectAgent(agents, id);
     return {
       kind: "existing",
-      name: project.name,
-      organizationName: project.organizationName,
-      publicHostname: project.publicHostname,
-      sshDestination: project.sshDestination
+      name: agent.name,
+      organizationName: agent.organizationName,
+      publicHostname: agent.publicHostname,
+      sshDestination: agent.sshDestination
     };
   }
 }
-function initProjectSummary(project) {
-  if (project.kind === "create")
-    return `Create ${project.name}${project.organizationName ? ` in ${project.organizationName}` : ""} (permanent address assigned after creation)`;
-  if (project.kind === "existing") {
-    return project.name ? `${project.name}${project.organizationName ? ` in ${project.organizationName}` : ""} (${project.publicHostname})` : `Keep ${project.publicHostname}`;
+function initAgentSummary(agent) {
+  if (agent.kind === "create")
+    return `Create ${agent.name}${agent.organizationName ? ` in ${agent.organizationName}` : ""} (permanent address assigned after creation)`;
+  if (agent.kind === "existing") {
+    return agent.name ? `${agent.name}${agent.organizationName ? ` in ${agent.organizationName}` : ""} (${agent.publicHostname})` : `Keep ${agent.publicHostname}`;
   }
   return "Set up later";
 }
@@ -1813,7 +1803,7 @@ async function selectInitOrganization(deps) {
     (organization) => organization.role !== "member"
   );
   if (organizations.length === 0)
-    throw new Error("No organization lets you create a project. Ask an admin or owner.");
+    throw new Error("No organization lets you create a agent. Ask an admin or owner.");
   if (organizations.length === 1) return organizations[0];
   const id = await deps.select(
     "Which organization should own the new agent?",
@@ -1839,11 +1829,11 @@ function harnessName(harness) {
   const supported = supportedHarnesses.find((candidate) => candidate.id === harness);
   return supported?.name ?? harness;
 }
-function renderInitSummary(project, harness, driver, model, entry, buildCommand) {
+function renderInitSummary(agent, harness, driver, model, entry, buildCommand) {
   const lines = [
     "",
     "Tonbo Agent configuration:",
-    `  Agent:       ${initProjectSummary(project)}`,
+    `  Agent:       ${initAgentSummary(agent)}`,
     `  Harness:       ${harnessName(harness)}`,
     `  Execution:     ${driver === "native" ? "PI CLI (`pi`)" : "PI SDK app"}`,
     `  Model:         ${model}`
@@ -1862,7 +1852,7 @@ function piTargetChoices(settingsFound) {
       value: "command"
     },
     native: {
-      description: settingsFound ? "Run pi directly and load the detected project-local PI configuration." : "Run pi directly with AGENTS.md and optional project-local .pi resources.",
+      description: settingsFound ? "Run pi directly and load the detected agent-local PI configuration." : "Run pi directly with AGENTS.md and optional agent-local .pi resources.",
       name: "PI CLI (`pi`)",
       value: "native"
     }
@@ -1928,31 +1918,31 @@ async function sshKeyRemoveCommand(deps, fingerprint) {
   const key = await deps.api.revokeSshKey(oauthToken, fingerprint);
   deps.output({ message: `Revoked SSH key ${key.fingerprint}.`, key });
 }
-async function projectUseCommand(deps, selector, force = false) {
+async function agentUseCommand(deps, selector, force = false) {
   const root = await findDeclarationRoot(deps.cwd());
   const declaration = await loadDeclaration(root);
   const oauthToken = await deps.auth.accessToken();
-  const projects = await deps.api.listProjects(oauthToken);
-  const project = selectProject(projects, selector);
-  if (declaration.agent === project.publicHostname) {
+  const agents = await deps.api.listAgents(oauthToken);
+  const agent = selectAgent(agents, selector);
+  if (declaration.agent === agent.publicHostname) {
     deps.output({
-      message: `.tonbo already uses agent ${project.publicHostname}.`,
-      agent: project
+      message: `.tonbo already uses agent ${agent.publicHostname}.`,
+      agent
     });
     return;
   }
   if (declaration.agent && !force) {
-    const current = projects.find((candidate) => candidate.publicHostname === declaration.agent);
+    const current = agents.find((candidate) => candidate.publicHostname === declaration.agent);
     const currentLabel = current?.publicHostname ?? declaration.agent;
     if (!deps.interactive()) {
       throw new Error(
-        `.tonbo already uses agent ${currentLabel}. Pass --force to rebind it to ${project.publicHostname}.`
+        `.tonbo already uses agent ${currentLabel}. Pass --force to rebind it to ${agent.publicHostname}.`
       );
     }
     const action = await deps.select(
-      `Rebind .tonbo from ${currentLabel} to ${project.publicHostname}?`,
+      `Rebind .tonbo from ${currentLabel} to ${agent.publicHostname}?`,
       [
-        { name: `Rebind to ${project.publicHostname}`, value: "rebind" },
+        { name: `Rebind to ${agent.publicHostname}`, value: "rebind" },
         { name: "Cancel", value: "cancel" }
       ]
     );
@@ -1961,10 +1951,10 @@ async function projectUseCommand(deps, selector, force = false) {
       return;
     }
   }
-  await bindDeclarationProject(root, project.publicHostname);
-  deps.output({ message: `Bound .tonbo to agent ${project.publicHostname}.`, agent: project });
+  await bindDeclarationAgent(root, agent.publicHostname);
+  deps.output({ message: `Bound .tonbo to agent ${agent.publicHostname}.`, agent });
 }
-async function projectCreateCommand(deps, name) {
+async function agentCreateCommand(deps, name) {
   const root = await findDeclarationRoot(deps.cwd());
   const declaration = await loadDeclaration(root);
   if (declaration.agent) {
@@ -1973,28 +1963,28 @@ async function projectCreateCommand(deps, name) {
     );
   }
   const oauthToken = await deps.auth.accessToken();
-  validateProjectName(name);
-  const project = await deps.api.createProject(oauthToken, name);
+  validateAgentName(name);
+  const agent = await deps.api.createAgent(oauthToken, name);
   try {
-    await bindDeclarationProject(root, project.publicHostname);
+    await bindDeclarationAgent(root, agent.publicHostname);
   } catch (error) {
     throw new Error(
-      `Created agent ${project.name}, but could not bind ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${project.publicHostname}\`.`,
+      `Created agent ${agent.name}, but could not bind ${DECLARATION_FILENAME}. Fix the file and run \`tonbo agent use ${agent.publicHostname}\`.`,
       { cause: error }
     );
   }
-  deps.output({ message: `Created agent ${project.name} and bound it in .tonbo.`, agent: project });
+  deps.output({ message: `Created agent ${agent.name} and bound it in .tonbo.`, agent });
 }
 async function deployCommand(deps, options = { promote: true }) {
-  const { declaration, oauthToken, project, root } = await resolveProject(deps);
+  const { declaration, oauthToken, agent, root } = await resolveAgent(deps);
   if (declaration.build) await runBuildCommand(root, declaration.build.command);
   const source = await buildSourceBundle(root);
   const origin = { actor: "cli", git: await deps.gitProvenance(root) };
-  const managementToken = await deps.api.exchangeManagementToken(oauthToken, project.id);
+  const managementToken = await deps.api.exchangeManagementToken(oauthToken, agent.id);
   const result = await deps.api.deploy({
     bundle: source,
     origin,
-    projectId: project.id,
+    agentId: agent.id,
     promote: options.promote,
     spec: buildDeploymentSpec(declaration, source),
     token: managementToken
@@ -2002,12 +1992,12 @@ async function deployCommand(deps, options = { promote: true }) {
   const { deployment } = result;
   const shortId = shortDeploymentId(deployment.id);
   const lines = [
-    options.promote ? `Deployed agent ${project.name}.` : `Created Deployment ${deploymentName(deployment)} (${shortId}) for agent ${project.name} without promoting it.`,
-    `Organization: ${project.organizationName}`,
+    options.promote ? `Deployed agent ${agent.name}.` : `Created Deployment ${deploymentName(deployment)} (${shortId}) for agent ${agent.name} without promoting it.`,
+    `Organization: ${agent.organizationName}`,
     `Deployment: ${deploymentName(deployment)} (${shortId})`,
     `Source: ${deploymentSourceLabel(deployment)}`,
     `Production: ${options.promote ? productionStateLabel(deployment) : `not promoted; run \`tonbo deployments promote ${shortId}\` to move Production here`}`,
-    `Application: https://${project.publicHostname}`
+    `Application: https://${agent.publicHostname}`
   ];
   if (result.unchanged) {
     lines.push(
@@ -2023,49 +2013,49 @@ async function deployCommand(deps, options = { promote: true }) {
       '  tonbo run "<prompt>"',
       "",
       "Connect with SSH:",
-      `  ssh ${project.sshDestination}`
+      `  ssh ${agent.sshDestination}`
     );
   }
-  deps.output({ message: lines.join("\n"), agent: project, ...result });
+  deps.output({ message: lines.join("\n"), agent, ...result });
 }
 async function runCommand(deps, prompt, options) {
-  const { oauthToken, project } = await resolveProject(deps);
-  const managementToken = await deps.api.exchangeManagementToken(oauthToken, project.id);
+  const { oauthToken, agent } = await resolveAgent(deps);
+  const managementToken = await deps.api.exchangeManagementToken(oauthToken, agent.id);
   const result = await deps.api.run({
-    projectId: project.id,
+    agentId: agent.id,
     prompt,
     sessionId: options.session,
     token: managementToken
   });
   deps.output({
     message: result.turn.assistant_text,
-    agent: project,
+    agent,
     ...result
   });
 }
 async function agentListCommand(deps) {
-  const agents = await deps.api.listProjects(await deps.auth.accessToken());
+  const agents = await deps.api.listAgents(await deps.auth.accessToken());
   deps.output({
     message: agents.length ? agents.map((agent) => `${agent.name} \xB7 ${agent.publicHostname}`).join("\n") : "No agents are available.",
     agents
   });
 }
-async function projectShowCommand(deps) {
-  const { project, token } = await projectManagement(deps);
-  const production = await deps.api.getProduction(project.id, token);
-  const deployment = production ? await deps.api.getDeployment(project.id, production.deployment_id, token) : null;
+async function agentShowCommand(deps) {
+  const { agent, token } = await agentManagement(deps);
+  const production = await deps.api.getProduction(agent.id, token);
+  const deployment = production ? await deps.api.getDeployment(agent.id, production.deployment_id, token) : null;
   const lines = [
-    `agent: ${project.name}`,
-    `Organization: ${project.organizationName}`,
-    `application: https://${project.publicHostname}`,
-    `ssh: ssh ${project.sshDestination}`
+    `agent: ${agent.name}`,
+    `Organization: ${agent.organizationName}`,
+    `application: https://${agent.publicHostname}`,
+    `ssh: ssh ${agent.sshDestination}`
   ];
   if (deployment) {
     lines.push(
       `production: ${deploymentName(deployment)} (${shortDeploymentId(deployment.id)}) ${productionStateLabel(deployment)}`
     );
   }
-  deps.output({ message: lines.join("\n"), agent: project, production, deployment });
+  deps.output({ message: lines.join("\n"), agent, production, deployment });
 }
 function shortDeploymentId(id) {
   return id.replace(/-/g, "").slice(0, 8);
@@ -2092,7 +2082,7 @@ function selectDeployment(deployments, prefix) {
   const matches = deployments.filter(
     (deployment) => deployment.id.replace(/-/g, "").startsWith(normalized)
   );
-  if (matches.length === 0) throw new Error(`Deployment ${prefix} was not found in this project.`);
+  if (matches.length === 0) throw new Error(`Deployment ${prefix} was not found in this agent.`);
   if (matches.length > 1) {
     throw new Error(
       `Deployment id ${prefix} is ambiguous; it matches ${matches.map((deployment) => shortDeploymentId(deployment.id)).join(", ")}. Use more characters.`
@@ -2118,10 +2108,10 @@ function productionMarker(state) {
   return "";
 }
 async function deploymentsListCommand(deps) {
-  const { project, token } = await projectManagement(deps);
+  const { agent, token } = await agentManagement(deps);
   const [deployments, production] = await Promise.all([
-    deps.api.listDeployments(project.id, token),
-    deps.api.getProduction(project.id, token)
+    deps.api.listDeployments(agent.id, token),
+    deps.api.getProduction(agent.id, token)
   ]);
   const message = deployments.length ? renderTable(
     ["ID", "NAME", "STATUS", "PRODUCTION", "SOURCE", "CREATED", "BY"],
@@ -2134,18 +2124,18 @@ async function deploymentsListCommand(deps) {
       formatTimestamp(deployment.created_at),
       deployment.created_by_user_id ? shortDeploymentId(deployment.created_by_user_id) : ""
     ])
-  ) : `No Deployments exist for agent ${project.name}. Run \`tonbo deploy\` to create one.`;
-  deps.output({ message, agent: project, production, deployments });
+  ) : `No Deployments exist for agent ${agent.name}. Run \`tonbo deploy\` to create one.`;
+  deps.output({ message, agent, production, deployments });
 }
 async function deploymentsShowCommand(deps, prefix) {
-  const { project, token } = await projectManagement(deps);
-  const deployment = selectDeployment(await deps.api.listDeployments(project.id, token), prefix);
-  const rollouts = (await deps.api.listRollouts(project.id, token)).filter(
+  const { agent, token } = await agentManagement(deps);
+  const deployment = selectDeployment(await deps.api.listDeployments(agent.id, token), prefix);
+  const rollouts = (await deps.api.listRollouts(agent.id, token)).filter(
     (rollout) => rollout.deployment_id === deployment.id || rollout.previous_deployment_id === deployment.id
   );
   deps.output({
     message: renderDeploymentDetail(deployment, rollouts),
-    agent: project,
+    agent,
     deployment,
     rollouts
   });
@@ -2186,43 +2176,43 @@ function renderDeploymentDetail(deployment, rollouts) {
   return lines.join("\n");
 }
 async function deploymentsPromoteCommand(deps, prefix) {
-  const { project, token } = await projectManagement(deps);
-  const target = selectDeployment(await deps.api.listDeployments(project.id, token), prefix);
-  const result = await moveProduction(deps, project.id, target, token);
+  const { agent, token } = await agentManagement(deps);
+  const target = selectDeployment(await deps.api.listDeployments(agent.id, token), prefix);
+  const result = await moveProduction(deps, agent.id, target, token);
   deps.output({
-    message: describeProductionMove(project, result, "Promoted"),
-    agent: project,
+    message: describeProductionMove(agent, result, "Promoted"),
+    agent,
     ...result
   });
 }
 async function deploymentsRollbackCommand(deps, prefix) {
-  const { project, token } = await projectManagement(deps);
+  const { agent, token } = await agentManagement(deps);
   let target;
   if (prefix !== void 0) {
-    target = selectDeployment(await deps.api.listDeployments(project.id, token), prefix);
+    target = selectDeployment(await deps.api.listDeployments(agent.id, token), prefix);
   } else {
-    const rollouts = await deps.api.listRollouts(project.id, token);
+    const rollouts = await deps.api.listRollouts(agent.id, token);
     const previousId = rollouts.find(
       (rollout) => rollout.previous_deployment_id !== null
     )?.previous_deployment_id;
     if (!previousId) {
       throw new Error(
-        `Agent ${project.name} has no previous Production Deployment to roll back to. Name one with \`tonbo deployments rollback <id>\`.`
+        `Agent ${agent.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);
+    target = await deps.api.getDeployment(agent.id, previousId, token);
   }
-  const result = await moveProduction(deps, project.id, target, token);
+  const result = await moveProduction(deps, agent.id, target, token);
   deps.output({
-    message: describeProductionMove(project, result, "Rolled back"),
-    agent: project,
+    message: describeProductionMove(agent, result, "Rolled back"),
+    agent,
     ...result
   });
 }
-async function moveProduction(deps, projectId, target, token) {
-  const previous = await deps.api.getProduction(projectId, token);
+async function moveProduction(deps, agentId, target, token) {
+  const previous = await deps.api.getProduction(agentId, token);
   const production = await deps.api.putProduction(
-    projectId,
+    agentId,
     {
       deployment_id: target.id,
       desired_state: "running",
@@ -2231,49 +2221,49 @@ async function moveProduction(deps, projectId, target, token) {
     token
   );
   return {
-    deployment: await deps.api.getDeployment(projectId, target.id, token),
+    deployment: await deps.api.getDeployment(agentId, target.id, token),
     previous,
     production
   };
 }
-function describeProductionMove(project, move, verb) {
+function describeProductionMove(agent, 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 agent ${project.name}; requested it to be running.` : `${verb} ${name} to Production for agent ${project.name}${previous ? ` (from ${shortDeploymentId(previous.deployment_id)})` : ""}.`;
+  const headline = previous?.deployment_id === deployment.id ? `Deployment ${name} is already Production for agent ${agent.name}; requested it to be running.` : `${verb} ${name} to Production for agent ${agent.name}${previous ? ` (from ${shortDeploymentId(previous.deployment_id)})` : ""}.`;
   return `${headline}
 Production: ${productionStateLabel(deployment)}
-Application: https://${project.publicHostname}`;
+Application: https://${agent.publicHostname}`;
 }
-async function projectManagement(deps) {
-  const { oauthToken, project } = await resolveProject(deps);
+async function agentManagement(deps) {
+  const { oauthToken, agent } = await resolveAgent(deps);
   return {
-    project,
-    token: await deps.api.exchangeManagementToken(oauthToken, project.id)
+    agent,
+    token: await deps.api.exchangeManagementToken(oauthToken, agent.id)
   };
 }
 async function secretListCommand(deps) {
-  const { project, token } = await projectManagement(deps);
-  const secrets = await deps.api.listProjectSecrets(project.id, token);
+  const { agent, token } = await agentManagement(deps);
+  const secrets = await deps.api.listAgentSecrets(agent.id, token);
   deps.output({
     message: secrets.length ? secrets.map((secret) => secret.name).join("\n") : "No agent secrets are configured.",
-    agent: project,
+    agent,
     secrets
   });
 }
 async function secretSetCommand(deps, name, options) {
   const value = await deps.secretValue(name, options.fromEnv);
-  const { project, token } = await projectManagement(deps);
-  const secret = await deps.api.setProjectSecret(project.id, name, value, token);
+  const { agent, token } = await agentManagement(deps);
+  const secret = await deps.api.setAgentSecret(agent.id, name, value, token);
   deps.output({
     message: `Set agent secret ${secret.name}. Redeploy to replace the active runtime with this value.`,
-    agent: project,
+    agent,
     secret
   });
 }
 async function secretRemoveCommand(deps, name) {
-  const { project, token } = await projectManagement(deps);
-  await deps.api.deleteProjectSecret(project.id, name, token);
-  deps.output({ message: `Removed agent secret ${name}.`, agent: project, name });
+  const { agent, token } = await agentManagement(deps);
+  await deps.api.deleteAgentSecret(agent.id, name, token);
+  deps.output({ message: `Removed agent secret ${name}.`, agent, name });
 }
 
 // src/credentials.ts
@@ -2593,18 +2583,18 @@ function createProgram(dependencies = createDependencies) {
       })
     );
   });
-  const project = program.command("agent").description("manage the Agent bound to this source directory");
-  project.command("create <name>").description("create an agent and bind this directory to it").action(async (name) => projectCreateCommand(dependencies(jsonOutput(program)), name));
-  project.command("list").description("list the agents available to your account").action(async () => agentListCommand(dependencies(jsonOutput(program))));
+  const agent = program.command("agent").description("manage the Agent bound to this source directory");
+  agent.command("create <name>").description("create an agent and bind this directory to it").action(async (name) => agentCreateCommand(dependencies(jsonOutput(program)), name));
+  agent.command("list").description("list the agents available to your account").action(async () => agentListCommand(dependencies(jsonOutput(program))));
   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 <agent>").description("write the agent hostname into this directory's .tonbo declaration").option("--force", "replace an existing agent binding without confirmation").action(
-    async (selector, options) => projectUseCommand(dependencies(jsonOutput(program)), selector, options.force === true)
+  agent.command("use <agent>").description("write the agent hostname into this directory's .tonbo declaration").option("--force", "replace an existing agent binding without confirmation").action(
+    async (selector, options) => agentUseCommand(dependencies(jsonOutput(program)), selector, options.force === true)
   );
-  project.command("show").description("show the agent bound to this directory and its connection addresses").action(async () => projectShowCommand(dependencies(jsonOutput(program))));
+  agent.command("show").description("show the agent bound to this directory and its connection addresses").action(async () => agentShowCommand(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 })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Deploy persistent Agents and manage their Machines from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {