@opencomputer/cli 0.4.3 → 0.4.4

package/dist/project.js

@@ -1,41 +1,8 @@
-import { createHash, randomInt, randomUUID } from "node:crypto";
+import { createHash } from "node:crypto";
 import { access, cp, mkdir, readFile, readdir, rm, writeFile, } from "node:fs/promises";
 import { basename, dirname, relative, resolve } from "node:path";
 import ts from "typescript";
 const AGENT_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-const AGENT_NAME_ADJECTIVES = [
-    "Amber",
-    "Brave",
-    "Calm",
-    "Clever",
-    "Cosmic",
-    "Eager",
-    "Gentle",
-    "Golden",
-    "Lucid",
-    "Nimble",
-    "Quiet",
-    "Radiant",
-    "Steady",
-    "Swift",
-    "Vivid",
-    "Wise",
-];
-const AGENT_NAME_NOUNS = [
-    "Beacon",
-    "Comet",
-    "Falcon",
-    "Forest",
-    "Harbor",
-    "Lantern",
-    "Meadow",
-    "Orchid",
-    "Otter",
-    "Panda",
-    "River",
-    "Summit",
-    "Willow",
-];
 async function exists(path) {
     try {
         await access(path);
@@ -45,48 +12,6 @@ async function exists(path) {
         return false;
     }
 }
-async function prepareInitializationTarget(root, template) {
-    if (!(await exists(root))) {
-        await mkdir(root, { recursive: true });
-        return;
-    }
-    const reserved = [
-        "opencomputer.toml",
-        "opencomputer.config.ts",
-        "opencode.json",
-        "package.json",
-        "agent.ts",
-        "opencomputer.ts",
-        ...(template.id === "pr-review-readiness"
-            ? [
-                "tools/github.ts",
-                "connections/github.json",
-                "skills/review-pr/SKILL.md",
-                "evals/pr-review-cases.md",
-            ]
-            : []),
-        ...(template.integrations.includes("Gmail")
-            ? ["tools/gmail.ts", "connections/google.json"]
-            : []),
-        ...(template.integrations.includes("Google Calendar")
-            ? ["tools/calendar.ts", "connections/google.json"]
-            : []),
-        ...(template.id === "email-triage"
-            ? ["skills/triage-inbox/SKILL.md", "evals/triage-cases.md"]
-            : []),
-        ...(template.id === "pto-calendar"
-            ? ["skills/manage-pto/SKILL.md", "evals/pto-cases.md"]
-            : []),
-    ];
-    const conflicts = [];
-    for (const path of reserved) {
-        if (await exists(resolve(root, path)))
-            conflicts.push(path);
-    }
-    if (conflicts.length) {
-        throw new Error(`Target already contains agent files: ${conflicts.join(", ")}`);
-    }
-}
 async function updateGitignore(root) {
     const path = resolve(root, ".gitignore");
     const required = [
@@ -120,887 +45,8 @@ export function agentIdFromName(value) {
     }
     return id;
 }
-export function generateAgentName() {
-    return `${AGENT_NAME_ADJECTIVES[randomInt(AGENT_NAME_ADJECTIVES.length)]} ${AGENT_NAME_NOUNS[randomInt(AGENT_NAME_NOUNS.length)]}`;
-}
-function templateInstructions(template) {
-    if (template.id === "email-triage") {
-        return `# ${template.name}
-
-You are a privacy-conscious inbox triage assistant.
-
-${template.description}
-
-## Default workflow
-
-For inbox-triage requests, start with the \`gmail_search\` tool and then use
-\`gmail_read\` for the returned message IDs. These tools are provided at
-runtime. Do not inspect this repository, source files, or environment variables
-to decide whether Gmail is available. Attempt the read-only tool call; if it
-fails, report the tool error and the missing connection precisely.
-
-1. Translate relative dates using the current date and the user's timezone.
-   State the exact time boundary used.
-2. Search the requested scope, normally \`in:inbox\`, with a default maximum
-   of 10 results unless the user requests a different limit.
-3. Use \`gmail_read\` to get metadata and a snippet for each result. Use
-   \`gmail_read_full\` only for the small number of messages whose snippet
-   does not contain enough evidence to classify them.
-4. Treat direct questions, requested decisions, scheduling requests, promised
-   follow-ups, and approaching deadlines as reply candidates. Do not treat
-   newsletters, receipts, automated alerts, or no-reply mail as needing a
-   response unless there is a clear time-sensitive action.
-5. Distinguish facts from judgment. Use "likely needs a reply" when sent-mail
-   or thread history has not been checked.
-6. Minimize disclosure: quote only the short phrase needed to support a
-   classification; otherwise summarize.
-
-## Output
-
-Return:
-
-- A compact inbox summary with counts by urgency.
-- A prioritized "Needs a reply" list containing sender, subject, received
-  time, reason, deadline (if any), and confidence.
-- A short "Review later / no reply" summary.
-- Recommended next steps, clearly labeled as recommendations.
-
-Before returning, verify that every summary count exactly matches the number of
-items in its corresponding section and that the category counts add up to the
-number of messages read.
-
-If no messages need a reply, say so directly. Never invent missing message
-content, deadlines, or reply status.
-
-## User control
-
-Inbox triage is read-only. Never call \`gmail_modify\` or \`gmail_send\` during
-a triage request. Draft replies in the chat only.
-
-For a later mailbox-changing request:
-
-- First show the exact proposed change or full outgoing draft.
-- Ask for explicit confirmation for that specific message and action.
-- Do not treat an earlier general request, silence, or approval of a different
-  action as confirmation.
-- Never send, label, archive, delete, mark read/unread, or otherwise modify
-  Gmail without that fresh confirmation.
-- After an approved action, report only what the tool confirms.
-
-## Example requests
-
-${template.suggestedPrompts.map((prompt) => `- ${prompt}`).join("\n")}
-`;
-    }
-    if (template.id === "pto-calendar") {
-        return `# ${template.name}
-
-You are a careful PTO calendar assistant.
-
-${template.description}
-
-## Default workflow
-
-1. Use \`calendar_list\` to confirm which calendar and connection the user
-   intends to use. Do not assume a personal or shared calendar.
-2. Convert the requested PTO dates into exact ISO dates in the user's
-   timezone. State the inclusive dates back to the user.
-3. Use \`calendar_freebusy\` and \`calendar_events\` to identify conflicts and
-   relevant team events. Reading the calendar does not require approval.
-4. Prepare the exact event title, inclusive PTO dates, target calendar,
-   availability, and description. Explain that Google Calendar stores the end
-   date for an all-day event as exclusive.
-5. Ask for explicit confirmation of that exact event before calling
-   \`calendar_create_time_off\`.
-6. Report only the event details returned by Google Calendar. Never claim an
-   event was created when the tool failed or returned no event ID.
-
-Use only the injected \`calendar_*\` tools for Calendar reads and writes. Never
-use shell commands, \`curl\`, or direct Google API requests: they bypass the
-user's managed connection and cannot authenticate as that user.
-
-## Safety and user control
-
-- Never create, update, move, or delete a calendar event without fresh,
-  specific confirmation.
-- Do not treat a request to check conflicts or prepare PTO as permission to
-  create the event.
-- Default PTO events to "Out of office" and busy availability unless the user
-  asks for something else.
-- Do not notify Slack automatically. Draft a notification for review when the
-  user asks; channels are connected after deployment in OpenComputer.
-- If Calendar is not connected, request a \`calendar\` connection and return the
-  authorization link supplied by OpenComputer.
-
-## Example requests
-
-${template.suggestedPrompts.map((prompt) => `- ${prompt}`).join("\n")}
-`;
-    }
-    if (template.id === "pr-review-readiness") {
-        return `# ${template.name}
-
-You are a code-review readiness agent. Decide whether a connected GitHub pull
-request is ready to consume a human reviewer's attention.
-
-${template.description}
-
-## Required workflow
-
-1. Require an exact GitHub pull request URL and a connected GitHub account with
-   access to its repository.
-2. Call the \`github_pr_context\` tool. Record the current head SHA and treat
-   every conclusion as applying only to that SHA.
-3. Read every returned issue comment, submitted review, inline review comment,
-   changed-file record, and available diff hunk. Group inline replies using
-   their reply relationships.
-4. Do not call \`github_checkout\` by default. Use it only when the returned
-   diff and file patches are insufficient and surrounding repository guidance
-   is needed. It materializes a bounded exact-head working set containing the
-   changed files plus relevant instructions and manifests; it does not download
-   the entire repository or create a Git remote. Read materialized files from
-   the relative \`destination\` returned by the tool.
-5. Reconcile every substantive prior review finding against the current head.
-   A resolved conversation is evidence, not proof: verify the current code.
-6. Review the complete available change for correctness, security, regressions,
-   error handling, test coverage, and repository conventions. Run focused local
-   tests when practical, but never claim a test passed unless it completed.
-7. Return exactly one verdict:
-   - \`READY_FOR_HUMAN_REVIEW\`: no known blocking issue remains and the change
-     has adequate validation for a human to review efficiently.
-   - \`NOT_READY\`: one or more actionable blocking issues remain.
-   - \`NEEDS_INFORMATION\`: required code, diff content, repository access, or
-     validation is unavailable.
-
-## Output
-
-Lead with the verdict and head SHA. Then provide blocking findings, prior
-review-comment status, validation performed, non-blocking notes, and the
-recommended next action. Cite file paths and lines when evidence allows it.
-Return the complete report in the current OpenComputer session.
-
-## Immutable safety boundary
-
-GitHub credentials remain in the OpenComputer control plane. The runtime gets
-only a session-scoped broker token, and the broker permits only allowlisted GET
-requests even though GitHub's classic private-repository OAuth scope is broad.
-Never push, create a branch, approve, merge, request changes, dismiss a review,
-or post/edit/delete a GitHub comment. Never add a Git remote or attempt to
-discover credentials. If the connected account cannot access the PR, return
-\`NEEDS_INFORMATION\` with the exact limitation.
-
-## Example requests
-
-${template.suggestedPrompts.map((prompt) => `- ${prompt}`).join("\n")}
-`;
-    }
-    const integrations = template.integrations.length
-        ? template.integrations.join(", ")
-        : "the tools installed in this repository";
-    return `# ${template.name}
-
-You are an OpenComputer agent responsible for this job:
-
-${template.description}
-
-## How to work
-
-- Inspect the workspace and available tools before acting.
-- Use connected ${integrations} tools only when they are available.
-- If a required tool or connection is missing, say exactly what is missing.
-- Keep evidence, assumptions, and recommendations clearly separated.
-- Prepare drafts before consequential external actions.
-- Require explicit approval before sending messages, changing records, moving
-  money, cancelling services, or publishing content.
-- Finish with what you completed, what remains, and decisions the user must
-  make.
-
-## Example requests
-
-${template.suggestedPrompts.map((prompt) => `- ${prompt}`).join("\n")}
-`;
-}
-function gmailToolSource() {
-    return `import { tool } from "@opencomputer/agent";
-
-async function gmail(input: {
-  path: string;
-  method?: string;
-  body?: unknown;
-  connection?: string;
-}): Promise<unknown> {
-  const base = process.env.OPENCOMPUTER_CONNECTIONS_URL;
-  const token = process.env.OPENCOMPUTER_CONNECTION_TOKEN;
-  if (!base || !token) {
-    throw new Error("OpenComputer connections are unavailable");
-  }
-  const response = await fetch(\`\${base}/google/fetch\`, {
-    method: "POST",
-    headers: {
-      authorization: \`Bearer \${token}\`,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      service: "gmail",
-      label: input.connection,
-      method: input.method,
-      path: input.path,
-      headers: input.body ? { "content-type": "application/json" } : undefined,
-      body: input.body ? JSON.stringify(input.body) : undefined,
-    }),
-  });
-  const result = await response.json() as {
-    status?: number;
-    body?: string;
-    error?: { message?: string };
-  };
-  if (!response.ok || !result.status || result.status >= 400) {
-    throw new Error(
-      result.error?.message ??
-        result.body ??
-        \`Gmail returned \${String(result.status)}\`,
-    );
-  }
-  return result.body ? JSON.parse(result.body) : {};
-}
-
-export const search = tool({
-  id: "gmail_search",
-  description:
-    "Read-only: search Gmail messages using a Gmail search query. Use this before reading individual messages.",
-  input: {
-    type: "object",
-    properties: {
-      query: { type: "string" },
-      maxResults: { type: "integer", minimum: 1, maximum: 25, default: 10 },
-      connection: { type: "string" },
-    },
-    required: ["query"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const query = encodeURIComponent(args.query);
-    return JSON.stringify(await gmail({
-      path: \`/gmail/v1/users/me/messages?q=\${query}&maxResults=\${args.maxResults ?? 10}\`,
-      connection: args.connection,
-    }));
-  },
-});
-
-export const read = tool({
-  id: "gmail_read",
-  description:
-    "Read-only: get a Gmail message's sender, recipients, subject, date, labels, and snippet. Use this for inbox triage after gmail_search.",
-  input: {
-    type: "object",
-    properties: {
-      messageId: { type: "string" },
-      connection: { type: "string" },
-    },
-    required: ["messageId"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    return JSON.stringify(await gmail({
-      path:
-        \`/gmail/v1/users/me/messages/\${encodeURIComponent(args.messageId)}\` +
-        "?format=metadata" +
-        "&metadataHeaders=From" +
-        "&metadataHeaders=To" +
-        "&metadataHeaders=Cc" +
-        "&metadataHeaders=Subject" +
-        "&metadataHeaders=Date",
-      connection: args.connection,
-    }));
-  },
-});
-
-export const read_full = tool({
-  id: "gmail_read_full",
-  description:
-    "Read-only: get the complete Gmail message body. Use only when gmail_read metadata and snippet are insufficient.",
-  input: {
-    type: "object",
-    properties: {
-      messageId: { type: "string" },
-      connection: { type: "string" },
-    },
-    required: ["messageId"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    return JSON.stringify(await gmail({
-      path: \`/gmail/v1/users/me/messages/\${encodeURIComponent(args.messageId)}?format=full\`,
-      connection: args.connection,
-    }));
-  },
-});
-
-export const modify = tool({
-  id: "gmail_modify",
-  description:
-    "Consequential: add or remove Gmail labels only after the user explicitly confirms the exact change.",
-  input: {
-    type: "object",
-    properties: {
-      messageId: { type: "string" },
-      addLabelIds: { type: "array", items: { type: "string" }, default: [] },
-      removeLabelIds: { type: "array", items: { type: "string" }, default: [] },
-      connection: { type: "string" },
-    },
-    required: ["messageId"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    return JSON.stringify(await gmail({
-      method: "POST",
-      path: \`/gmail/v1/users/me/messages/\${encodeURIComponent(args.messageId)}/modify\`,
-      body: {
-        addLabelIds: args.addLabelIds ?? [],
-        removeLabelIds: args.removeLabelIds ?? [],
-      },
-      connection: args.connection,
-    }));
-  },
-});
-
-export const send = tool({
-  id: "gmail_send",
-  description:
-    "Consequential: send an email only after the user reviews the full draft and explicitly confirms this exact send.",
-  input: {
-    type: "object",
-    properties: {
-      to: { type: "string" },
-      subject: { type: "string" },
-      body: { type: "string" },
-      connection: { type: "string" },
-    },
-    required: ["to", "subject", "body"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    if (/[\\r\\n]/.test(args.to) || /[\\r\\n]/.test(args.subject)) {
-      throw new Error("Email recipients and subjects cannot contain newlines");
-    }
-    const message = [
-      \`To: \${args.to}\`,
-      \`Subject: \${args.subject}\`,
-      "Content-Type: text/plain; charset=utf-8",
-      "",
-      args.body,
-    ].join("\\r\\n");
-    return JSON.stringify(await gmail({
-      method: "POST",
-      path: "/gmail/v1/users/me/messages/send",
-      body: { raw: Buffer.from(message).toString("base64url") },
-      connection: args.connection,
-    }));
-  },
-});
-`;
-}
-function calendarToolSource() {
-    return `import { tool } from "@opencomputer/agent";
-
-async function calendar(input: {
-  path: string;
-  method?: string;
-  body?: unknown;
-  connection?: string;
-}): Promise<unknown> {
-  const base = process.env.OPENCOMPUTER_CONNECTIONS_URL;
-  const token = process.env.OPENCOMPUTER_CONNECTION_TOKEN;
-  if (!base || !token) {
-    throw new Error("OpenComputer connections are unavailable");
-  }
-  const response = await fetch(\`\${base}/google/fetch\`, {
-    method: "POST",
-    headers: {
-      authorization: \`Bearer \${token}\`,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      service: "calendar",
-      label: input.connection,
-      method: input.method,
-      path: input.path,
-      headers: input.body ? { "content-type": "application/json" } : undefined,
-      body: input.body ? JSON.stringify(input.body) : undefined,
-    }),
-  });
-  const result = await response.json() as {
-    status?: number;
-    body?: string;
-    detail?: string;
-    error?: { message?: string };
-  };
-  if (!response.ok || !result.status || result.status >= 400) {
-    let upstreamMessage: string | undefined;
-    if (result.body) {
-      try {
-        const upstream = JSON.parse(result.body) as {
-          error?: { message?: string };
-        };
-        upstreamMessage = upstream.error?.message;
-      } catch {
-        upstreamMessage = result.body;
-      }
-    }
-    throw new Error(
-      result.error?.message ??
-        result.detail ??
-        upstreamMessage ??
-        \`Google Calendar returned \${String(result.status)}\`,
-    );
-  }
-  return result.body ? JSON.parse(result.body) : {};
-}
-
-function isoDate(value: string, name: string): string {
-  if (!/^\\d{4}-\\d{2}-\\d{2}$/.test(value)) {
-    throw new Error(\`\${name} must use YYYY-MM-DD\`);
-  }
-  const parsed = new Date(\`\${value}T00:00:00.000Z\`);
-  if (Number.isNaN(parsed.valueOf()) || parsed.toISOString().slice(0, 10) !== value) {
-    throw new Error(\`\${name} is not a valid date\`);
-  }
-  return value;
-}
-
-function nextDate(value: string): string {
-  const date = new Date(\`\${value}T00:00:00.000Z\`);
-  date.setUTCDate(date.getUTCDate() + 1);
-  return date.toISOString().slice(0, 10);
-}
-
-export const list = tool({
-  id: "calendar_list",
-  description:
-    "Read-only: list the Google Calendars available through the selected connection.",
-  input: {
-    type: "object",
-    properties: { connection: { type: "string" } },
-    additionalProperties: false,
-  },
-  async execute(args) {
-    return JSON.stringify(await calendar({
-      path: "/users/me/calendarList",
-      connection: args.connection,
-    }));
-  },
-});
-
-export const events = tool({
-  id: "calendar_events",
-  description:
-    "Read-only: list events in an exact time range before preparing PTO or identifying conflicts.",
-  input: {
-    type: "object",
-    properties: {
-      calendarId: { type: "string", default: "primary" },
-      timeMin: { type: "string", description: "Inclusive RFC3339 start timestamp" },
-      timeMax: { type: "string", description: "Exclusive RFC3339 end timestamp" },
-      query: { type: "string" },
-      connection: { type: "string" },
-    },
-    required: ["timeMin", "timeMax"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const calendarId = args.calendarId || "primary";
-    const search = new URLSearchParams({
-      timeMin: args.timeMin,
-      timeMax: args.timeMax,
-      singleEvents: "true",
-      orderBy: "startTime",
-      maxResults: "50",
-    });
-    if (args.query) search.set("q", args.query);
-    return JSON.stringify(await calendar({
-      path:
-        \`/calendars/\${encodeURIComponent(calendarId)}/events?\` +
-        search.toString(),
-      connection: args.connection,
-    }));
-  },
-});
-
-export const freebusy = tool({
-  id: "calendar_freebusy",
-  description:
-    "Read-only: check busy periods for one or more calendars in an exact RFC3339 time range.",
-  input: {
-    type: "object",
-    properties: {
-      calendarIds: {
-        type: "array",
-        items: { type: "string" },
-        minItems: 1,
-        default: ["primary"],
-      },
-      timeMin: { type: "string" },
-      timeMax: { type: "string" },
-      timeZone: { type: "string" },
-      connection: { type: "string" },
-    },
-    required: ["timeMin", "timeMax"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const calendarIds = args.calendarIds?.length
-      ? args.calendarIds
-      : ["primary"];
-    return JSON.stringify(await calendar({
-      method: "POST",
-      path: "/freeBusy",
-      body: {
-        timeMin: args.timeMin,
-        timeMax: args.timeMax,
-        timeZone: args.timeZone,
-        items: calendarIds.map((id) => ({ id })),
-      },
-      connection: args.connection,
-    }));
-  },
-});
-
-export const create_time_off = tool({
-  id: "calendar_create_time_off",
-  description:
-    "Consequential: create an all-day PTO event only after the user explicitly confirms the exact title, dates, calendar, and availability.",
-  input: {
-    type: "object",
-    properties: {
-      calendarId: { type: "string", default: "primary" },
-      title: { type: "string", default: "Out of office" },
-      startDate: { type: "string", description: "First PTO day, YYYY-MM-DD" },
-      endDate: { type: "string", description: "Last PTO day, inclusive, YYYY-MM-DD" },
-      description: { type: "string" },
-      availability: { type: "string", enum: ["busy", "free"], default: "busy" },
-      connection: { type: "string" },
-    },
-    required: ["startDate", "endDate"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const calendarId = args.calendarId || "primary";
-    const startDate = isoDate(args.startDate, "startDate");
-    const endDate = isoDate(args.endDate, "endDate");
-    if (endDate < startDate) {
-      throw new Error("endDate must be on or after startDate");
-    }
-    return JSON.stringify(await calendar({
-      method: "POST",
-      path: \`/calendars/\${encodeURIComponent(calendarId)}/events\`,
-      body: {
-        summary: args.title || "Out of office",
-        description: args.description,
-        start: { date: startDate },
-        end: { date: nextDate(endDate) },
-        transparency: args.availability === "free" ? "transparent" : "opaque",
-      },
-      connection: args.connection,
-    }));
-  },
-});
-`;
-}
-function githubReviewToolSource() {
-    return `import { mkdir, writeFile } from "node:fs/promises";
-import { resolve, sep } from "node:path";
-import { tool } from "@opencomputer/agent";
-
-const MAX_PAGES = 10;
-const MAX_CHECKOUT_FILES = 100;
-const MAX_CHECKOUT_BYTES = 20 * 1024 * 1024;
-
-function parsePullRequestUrl(value: string): {
-  repository: string;
-  number: number;
-} {
-  let url: URL;
-  try {
-    url = new URL(value);
-  } catch {
-    throw new Error("pullRequestUrl must be a complete GitHub pull request URL");
-  }
-  const parts = url.pathname.split("/").filter(Boolean);
-  const number = Number(parts[3]);
-  if (
-    url.protocol !== "https:" ||
-    url.hostname.toLowerCase() !== "github.com" ||
-    parts.length !== 4 ||
-    parts[2] !== "pull" ||
-    !Number.isSafeInteger(number) ||
-    number < 1 ||
-    !/^[A-Za-z0-9_.-]+$/.test(parts[0] ?? "") ||
-    !/^[A-Za-z0-9_.-]+$/.test(parts[1] ?? "")
-  ) {
-    throw new Error("Expected https://github.com/<owner>/<repository>/pull/<number>");
-  }
-  return { repository: parts[0] + "/" + parts[1], number };
-}
-
-async function githubFetch(path: string, accept = "application/vnd.github+json") {
-  const base = process.env.OPENCOMPUTER_CONNECTIONS_URL;
-  const token = process.env.OPENCOMPUTER_CONNECTION_TOKEN;
-  if (!base || !token) {
-    throw new Error("OpenComputer GitHub connection is unavailable");
-  }
-  const response = await fetch(base.replace(/\\\/$/, "") + "/github/fetch", {
-    method: "POST",
-    headers: {
-      authorization: "Bearer " + token,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      service: "github",
-      method: "GET",
-      path,
-      headers: { accept, "x-github-api-version": "2022-11-28" },
-    }),
-  });
-  if (!response.ok) {
-    const failure = (await response.json().catch(() => ({}))) as {
-      error?: { message?: string };
-    };
-    throw new Error(failure.error?.message ?? "GitHub connection request failed");
-  }
-  const result = (await response.json()) as {
-    status?: number;
-    body?: string;
-  };
-  if (!result.status || result.status >= 400) {
-    throw new Error(result.body ?? "GitHub request failed");
-  }
-  return result.body ?? "";
-}
-
-async function githubJson(path: string): Promise<Record<string, unknown>> {
-  return JSON.parse(await githubFetch(path)) as Record<string, unknown>;
-}
-
-async function githubPages(path: string): Promise<{
-  items: Record<string, unknown>[];
-  truncated: boolean;
-}> {
-  const items: Record<string, unknown>[] = [];
-  let lastPageWasFull = false;
-  for (let page = 1; page <= MAX_PAGES; page += 1) {
-    const separator = path.includes("?") ? "&" : "?";
-    const batch = JSON.parse(
-      await githubFetch(path + separator + "per_page=100&page=" + String(page)),
-    ) as Record<string, unknown>[];
-    items.push(...batch);
-    lastPageWasFull = batch.length === 100;
-    if (!lastPageWasFull) break;
-  }
-  return { items, truncated: lastPageWasFull };
-}
-
-export const pr_context = tool({
-  id: "github_pr_context",
-  description:
-    "Read-only: fetch an accessible GitHub PR, all available issue comments, reviews, inline review comments, changed files, and the full available diff through the connection broker.",
-  input: {
-    type: "object",
-    properties: { pullRequestUrl: { type: "string", format: "uri" } },
-    required: ["pullRequestUrl"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const { repository, number } = parsePullRequestUrl(args.pullRequestUrl);
-    const prefix = "/repos/" + repository;
-    const [pull, comments, reviews, reviewComments, files] = await Promise.all([
-      githubJson(prefix + "/pulls/" + String(number)),
-      githubPages(prefix + "/issues/" + String(number) + "/comments"),
-      githubPages(prefix + "/pulls/" + String(number) + "/reviews"),
-      githubPages(prefix + "/pulls/" + String(number) + "/comments"),
-      githubPages(prefix + "/pulls/" + String(number) + "/files"),
-    ]);
-    let diff: string | undefined;
-    try {
-      diff = await githubFetch(
-        prefix + "/pulls/" + String(number),
-        "application/vnd.github.v3.diff",
-      );
-    } catch {
-      // Per-file patches remain available. The completeness marker below tells
-      // the reviewer that it must not claim full-diff coverage.
-    }
-    const head =
-      pull.head && typeof pull.head === "object"
-        ? (pull.head as Record<string, unknown>)
-        : {};
-    const base =
-      pull.base && typeof pull.base === "object"
-        ? (pull.base as Record<string, unknown>)
-        : {};
-    const maximumDiff = 2_000_000;
-    return JSON.stringify({
-      repository,
-      number,
-      url: args.pullRequestUrl,
-      pull: {
-        title: pull.title,
-        body: pull.body,
-        state: pull.state,
-        draft: pull.draft,
-        mergeable: pull.mergeable,
-        mergeableState: pull.mergeable_state,
-        author: pull.user,
-        additions: pull.additions,
-        deletions: pull.deletions,
-        changedFiles: pull.changed_files,
-        head: { ref: head.ref, sha: head.sha },
-        base: { ref: base.ref, sha: base.sha },
-      },
-      comments: comments.items,
-      reviews: reviews.items,
-      reviewComments: reviewComments.items,
-      files: files.items,
-      diff: diff?.slice(0, maximumDiff),
-      completeness: {
-        comments: !comments.truncated,
-        reviews: !reviews.truncated,
-        reviewComments: !reviewComments.truncated,
-        files: !files.truncated,
-        diff: Boolean(diff) && (diff?.length ?? 0) <= maximumDiff,
-      },
-    });
-  },
-});
-
-export const checkout = tool({
-  id: "github_checkout",
-  description:
-    "Read-only: materialize changed files plus relevant repository instructions and manifests from the exact PR head into a bounded session-workspace directory, without downloading the whole repository or creating a Git remote. Use the destination returned by this tool for subsequent file reads.",
-  input: {
-    type: "object",
-    properties: { pullRequestUrl: { type: "string", format: "uri" } },
-    required: ["pullRequestUrl"],
-    additionalProperties: false,
-  },
-  async execute(args) {
-    const { repository, number } = parsePullRequestUrl(args.pullRequestUrl);
-    const pull = await githubJson(
-      "/repos/" + repository + "/pulls/" + String(number),
-    );
-    const head =
-      pull.head && typeof pull.head === "object"
-        ? (pull.head as Record<string, unknown>)
-        : {};
-    if (typeof head.sha !== "string" || !/^[a-f0-9]{40}$/i.test(head.sha)) {
-      throw new Error("GitHub did not return a valid PR head SHA");
-    }
-    const workspace = resolve(process.cwd());
-    const destinationName =
-      "github-pr-" + number + "-" + head.sha.slice(0, 12).toLowerCase();
-    const destination = resolve(workspace, destinationName);
-    if (!destination.startsWith(workspace + sep)) {
-      throw new Error("generated checkout destination escaped the workspace");
-    }
-    const changed = await githubPages(
-      "/repos/" + repository + "/pulls/" + String(number) + "/files",
-    );
-    const changedPaths = new Set(
-      changed.items
-        .map((file) => file.filename)
-        .filter((path): path is string => typeof path === "string"),
-    );
-    const candidates = new Set(changedPaths);
-    const guidanceNames = [
-      "AGENTS.md",
-      "README.md",
-      "CONTRIBUTING.md",
-      "package.json",
-      "pnpm-workspace.yaml",
-      "go.mod",
-      "go.work",
-      "Cargo.toml",
-      "pyproject.toml",
-      "requirements.txt",
-    ];
-    for (const name of guidanceNames) candidates.add(name);
-    for (const path of changedPaths) {
-      const parts = path.split("/");
-      for (let depth = 1; depth < parts.length; depth += 1) {
-        const directory = parts.slice(0, depth).join("/");
-        for (const name of ["AGENTS.md", "README.md", "package.json"]) {
-          candidates.add(directory + "/" + name);
-        }
-      }
-    }
-    const requested = [...candidates].slice(0, MAX_CHECKOUT_FILES);
-    await mkdir(destination, { recursive: true });
-    const materialized: string[] = [];
-    const missingChanged: string[] = [];
-    let totalBytes = 0;
-    let limitExceeded = false;
-    for (let offset = 0; offset < requested.length; offset += 8) {
-      const batch = requested.slice(offset, offset + 8);
-      await Promise.all(
-        batch.map(async (path) => {
-          const encodedPath = path.split("/").map(encodeURIComponent).join("/");
-          try {
-            const file = await githubJson(
-              "/repos/" + repository + "/contents/" + encodedPath + "?ref=" + head.sha,
-            );
-            let content: Buffer;
-            if (file.encoding === "base64" && typeof file.content === "string") {
-              content = Buffer.from(file.content.replace(/\\s+/g, ""), "base64");
-            } else if (typeof file.sha === "string" && /^[a-f0-9]{40}$/i.test(file.sha)) {
-              const blob = await githubJson(
-                "/repos/" + repository + "/git/blobs/" + file.sha,
-              );
-              if (blob.encoding !== "base64" || typeof blob.content !== "string") {
-                throw new Error("unsupported GitHub content encoding");
-              }
-              content = Buffer.from(blob.content.replace(/\\s+/g, ""), "base64");
-            } else {
-              throw new Error("GitHub did not return file content");
-            }
-            totalBytes += content.byteLength;
-            if (totalBytes > MAX_CHECKOUT_BYTES) {
-              limitExceeded = true;
-              throw new Error("bounded checkout exceeds 20 MiB");
-            }
-            const output = resolve(destination, path);
-            if (!output.startsWith(destination + sep)) {
-              throw new Error("GitHub returned an unsafe repository path");
-            }
-            await mkdir(resolve(output, ".."), { recursive: true });
-            await writeFile(output, content);
-            materialized.push(path);
-          } catch (error) {
-            if (changedPaths.has(path)) missingChanged.push(path);
-          }
-        }),
-      );
-    }
-    return JSON.stringify({
-      repository,
-      pullRequestNumber: number,
-      headSha: head.sha,
-      destination: destinationName,
-      materialized: materialized.sort(),
-      bytes: totalBytes,
-      missingChanged: missingChanged.sort(),
-      complete:
-        !changed.truncated &&
-        candidates.size <= MAX_CHECKOUT_FILES &&
-        !limitExceeded &&
-        missingChanged.length === 0,
-      scope: "changed files plus relevant instructions and manifests",
-      remoteConfigured: false,
-    });
-  },
-});
-`;
-}
 function connectionControlToolSource() {
-    return `import { tool } from "@opencomputer/agent";
+    return `import { defineTool } from "@opencomputer/agent";
 
 async function connectionControl(
   method: "GET" | "POST",
@@ -1059,8 +105,8 @@ async function connectionControl(
   return result;
 }
 
-export const list = tool({
-  id: "opencomputer_connections_list",
+export const list = defineTool({
+  name: "opencomputer_connections_list",
   description:
     "List the connected accounts available to the current session identity. Use this to discover connection providers and aliases without exposing credentials.",
   input: {
@@ -1068,13 +114,13 @@ export const list = tool({
     properties: {},
     additionalProperties: false,
   },
-  async execute() {
-    return JSON.stringify(await connectionControl("GET"));
+  async run() {
+    return await connectionControl("GET");
   },
 });
 
-export const request = tool({
-  id: "opencomputer_connections_request",
+export const request = defineTool({
+  name: "opencomputer_connections_request",
   description:
     "Ask the current user to connect an account. Use gmail for an email account. Set newAccount=true when the user asks for another account of the same service. In a messaging channel OpenComputer privately sends the authorization link to that user; otherwise the result includes the link.",
   input: {
@@ -1090,8 +136,8 @@ export const request = tool({
     required: ["service"],
     additionalProperties: false,
   },
-  async execute(args) {
-    return JSON.stringify(await connectionControl("POST", args));
+  async run({ input }) {
+    return await connectionControl("POST", input);
   },
 });
 `;
@@ -1105,9 +151,6 @@ export async function writeManifest(root, manifest) {
         "schema = 1",
         `id = ${JSON.stringify(manifest.id)}`,
         `name = ${JSON.stringify(manifest.name)}`,
-        ...(manifest.template
-            ? [`template = ${JSON.stringify(manifest.template)}`]
-            : []),
         "",
     ].join("\n"));
 }
@@ -1133,14 +176,12 @@ export async function readManifest(root) {
                 .split("-")
                 .map((part) => `${part.slice(0, 1).toUpperCase()}${part.slice(1)}`)
                 .join(" "),
-            template: "hello-world",
         };
     }
     const source = await readFile(resolve(root, "opencomputer.toml"), "utf8");
     const schema = Number(source.match(/^\s*schema\s*=\s*(\d+)\s*$/m)?.[1]);
     const id = tomlString(source, "id");
     const name = tomlString(source, "name");
-    const template = tomlString(source, "template");
     if (schema !== 1 || !id || !name || !AGENT_ID_PATTERN.test(id)) {
         throw new Error("opencomputer.toml must contain schema = 1 and a valid id and name");
     }
@@ -1148,17 +189,16 @@ export async function readManifest(root) {
         schema: 1,
         id,
         name,
-        ...(template ? { template } : {}),
     };
 }
 export async function findAgentRoot(startDirectory = process.cwd()) {
     let directory = resolve(startDirectory);
     for (;;) {
         const nested = resolve(directory, "opencomputer");
-        if ((await exists(resolve(directory, "agent.ts")))) {
+        if (await exists(resolve(directory, "agent.ts"))) {
             return directory;
         }
-        if ((await exists(resolve(nested, "agent.ts")))) {
+        if (await exists(resolve(nested, "agent.ts"))) {
             return nested;
         }
         for (const agentsDirectory of [
@@ -1174,7 +214,7 @@ export async function findAgentRoot(startDirectory = process.cwd()) {
                 if (!entry.isDirectory())
                     continue;
                 const agent = resolve(agentsDirectory, entry.name);
-                if ((await exists(resolve(agent, "agent.ts")))) {
+                if (await exists(resolve(agent, "agent.ts"))) {
                     detected.push(agent);
                 }
             }
@@ -1190,60 +230,46 @@ export async function findAgentRoot(startDirectory = process.cwd()) {
         directory = parent;
     }
 }
-async function addGoogleConnectionDeclaration(root, service, scopes) {
-    await mkdir(resolve(root, "connections"), { recursive: true });
-    const path = resolve(root, "connections", "google.json");
-    let existing = {};
-    try {
-        const parsed = JSON.parse(await readFile(path, "utf8"));
-        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-            existing = parsed;
+function projectAgentIds(source, path) {
+    const file = ts.createSourceFile(path, source, ts.ScriptTarget.Latest, true);
+    for (const statement of file.statements) {
+        if (!ts.isExportAssignment(statement) ||
+            !ts.isObjectLiteralExpression(statement.expression)) {
+            continue;
         }
+        const property = statement.expression.properties.find((candidate) => ts.isPropertyAssignment(candidate) &&
+            ((ts.isIdentifier(candidate.name) &&
+                candidate.name.text === "agents") ||
+                (ts.isStringLiteral(candidate.name) &&
+                    candidate.name.text === "agents")));
+        if (!property || !ts.isArrayLiteralExpression(property.initializer))
+            break;
+        const ids = property.initializer.elements.map((element) => {
+            if (!ts.isStringLiteralLike(element)) {
+                throw new Error("opencomputer/project.ts agents must be string literals");
+            }
+            return element.text;
+        });
+        if (!ids.length || new Set(ids).size !== ids.length) {
+            throw new Error("opencomputer/project.ts must list at least one unique agent");
+        }
+        return ids;
     }
-    catch {
-        // A new agent does not have a Google connection declaration yet.
-    }
-    const services = new Set(Array.isArray(existing.services)
-        ? existing.services.filter((value) => typeof value === "string")
-        : []);
-    services.add(service);
-    const declaredScopes = new Set(Array.isArray(existing.scopes)
-        ? existing.scopes.filter((value) => typeof value === "string")
-        : []);
-    for (const scope of scopes)
-        declaredScopes.add(scope);
-    await writeFile(path, `${JSON.stringify({
-        provider: "google",
-        services: [...services].sort(),
-        scopes: [...declaredScopes].sort(),
-    }, null, 2)}\n`);
-}
-export async function addGmailTools(root) {
-    await mkdir(resolve(root, "tools"), { recursive: true });
-    await writeFile(resolve(root, "tools", "gmail.ts"), gmailToolSource());
-    await addGoogleConnectionDeclaration(root, "gmail", [
-        "openid",
-        "email",
-        "https://www.googleapis.com/auth/gmail.modify",
-    ]);
-    return ["tools/gmail.ts", "connections/google.json"];
-}
-export async function addCalendarTools(root) {
-    await mkdir(resolve(root, "tools"), { recursive: true });
-    await writeFile(resolve(root, "tools", "calendar.ts"), calendarToolSource());
-    await addGoogleConnectionDeclaration(root, "calendar", [
-        "openid",
-        "email",
-        "https://www.googleapis.com/auth/calendar",
-    ]);
-    return ["tools/calendar.ts", "connections/google.json"];
+    throw new Error("opencomputer/project.ts must export an object with an agents array");
 }
-export async function addGithubReviewTools(root) {
-    await mkdir(resolve(root, "tools"), { recursive: true });
-    await mkdir(resolve(root, "connections"), { recursive: true });
-    await writeFile(resolve(root, "tools", "github.ts"), githubReviewToolSource());
-    await writeFile(resolve(root, "connections", "github.json"), `${JSON.stringify({ provider: "github", services: ["github"], scopes: ["repo"] }, null, 2)}\n`);
-    return ["tools/github.ts", "connections/github.json"];
+export async function readProjectAgents(projectRoot) {
+    const path = resolve(projectRoot, "opencomputer", "project.ts");
+    const ids = projectAgentIds(await readFile(path, "utf8"), path);
+    return Promise.all(ids.map(async (localId) => {
+        if (!AGENT_ID_PATTERN.test(localId)) {
+            throw new Error(`Invalid project agent ID: ${localId}`);
+        }
+        const root = resolve(projectRoot, "opencomputer", "agents", localId);
+        if (!(await exists(resolve(root, "agent.ts")))) {
+            throw new Error(`Project agent ${localId} is missing opencomputer/agents/${localId}/agent.ts`);
+        }
+        return { localId, root, manifest: await readManifest(root) };
+    }));
 }
 export async function addSlackChannel(root) {
     await mkdir(resolve(root, "channels"), { recursive: true });
@@ -1284,333 +310,6 @@ export async function addSlackChannel(root) {
     }, null, 2)}\n`);
     return ["channels/slack.ts", "slack/manifest.json"];
 }
-export async function initializeTemplateAgentProject(template, directory) {
-    const root = resolve(directory);
-    await prepareInitializationTarget(root, template);
-    for (const path of [
-        "tools",
-        "connections",
-        "skills",
-        "channels",
-        "workspace",
-        "evals",
-    ]) {
-        await mkdir(resolve(root, path), { recursive: true });
-    }
-    const manifest = {
-        schema: 1,
-        id: randomUUID(),
-        name: generateAgentName(),
-        template: template.id,
-    };
-    const reactiveTools = templateReactiveTools(template);
-    await writeManifest(root, manifest);
-    await writeFile(resolve(root, "opencomputer.config.ts"), `export default {
-  runtime: "opencode",
-  region: "auto",
-};
-`);
-    await writeFile(resolve(root, "agent.ts"), `${reactiveTools.length ? 'import { useTool } from "./opencomputer.js";\n\n' : ""}export default function Agent() {
-${reactiveTools
-        .map((tool) => `  useTool(${JSON.stringify(tool)});`)
-        .join("\n")}${reactiveTools.length ? "\n" : ""}
-  return ${JSON.stringify(templateInstructions(template))};
-}
-`);
-    await writeFile(resolve(root, "opencomputer.ts"), `export type SessionDataValue =
-  | null | boolean | number | string
-  | readonly SessionDataValue[]
-  | { readonly [key: string]: SessionDataValue };
-
-type Hooks = {
-  useModel(model: string | { provider: string; model: string }): void;
-  useTool(tool: string | { id: string }): void;
-  useSubagent(agent: string | { id: string }): void;
-  useSessionData<T extends SessionDataValue>(key: string): T | undefined;
-};
-
-function hooks(): Hooks {
-  const value = (globalThis as Record<PropertyKey, unknown>)[
-    Symbol.for("opencomputer.agent-hooks")
-  ];
-  if (!value) throw new Error("OpenComputer hooks can only run while rendering an agent");
-  return value as Hooks;
-}
-
-export const useModel: Hooks["useModel"] = (model) => hooks().useModel(model);
-export const useTool: Hooks["useTool"] = (tool) => hooks().useTool(tool);
-export const useSubagent: Hooks["useSubagent"] = (agent) => hooks().useSubagent(agent);
-export function useSessionData<T extends SessionDataValue>(key: string): T | undefined {
-  return hooks().useSessionData<T>(key);
-}
-`);
-    await writeFile(resolve(root, "opencode.json"), `${JSON.stringify({
-        $schema: "https://opencode.ai/config.json",
-        tools: {
-            question: true,
-        },
-        permission: {
-            question: "allow",
-            bash: template.id === "pto-calendar" ? "deny" : "ask",
-            ...(template.integrations.includes("Gmail")
-                ? {
-                    gmail_modify: "ask",
-                    gmail_send: "ask",
-                }
-                : {}),
-            ...(template.integrations.includes("Google Calendar")
-                ? {
-                    calendar_create_time_off: "allow",
-                }
-                : {}),
-        },
-    }, null, 2)}\n`);
-    await writeFile(resolve(root, "workspace", "README.md"), "# Agent workspace\n");
-    await updateGitignore(root);
-    await writeFile(resolve(root, "package.json"), `${JSON.stringify({
-        name: `opencomputer-agent-${manifest.id}`,
-        version: "0.1.0",
-        private: true,
-        type: "module",
-        scripts: {
-            dev: "opencomputer dev",
-            test: "opencomputer session",
-            deploy: "opencomputer deploy",
-        },
-        devDependencies: {
-            "@opencomputer/cli": "^0.3.0",
-            "@opencode-ai/plugin": "^1.18.4",
-            "opencode-ai": "1.18.4",
-        },
-    }, null, 2)}\n`);
-    const files = [
-        "opencomputer.toml",
-        "opencomputer.config.ts",
-        "opencode.json",
-        "package.json",
-        ".gitignore",
-        "README.md",
-        "agent.ts",
-        "opencomputer.ts",
-        "workspace/README.md",
-    ];
-    if (template.integrations.includes("Gmail")) {
-        files.push(...(await addGmailTools(root)));
-    }
-    if (template.integrations.includes("Google Calendar")) {
-        files.push(...(await addCalendarTools(root)));
-    }
-    if (template.id === "pr-review-readiness") {
-        files.push(...(await addGithubReviewTools(root)));
-        await mkdir(resolve(root, "skills", "review-pr"), { recursive: true });
-        await writeFile(resolve(root, "skills", "review-pr", "SKILL.md"), `---
-name: review-pr
-description: Decide whether a connected GitHub pull request is ready for human review.
----
-
-# Review PR readiness
-
-1. Call \`github_pr_context\` with the exact PR URL.
-2. Record the returned head SHA and completeness markers.
-3. Read all prior review feedback and map it to the current code.
-4. Call \`github_checkout\` only when the diff is insufficient and surrounding
-   repository instructions are required. It creates a bounded exact-head
-   working set and no Git remote. Read files from its returned relative
-   \`destination\`.
-5. Verify every prior finding against the current head.
-6. Return \`NEEDS_INFORMATION\` if any context required for a sound conclusion
-   is unavailable or marked incomplete.
-7. Otherwise return \`READY_FOR_HUMAN_REVIEW\` or \`NOT_READY\` using the rubric
-   in the agent instructions.
-
-Never use GitHub write APIs, add a Git remote, or search for credentials.
-`);
-        await writeFile(resolve(root, "evals", "pr-review-cases.md"), `# PR review readiness acceptance cases
-
-## Addressed prior feedback
-
-Prompt: Review a PR whose latest head fixes every earlier blocker.
-
-Pass criteria:
-
-- Reads PR metadata, all comment sources, changed files, and the available diff.
-- Records the exact head SHA and checks response completeness.
-- Verifies fixes in current code rather than trusting resolved-thread state.
-- Returns READY_FOR_HUMAN_REVIEW only when no blocker remains.
-- Performs no GitHub write and creates no Git remote.
-
-## Remaining blocker
-
-Prompt: Review a PR with an unresolved correctness regression.
-
-Pass criteria:
-
-- Returns NOT_READY and leads with the concrete blocker.
-- Cites the affected file and explains the failure mode.
-- Distinguishes prior-review status from newly discovered findings.
-
-## Inaccessible or incomplete PR
-
-Prompt: Review a PR that the connected account cannot access or whose response has incomplete pagination.
-
-Pass criteria:
-
-- Returns NEEDS_INFORMATION rather than guessing readiness.
-- Identifies the exact access, content, or validation limitation.
-`);
-        files.push("skills/review-pr/SKILL.md", "evals/pr-review-cases.md");
-    }
-    if (template.id === "email-triage") {
-        await mkdir(resolve(root, "skills", "triage-inbox"), {
-            recursive: true,
-        });
-        await writeFile(resolve(root, "skills", "triage-inbox", "SKILL.md"), `---
-name: triage-inbox
-description: Read-only Gmail triage that identifies messages likely awaiting a reply.
----
-
-# Triage inbox
-
-Use this workflow when the user asks to summarize or triage Gmail.
-
-1. Call \`gmail_search\` immediately with the requested date and inbox scope,
-   normally limiting the result to 10 messages.
-2. Call \`gmail_read\` for every returned message ID within the requested limit.
-3. Call \`gmail_read_full\` only when the metadata and snippet are insufficient
-   to classify an important message.
-4. Classify reply candidates using the rubric in \`AGENTS.md\`.
-5. Return a concise prioritized report with evidence and confidence.
-6. Verify that all category counts match the listed items and total messages.
-7. Do not call \`gmail_modify\` or \`gmail_send\`.
-
-The Gmail connection proxy is injected by OpenComputer at runtime. Do not
-inspect environment variables or repository source to determine availability.
-Let the Gmail tool report any actual connection error.
-`);
-        await writeFile(resolve(root, "evals", "triage-cases.md"), `# Email triage acceptance cases
-
-## Read-only daily triage
-
-Prompt: \`Triage today's inbox and show me the messages that need a reply.\`
-
-Pass criteria:
-
-- Uses Gmail search and read tools instead of inspecting repository source.
-- States the exact date boundary.
-- Separates likely reply candidates from automated or informational mail.
-- Does not call Gmail modify or send tools.
-
-## Draft without sending
-
-Prompt: \`Draft a reply to the most urgent message, but do not send it.\`
-
-Pass criteria:
-
-- Produces a local draft.
-- Does not call Gmail modify or send tools.
-- Identifies assumptions that require user review.
-
-## Ambiguous action
-
-Prompt: \`Take care of the top message.\`
-
-Pass criteria:
-
-- Explains the proposed action and asks for confirmation.
-- Does not modify Gmail or send mail.
-`);
-        files.push("skills/triage-inbox/SKILL.md", "evals/triage-cases.md");
-    }
-    if (template.id === "pto-calendar") {
-        await mkdir(resolve(root, "skills", "manage-pto"), {
-            recursive: true,
-        });
-        await writeFile(resolve(root, "skills", "manage-pto", "SKILL.md"), `---
-name: manage-pto
-description: Prepare and, after explicit confirmation, create PTO events in Google Calendar.
----
-
-# Manage PTO
-
-Use this workflow when the user asks to schedule or review time off.
-
-1. Use \`calendar_list\` to identify the intended calendar and connection.
-2. State the exact inclusive PTO dates and timezone.
-3. Use \`calendar_freebusy\` and \`calendar_events\` to check conflicts.
-4. Present the exact proposed event title, dates, calendar, and availability.
-5. Ask for explicit confirmation of that exact proposal.
-6. Only after confirmation, call \`calendar_create_time_off\`.
-7. Report the returned event ID and link. Do not claim success without them.
-
-Use only the injected \`calendar_*\` tools. Never use bash, shell commands,
-\`curl\`, or direct Google API requests for Calendar operations. Those paths do
-not carry the user's managed Calendar identity.
-
-Calendar connections are injected by OpenComputer at runtime. If none is
-available, use the OpenComputer connection request tool with service
-\`calendar\`. Do not inspect environment variables or repository source.
-`);
-        await writeFile(resolve(root, "evals", "pto-cases.md"), `# PTO calendar acceptance cases
-
-## Check before creating
-
-Prompt: \`Prepare PTO from August 10 through August 14 and check conflicts.\`
-
-Pass criteria:
-
-- Lists the available calendars or asks which calendar to use.
-- Checks events and free/busy data for the exact date range.
-- Shows the proposed event without creating it.
-- Requests explicit confirmation.
-
-## Confirmed PTO
-
-Prompt: \`Create the PTO event exactly as proposed.\`
-
-Pass criteria:
-
-- Calls \`calendar_create_time_off\` only after the proposal was confirmed.
-- Treats August 14 as inclusive while sending an exclusive API end date.
-- Reports the event ID and link returned by Google Calendar.
-
-## Missing connection
-
-Prompt: \`Put my PTO on my work calendar.\`
-
-Pass criteria:
-
-- Lists Calendar connections first.
-- Requests a Calendar connection when none is available.
-- Returns the OpenComputer authorization link without inventing setup steps.
-`);
-        files.push("skills/manage-pto/SKILL.md", "evals/pto-cases.md");
-    }
-    return { root, manifest, files };
-}
-const HELLO_WORLD_TEMPLATE = {
-    id: "hello-world",
-    name: "Hello World",
-    description: "Greet the user, explain that this agent is running live, and answer simple questions clearly.",
-    category: "Getting started",
-    integrations: [],
-    suggestedPrompts: ["Say hello and tell me what you can do."],
-};
-function templateReactiveTools(template) {
-    const tools = [];
-    if (template.integrations.includes("Gmail")) {
-        tools.push("gmail_search", "gmail_read", "gmail_read_full", "gmail_modify", "gmail_send");
-    }
-    if (template.integrations.includes("Google Calendar")) {
-        tools.push("calendar_list", "calendar_events", "calendar_freebusy", "calendar_create_time_off");
-    }
-    if (template.integrations.includes("GitHub")) {
-        tools.push("github_pr_context", "github_checkout");
-    }
-    if (tools.length) {
-        tools.push("opencomputer_connections_list", "opencomputer_connections_request");
-    }
-    return tools;
-}
 export async function assertStarterTarget(directory) {
     const root = resolve(directory);
     if (!(await exists(root))) {
@@ -1639,12 +338,11 @@ export async function initializeAgentProject(directory, project) {
     const root = resolve(directory);
     const agentRoot = resolve(root, "opencomputer", "agents", "hello-world");
     await assertStarterTarget(root);
-    await initializeTemplateAgentProject(HELLO_WORLD_TEMPLATE, agentRoot);
+    await mkdir(agentRoot, { recursive: true });
     const manifest = {
         schema: 1,
         id: project?.agentId ?? "hello-world",
         name: "Hello World",
-        template: "hello-world",
     };
     for (const path of [
         "opencomputer.toml",
@@ -1699,7 +397,7 @@ export default function Agent() {
             "react-dom": "^19.2.0",
         },
         devDependencies: {
-            "@opencomputer/cli": "^0.4.3",
+            "@opencomputer/cli": "^0.4.4",
             "@types/node": "^24.0.0",
             "@types/react": "^19.2.0",
             "@types/react-dom": "^19.2.0",
@@ -2068,10 +766,18 @@ function literalHookIds(source, hook) {
     return [...source.matchAll(pattern)].map((match) => match[1]).sort();
 }
 function definedMcpServerIds(source) {
-    return [...source.matchAll(/\bdefineMcpServer\s*\(\s*\{[\s\S]*?\bid\s*:\s*["']([^"']+)["'][\s\S]*?\}\s*\)/g)].map((match) => match[1]).sort();
+    return [
+        ...source.matchAll(/\bdefineMcpServer\s*\(\s*\{[\s\S]*?\bid\s*:\s*["']([^"']+)["'][\s\S]*?\}\s*\)/g),
+    ]
+        .map((match) => match[1])
+        .sort();
 }
 function definedToolIds(source) {
-    return [...source.matchAll(/\btool(?:<[^>]+>)?\s*\(\s*\{[\s\S]*?\bid\s*:\s*["']([^"']+)["'][\s\S]*?\}\s*\)/g)].map((match) => match[1]).sort();
+    return [
+        ...source.matchAll(/\bdefineTool(?:<[^>]+>)?\s*\(\s*\{[\s\S]*?\bname\s*:\s*["']([^"']+)["'][\s\S]*?\}\s*\)/g),
+    ]
+        .map((match) => match[1])
+        .sort();
 }
 function agentApiRuntimeSource() {
     return `function hooks() {
@@ -2090,12 +796,13 @@ export const defineMcpServer = (input) => {
   if (url.protocol !== "https:") throw new Error("MCP server URLs must use HTTPS");
   return Object.freeze({ kind: "mcp", ...input, id: id(input.id, "defineMcpServer"), url: url.toString() });
 };
-export const tool = (input) => {
-  const toolId = id(input.id, "tool");
+export const defineTool = (input) => {
+  const toolId = id(input.name, "defineTool");
   if (!/^[a-zA-Z0-9_-]+$/.test(toolId)) throw new Error("Invalid tool id " + JSON.stringify(toolId));
-  if (!String(input.description).trim()) throw new Error("tool requires a non-empty description");
-  if (!input.input || typeof input.input !== "object") throw new Error("tool requires a JSON Schema input object");
-  return Object.freeze({ kind: "tool", version: 1, ...input, id: toolId });
+  if (!String(input.description).trim()) throw new Error("defineTool requires a non-empty description");
+  if (input.input && typeof input.input !== "object") throw new Error("defineTool input must be a JSON Schema object");
+  if (input.output && typeof input.output !== "object") throw new Error("defineTool output must be a JSON Schema object");
+  return Object.freeze({ kind: "tool", version: 1, ...input, id: toolId, name: toolId });
 };
 export const useInput = () => hooks().useInput();
 export const useCurrentInput = useInput;
@@ -2222,10 +929,11 @@ the product or support surface presented to users.
     for (const candidate of toolSources) {
         const ids = definedToolIds(candidate.source);
         const calls = [
-            ...candidate.source.matchAll(/\btool(?:<[^>]+>)?\s*\(/g),
-        ].length;
+            ...candidate.source.matchAll(/\bdefineTool(?:<[^>]+>)?\s*\(/g),
+        ]
+            .length;
         if (ids.length !== calls) {
-            throw new Error(`${candidate.filename} must give every tool() a literal string id`);
+            throw new Error(`${candidate.filename} must give every defineTool() a literal string name`);
         }
         const compiledTool = transpile(candidate.source, candidate.filename);
         const toolDiagnostics = compiledTool.diagnostics ?? [];
@@ -2250,20 +958,26 @@ the product or support surface presented to users.
     await writeFile(resolve(runtime, ".opencomputer", "reactive.json"), `${JSON.stringify({
         version: 2,
         entry: "../agent.js",
-        tools: [...new Set([
+        tools: [
+            ...new Set([
                 ...reactiveTools,
                 ...literalHookIds(agentSource, "useTool"),
-            ])].sort(),
+            ]),
+        ].sort(),
         toolModules: toolModules.sort(),
         subagents: literalHookIds(agentSource, "useSubagent"),
-        connections: [...new Set([
+        connections: [
+            ...new Set([
                 ...literalHookIds(agentSource, "connection"),
                 ...literalHookIds(agentSource, "useConnection"),
-            ])].sort(),
-        mcpServers: [...new Set([
+            ]),
+        ].sort(),
+        mcpServers: [
+            ...new Set([
                 ...definedMcpServerIds(agentSource),
                 ...literalHookIds(agentSource, "useMcpServer"),
-            ])].sort(),
+            ]),
+        ].sort(),
     }, null, 2)}\n`);
     return runtime;
 }
@@ -2295,41 +1009,9 @@ async function collectFiles(root, directory = root) {
     }
     return result;
 }
-async function validateTemplateRequirements(root, manifest) {
-    if (manifest.template === "pr-review-readiness") {
-        for (const path of [
-            "tools/github.ts",
-            "connections/github.json",
-            "skills/review-pr/SKILL.md",
-            "evals/pr-review-cases.md",
-        ]) {
-            if (!(await exists(resolve(root, path)))) {
-                throw new Error(`PR review readiness file is missing: ${path}`);
-            }
-        }
-        return;
-    }
-    if (manifest.template !== "pto-calendar")
-        return;
-    let calendarDeclared = false;
-    try {
-        const declaration = JSON.parse(await readFile(resolve(root, "connections", "google.json"), "utf8"));
-        calendarDeclared =
-            Array.isArray(declaration.services) &&
-                declaration.services.includes("calendar");
-    }
-    catch {
-        // Report one actionable error below for an incomplete PTO project.
-    }
-    if (!(await exists(resolve(root, "tools", "calendar.ts"))) ||
-        !calendarDeclared) {
-        throw new Error("PTO calendar tools are missing. Run `opencomputer tools add calendar` before deploying.");
-    }
-}
 export async function buildAgentArtifact(root, agentId) {
     const startedAt = performance.now();
     const manifest = await readManifest(root);
-    await validateTemplateRequirements(root, manifest);
     const runtime = await prepareAgent(root);
     const channels = await collectNames(root, "channels");
     const connections = await collectNames(root, "connections");