@keystrokehq/cli 0.1.49 → 0.1.51

package/dist/index.mjs

@@ -4809,11 +4809,11 @@ async function resolveProjectRef(platform, ref) {
 	if (looksLikeUuid(ref)) try {
 		return await platform.projects.get(ref);
 	} catch (error) {
-		if (error instanceof PlatformError && error.status === 404) throw new Error(`Project ${ref} not found in the active organization. Run \`keystroke project list\`, then \`keystroke project link --project <slug>\`.`);
+		if (error instanceof PlatformError && error.status === 404) throw new Error(`Project ${ref} not found in the active organization. Run \`keystroke projects list\`, then \`keystroke projects link --project <slug>\`.`);
 		throw error;
 	}
 	const match = (await platform.projects.list()).find((project) => project.slug === ref);
-	if (!match) throw new Error(`Project "${ref}" not found in the active organization. Run \`keystroke project list\`.`);
+	if (!match) throw new Error(`Project "${ref}" not found in the active organization. Run \`keystroke projects list\`.`);
 	return match;
 }
 function resolveOrganizationRef(organizations, ref) {
@@ -5110,7 +5110,7 @@ async function resolveApiTarget(config, options = {}) {
 	if (getEffectiveApiTarget(config) === "local") return resolveLocalTarget(options);
 	if (!options.projectScoped) return resolveOrgPlatformTarget(config);
 	const projectRef = options.projectId ?? readLinkedProjectConfig().project;
-	if (!projectRef) throw new Error("No project selected. Pass `--project <slug>` or run `keystroke project link --project <slug>`.");
+	if (!projectRef) throw new Error("No project selected. Pass `--project <slug>` or run `keystroke projects link --project <slug>`.");
 	return resolvePlatformTarget(config, projectRef);
 }
 //#endregion
@@ -5283,7 +5283,7 @@ async function requireAdminRole(config) {
 	if (!active || active.role !== "owner" && active.role !== "admin") throw new Error("--admin requires org owner or admin");
 }
 //#endregion
-//#region src/commands/agent/list.ts
+//#region src/commands/agents/list.ts
 function registerAgentListCommand(agent) {
 	agent.command("list").description("List agents in the active organization").option("--admin", "List all org resources (org owner or admin only)").action((options) => runCliCommand("List agents failed", async () => {
 		const config = createCliConfig();
@@ -5299,7 +5299,7 @@ function registerAgentListCommand(agent) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/agent/prompt.ts
+//#region src/commands/agents/prompt.ts
 function registerAgentPromptCommand(agent) {
 	agent.command("prompt").description("Send a message to an agent (or follow up in an existing session)").argument("<agentId>", "Agent key / route id").requiredOption("--message <text>", "Message to send").option("--session-id <id>", "Existing session id for follow-up").action((agentId, options) => runProjectCliCommand("Agent prompt failed", async ({ client }) => {
 		const result = await client.agents.prompt(agentId, {
@@ -5310,7 +5310,7 @@ function registerAgentPromptCommand(agent) {
 	}));
 }
 //#endregion
-//#region src/commands/project/run-project.ts
+//#region src/commands/projects/run-project.ts
 async function withActivePlatformClient(config, fn, fromDir = process.cwd(), applyLinkedOrganization = true) {
 	if (applyLinkedOrganization) await ensureLinkedOrganization(config, fromDir);
 	const platform = createCliPlatformClient(config);
@@ -5323,7 +5323,7 @@ function writeInactiveDeployHints(projects) {
 	const bin = cliBinaryName();
 	for (const project of projects) {
 		if (project.status !== "inactive") continue;
-		process.stderr.write(`Project ${formatProjectLabel(project)} is inactive. Deploy with: ${bin} project link --project ${formatProjectLabel(project)}, then ${bin} deploy\n`);
+		process.stderr.write(`Project ${formatProjectLabel(project)} is inactive. Deploy with: ${bin} projects link --project ${formatProjectLabel(project)}, then ${bin} deploy\n`);
 	}
 }
 async function runProjectList(config, options = {}) {
@@ -5333,7 +5333,7 @@ async function runProjectList(config, options = {}) {
 		process.stdout.write(`${JSON.stringify({ projects }, null, 2)}\n`);
 		if (projects.length === 0) {
 			const bin = cliBinaryName();
-			process.stderr.write(`No projects yet. Create one with: ${bin} project create --name "My project"\n`);
+			process.stderr.write(`No projects yet. Create one with: ${bin} projects create --name "My project"\n`);
 			return;
 		}
 		writeInactiveDeployHints(projects);
@@ -5380,15 +5380,15 @@ async function runProjectDelete(config, projectId) {
 	});
 }
 //#endregion
-//#region src/commands/agent/cancel-session.ts
-async function runAgentSessionCancel(config, sessionId) {
+//#region src/commands/agents/cancel-session.ts
+async function runAgentSessionCancel(config, _agentId, sessionId) {
 	await withActivePlatformClient(config, async (platform) => {
 		const run = await platform.agents.cancelSession(sessionId);
 		process.stdout.write(`${JSON.stringify(run, null, 2)}\n`);
 	});
 }
 //#endregion
-//#region src/commands/agent/sessions.ts
+//#region src/commands/agents/sessions.ts
 function registerAgentSessionsCommand(agent) {
 	const sessions = agent.command("sessions").description("List and inspect agent sessions");
 	sessions.command("list").description("List sessions for an agent").argument("<agentId>", "Agent key / route id").option("--limit <n>", "Page size (1–100)", "20").option("--cursor <cursor>", "Pagination cursor from a previous page").option("--status <status>", "Filter by status (running, completed, failed)").option("--source <source>", "Filter by source (api, gateway)").action((agentId, options) => runProjectCliCommand("List agent sessions failed", async ({ client }) => {
@@ -5404,10 +5404,10 @@ function registerAgentSessionsCommand(agent) {
 		const result = await client.agents.getSession(agentId, sessionId, { include: options.include });
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 	}));
-	sessions.command("cancel").description("Cancel a running agent session").argument("<sessionId>", "Agent session id").action(async (sessionId) => {
+	sessions.command("cancel").description("Cancel a running agent session").argument("<agentId>", "Agent key / route id").argument("<sessionId>", "Agent session id").action(async (agentId, sessionId) => {
 		const config = createCliConfig();
 		try {
-			await runAgentSessionCancel(config, sessionId);
+			await runAgentSessionCancel(config, agentId, sessionId);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Cancel agent session failed", {
 				serverUrl: getPlatformUrl(config),
@@ -5418,12 +5418,12 @@ function registerAgentSessionsCommand(agent) {
 	});
 }
 //#endregion
-//#region src/commands/agent/index.ts
-function registerAgentCommand(program) {
-	const agent = program.command("agent").description("Invoke and inspect agents");
-	registerAgentListCommand(agent);
-	registerAgentPromptCommand(agent);
-	registerAgentSessionsCommand(agent);
+//#region src/commands/agents/index.ts
+function registerAgentsCommand(program) {
+	const agents = program.command("agents").description("Invoke and inspect agents");
+	registerAgentListCommand(agents);
+	registerAgentPromptCommand(agents);
+	registerAgentSessionsCommand(agents);
 }
 //#endregion
 //#region src/commands/api-key/run-api-key.ts
@@ -5482,7 +5482,7 @@ function registerApiKeyCommand(program) {
 	});
 }
 //#endregion
-//#region src/commands/app/action-hints.ts
+//#region src/commands/apps/action-hints.ts
 function toCamelCase(value) {
 	const pascal = value.split(/[^a-zA-Z0-9]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join("");
 	return pascal.charAt(0).toLowerCase() + pascal.slice(1);
@@ -5501,15 +5501,15 @@ function actionImportHint(app, tool) {
 /** Next-step hint printed after listing an app's actions. */
 function listActionsHint(app) {
 	const bin = cliBinaryName();
-	return `\nNext steps:\n  Inspect a tool:  ${bin} app action ${app} <TOOL_SLUG>\n  Run a tool:      ${bin} app execute ${app} <TOOL_SLUG> --input '{...}'\n`;
+	return `\nNext steps:\n  Inspect a tool:  ${bin} apps actions get ${app} <TOOL_SLUG>\n  Run a tool:      ${bin} apps execute ${app} <TOOL_SLUG> --input '{...}'\n`;
 }
 /** Next-step hint printed after showing one action's schema. */
 function showActionHint(app, tool) {
 	const bin = cliBinaryName();
-	return `\nNext steps:\n  Run ad-hoc:    ${bin} app execute ${app} ${tool} --input '{...}'\n  Use in code:   ${actionImportHint(app, tool)}\n  Not connected? ${bin} connect ${app}\n`;
+	return `\nNext steps:\n  Run ad-hoc:    ${bin} apps execute ${app} ${tool} --input '{...}'\n  Use in code:   ${actionImportHint(app, tool)}\n  Not connected? ${bin} connect ${app}\n`;
 }
 //#endregion
-//#region src/commands/app/run-app-catalog.ts
+//#region src/commands/apps/run-app-catalog.ts
 async function runAppSearch(client, query, options) {
 	const trimmed = query.trim();
 	if (!trimmed) throw new Error("Search query is required");
@@ -5546,21 +5546,10 @@ async function runAppAction(client, toolSlug) {
 	return client.apps.getCatalogAction(trimmed);
 }
 //#endregion
-//#region src/commands/app/action.ts
-function registerAppActionCommand(app) {
-	app.command("action").description("Show a catalog action schema, plus how to run and import it").argument("<app>", "App slug (e.g. github)").argument("<tool>", "Tool slug (e.g. github_create_an_issue)").action((appSlug, toolSlug) => runCliCommand("App action failed", async () => {
-		const config = createCliConfig();
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const result = await runAppAction(client, toolSlug);
-		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-		process.stderr.write(showActionHint(appSlug.trim().toLowerCase(), toolSlug.trim().toUpperCase()));
-	}, void 0, { orgScoped: true }));
-}
-//#endregion
-//#region src/commands/app/actions.ts
-function registerAppActionsCommand(app) {
-	app.command("actions [slug]").description("List or search a catalog app's actions (per app, or globally with --search)").option("--search <query>", "Search actions within the app or across all apps").option("--limit <n>", "Page size", (value) => Number.parseInt(value, 10)).option("--cursor <cursor>", "Pagination cursor").action((slug, options) => runCliCommand("App actions failed", async () => {
+//#region src/commands/apps/actions.ts
+function registerAppActionsCommands(app) {
+	const actions = app.command("actions").description("List and inspect catalog app actions");
+	actions.command("list").description("List or search a catalog app's actions").argument("[slug]", "App slug (omit for cross-app search with --search)").option("--search <query>", "Search actions within the app or across all apps").option("--limit <n>", "Page size", (value) => Number.parseInt(value, 10)).option("--cursor <cursor>", "Pagination cursor").action((slug, options) => runCliCommand("App actions list failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
 		await ensureActiveOrganization(config);
@@ -5571,9 +5560,17 @@ function registerAppActionsCommand(app) {
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 		if (slug?.trim()) process.stderr.write(listActionsHint(slug.trim().toLowerCase()));
 	}, void 0, { orgScoped: true }));
+	actions.command("get").description("Get a catalog action schema, plus how to run and import it").argument("<app>", "App slug (e.g. github)").argument("<tool>", "Tool slug (e.g. github_create_an_issue)").action((appSlug, toolSlug) => runCliCommand("App action get failed", async () => {
+		const config = createCliConfig();
+		const client = createCliPlatformClient(config);
+		await ensureActiveOrganization(config);
+		const result = await runAppAction(client, toolSlug);
+		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+		process.stderr.write(showActionHint(appSlug.trim().toLowerCase(), toolSlug.trim().toUpperCase()));
+	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/parse-custom-app-fields.ts
+//#region src/commands/apps/parse-custom-app-fields.ts
 function parseCustomAppFieldFlag(value) {
 	const parts = value.split(":").map((part) => part.trim()).filter(Boolean);
 	const key = parts[0];
@@ -5603,7 +5600,7 @@ function collectValues$1(value, previous) {
 	return [...previous, value];
 }
 //#endregion
-//#region src/commands/app/run-app-create.ts
+//#region src/commands/apps/run-app-create.ts
 async function runAppCreate(client, input, options) {
 	if (options?.preview) return {
 		preview: true,
@@ -5613,7 +5610,7 @@ async function runAppCreate(client, input, options) {
 	return client.apps.create(input);
 }
 //#endregion
-//#region src/commands/app/run-app-create-from-url.ts
+//#region src/commands/apps/run-app-create-from-url.ts
 async function discoverApp(client, source, url) {
 	switch (source) {
 		case "mcp": return client.apps.discoverMcp({ url });
@@ -5656,7 +5653,7 @@ async function runAppCreateFromUrl(client, input) {
 	return client.apps.create(request);
 }
 //#endregion
-//#region src/commands/app/create.ts
+//#region src/commands/apps/create.ts
 function resolveDiscoverSource(options) {
 	const sources = [
 		options.mcp ? {
@@ -5718,7 +5715,7 @@ function registerAppCreateCommand(app) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/run-app-execute.ts
+//#region src/commands/apps/run-app-execute.ts
 function isNotConnectedError(error) {
 	if (!(error instanceof PlatformError) || error.status !== 404) return false;
 	const body = error.body;
@@ -5749,7 +5746,7 @@ async function runAppExecute(client, appSlug, toolSlug, options) {
 	}
 }
 //#endregion
-//#region src/commands/app/execute.ts
+//#region src/commands/apps/execute.ts
 function registerAppExecuteCommand(app) {
 	app.command("execute").description("Run a connected catalog action against the cloud (no local server)").argument("<app>", "App slug (e.g. github)").argument("<tool>", "Tool slug (e.g. github_get_the_authenticated_user)").option("--input <json>", "JSON arguments (defaults to {})", "{}").option("--version <version>", "Pinned toolkit version (defaults to the catalog value)").option("--credential <slug>", `Pin a specific credential by slug (see '${cliBinaryName()} credentials list'); overrides the default and is the only way to use a user credential`).addHelpText("after", `
 Credential resolution matches the runtime: project default → org default. User credentials are
@@ -5757,10 +5754,10 @@ never a default — reach one with --credential <slug>. Target a project with th
 --project <slug> flag; without it, only org credentials resolve.
 
 Examples:
-  ${cliBinaryName()} app execute github github_get_the_authenticated_user
-  ${cliBinaryName()} app execute github github_get_the_authenticated_user --project my-app
-  ${cliBinaryName()} app execute github github_get_the_authenticated_user --credential work-github
-  ${cliBinaryName()} app execute acculynx acculynx_add_job_appointment --input '{"jobId":"123","startDate":"2026-01-01T09:00:00Z","endDate":"2026-01-01T10:00:00Z"}'
+  ${cliBinaryName()} apps execute github github_get_the_authenticated_user
+  ${cliBinaryName()} apps execute github github_get_the_authenticated_user --project my-app
+  ${cliBinaryName()} apps execute github github_get_the_authenticated_user --credential work-github
+  ${cliBinaryName()} apps execute acculynx acculynx_add_job_appointment --input '{"jobId":"123","startDate":"2026-01-01T09:00:00Z","endDate":"2026-01-01T10:00:00Z"}'
 `).action((appSlug, toolSlug, options) => runCliCommand("App execute failed", async () => {
 		const config = createCliConfig();
 		const client = createCliPlatformClient(config);
@@ -5775,17 +5772,28 @@ Examples:
 		});
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 	}, { usage: {
-		command: `${cliBinaryName()} app execute ${appSlug} ${toolSlug}`,
+		command: `${cliBinaryName()} apps execute ${appSlug} ${toolSlug}`,
 		flag: "--input"
 	} }, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/run-app-list.ts
+//#region src/commands/apps/get.ts
+function registerAppGetCommand(app) {
+	app.command("get").description("Get a Composio app from the live catalog").argument("<slug>", "App slug").action((slug) => runCliCommand("App get failed", async () => {
+		const config = createCliConfig();
+		const client = createCliPlatformClient(config);
+		await ensureActiveOrganization(config);
+		const result = await runAppShow(client, slug);
+		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+	}, void 0, { orgScoped: true }));
+}
+//#endregion
+//#region src/commands/apps/run-app-list.ts
 async function runAppList(client) {
 	return client.apps.listCatalog();
 }
 //#endregion
-//#region src/commands/app/list.ts
+//#region src/commands/apps/list.ts
 function registerAppListCommand(app) {
 	app.command("list").description("List connectable apps in the active organization").action(() => runCliCommand("List apps failed", async () => {
 		const config = createCliConfig();
@@ -5796,7 +5804,7 @@ function registerAppListCommand(app) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/search.ts
+//#region src/commands/apps/search.ts
 function registerAppSearchCommand(app) {
 	app.command("search").description("Search the Composio app catalog (live)").argument("<query>", "Search query").option("--category <category>", "Filter by category").option("--limit <n>", "Page size", (value) => Number.parseInt(value, 10)).option("--cursor <cursor>", "Pagination cursor").action((query, options) => runCliCommand("App search failed", async () => {
 		const config = createCliConfig();
@@ -5807,18 +5815,7 @@ function registerAppSearchCommand(app) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/show.ts
-function registerAppShowCommand(app) {
-	app.command("show").description("Show a Composio app from the live catalog").argument("<slug>", "App slug").action((slug) => runCliCommand("App show failed", async () => {
-		const config = createCliConfig();
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		const result = await runAppShow(client, slug);
-		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-	}, void 0, { orgScoped: true }));
-}
-//#endregion
-//#region src/commands/app/generate-app-stub.ts
+//#region src/commands/apps/generate-app-stub.ts
 function slugPartToExportName(part) {
 	return part.split(/[-_]+/).filter(Boolean).map((segment, index) => index === 0 ? segment.charAt(0).toLowerCase() + segment.slice(1) : segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
 }
@@ -5840,7 +5837,7 @@ function generateAppStub(app) {
 	return `import { defineApp } from "@keystrokehq/keystroke/app";
 import { z } from "zod";
 
-/** Synced from platform app \`${app.slug}\`. Re-run \`keystroke app sync ${app.slug}\` after template changes. */
+/** Synced from platform app \`${app.slug}\`. Re-run \`keystroke apps sync ${app.slug}\` after template changes. */
 export const ${exportName} = defineApp({
   slug: ${JSON.stringify(app.slug)},
   auth: "api_key",
@@ -5851,7 +5848,7 @@ ${credentialLines}
 `;
 }
 //#endregion
-//#region src/commands/app/run-app-sync.ts
+//#region src/commands/apps/run-app-sync.ts
 async function runAppSync(options) {
 	const projectRoot = resolveKeystrokeConfigRoot(options.dir ?? process.cwd());
 	if (!projectRoot) throw new Error("Not in a keystroke project (keystroke.config.ts not found)");
@@ -5863,7 +5860,7 @@ async function runAppSync(options) {
 	return { outputPath };
 }
 //#endregion
-//#region src/commands/app/sync.ts
+//#region src/commands/apps/sync.ts
 function registerAppSyncCommand(app) {
 	app.command("sync").description("Sync a custom app credential template into src/apps/<name>/app.ts").argument("<slug>", "App slug, e.g. acme/internal-api").option("--dir <dir>", "Project root (defaults to cwd)").action((slug, options) => runCliCommand("Sync app failed", async () => {
 		const config = createCliConfig();
@@ -5878,17 +5875,16 @@ function registerAppSyncCommand(app) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/app/index.ts
-function registerAppCommand(program) {
-	const app = program.command("app").description("Discover and run connectable integrations");
-	registerAppListCommand(app);
-	registerAppSearchCommand(app);
-	registerAppShowCommand(app);
-	registerAppActionsCommand(app);
-	registerAppActionCommand(app);
-	registerAppExecuteCommand(app);
-	registerAppCreateCommand(app);
-	registerAppSyncCommand(app);
+//#region src/commands/apps/index.ts
+function registerAppsCommand(program) {
+	const apps = program.command("apps").description("Discover and run connectable integrations");
+	registerAppListCommand(apps);
+	registerAppSearchCommand(apps);
+	registerAppGetCommand(apps);
+	registerAppActionsCommands(apps);
+	registerAppExecuteCommand(apps);
+	registerAppCreateCommand(apps);
+	registerAppSyncCommand(apps);
 }
 //#endregion
 //#region src/auth/open-url.ts
@@ -6181,14 +6177,14 @@ function scopeTypeFromCli(scope) {
 }
 //#endregion
 //#region src/commands/credentials/rotate-key.ts
-function registerCredentialsRotateKeyCommand(credentials) {
-	credentials.command("rotate-key").description("Rotate an api_key credential secret").argument("<id>", "Credential instance id").requiredOption("--set <field>", "Credential field as key=value or key=@env:VAR", collectSetValues$2, []).action((id, options) => runCredentialsCommand("Rotate credential key failed", async ({ platform, local }) => {
+function registerCredentialsRotateCommand(credentials) {
+	credentials.command("rotate").description("Rotate an api_key credential secret").argument("<id>", "Credential instance id").requiredOption("--set <field>", "Credential field as key=value or key=@env:VAR", collectSetValues$2, []).action((id, options) => runCredentialsCommand("Rotate credential failed", async ({ platform, local }) => {
 		const value = parseCredentialValueFields(options.set);
-		if (local) throw new Error("credentials rotate-key requires the platform API target (omit --local)");
+		if (local) throw new Error("credentials rotate requires the platform API target (omit --local)");
 		const patch = buildPlatformUpdatePatch({ value });
 		const credential = await platform.credentials.update(id, patch);
 		process.stdout.write(`${JSON.stringify({ credential }, null, 2)}\n`);
-	}));
+	})).alias("rotate-key");
 }
 function collectSetValues$2(value, previous) {
 	return previous.concat([value]);
@@ -6265,8 +6261,8 @@ function parseCredentialSetScopes(scopes, projectSlugs) {
 }
 //#endregion
 //#region src/commands/credentials/set.ts
-function registerCredentialsSetCommand(credentials) {
-	credentials.command("set").description("Create a new api_key credential instance").argument("<key>", "Credential key or app id, e.g. exa").option("--scope <scope>", "org, user, or project (repeatable)", collectValues, []).option("--project-slug <slug>", "Project slug when scope includes project (repeatable)", collectValues, []).option("--slug <slug>", "Friendly credential slug within the scope").option("--name <name>", "Display name (used to derive slug when --slug is omitted)").option("--label <label>", "Alias for --name").option("--default", "Mark as default for this scope").option("--set <field>", "Credential field as key=value or key=@env:VAR (falls back to project .env when unset in shell)", collectSetValues$1, []).action((key, options) => runCredentialsCommand("Set credential failed", async ({ platform, local }) => {
+function registerCredentialsCreateCommand(credentials) {
+	credentials.command("create").description("Create a new api_key credential instance").argument("<key>", "Credential key or app id, e.g. exa").option("--scope <scope>", "org, user, or project (repeatable)", collectValues, []).option("--project-slug <slug>", "Project slug when scope includes project (repeatable)", collectValues, []).option("--slug <slug>", "Friendly credential slug within the scope").option("--name <name>", "Display name (used to derive slug when --slug is omitted)").option("--label <label>", "Alias for --name").option("--default", "Mark as default for this scope").option("--set <field>", "Credential field as key=value or key=@env:VAR (falls back to project .env when unset in shell)", collectSetValues$1, []).action((key, options) => runCredentialsCommand("Set credential failed", async ({ platform, local }) => {
 		const value = parseCredentialValueFields(options.set);
 		const parsedScopes = parseCredentialSetScopes(options.scope, options.projectSlug);
 		if (local) {
@@ -6316,7 +6312,7 @@ function registerCredentialsSetCommand(credentials) {
 			return;
 		}
 		process.stdout.write(`${JSON.stringify({ credentials: created }, null, 2)}\n`);
-	}));
+	})).alias("set");
 }
 function collectValues(value, previous) {
 	return previous.concat([value]);
@@ -6376,9 +6372,9 @@ function registerCredentialsCommand(program) {
 	const credentials = program.command("credentials").description("Manage platform app credentials and local api_key instances");
 	registerCredentialsListCommand(credentials);
 	registerCredentialsGetCommand(credentials);
-	registerCredentialsSetCommand(credentials);
+	registerCredentialsCreateCommand(credentials);
 	registerCredentialsUpdateCommand(credentials);
-	registerCredentialsRotateKeyCommand(credentials);
+	registerCredentialsRotateCommand(credentials);
 	registerCredentialsDeleteCommand(credentials);
 	registerCredentialsAssignmentsCommands(credentials);
 	registerCredentialsConsumersCommands(credentials);
@@ -6583,7 +6579,7 @@ function registerBuildCommand(program) {
 		try {
 			const root = resolveProjectRoot(options.dir);
 			ensureSdkCurrent(root);
-			const { buildApp } = await import("./dist-DJFUIl5O.mjs");
+			const { buildApp } = await import("./dist-BVw5-nbD.mjs");
 			await buildApp({ root });
 			process.stdout.write(`Built ${root}\n`);
 		} catch (error) {
@@ -6706,7 +6702,7 @@ async function sleep(ms) {
 }
 async function buildDeployArchive(client, root, projectId, filter) {
 	if (filter?.length) {
-		const { buildFilteredApp } = await import("./dist-DJFUIl5O.mjs");
+		const { buildFilteredApp } = await import("./dist-BVw5-nbD.mjs");
 		const filtered = await buildFilteredApp({
 			root,
 			filter,
@@ -6728,7 +6724,7 @@ async function buildDeployArchive(client, root, projectId, filter) {
 			sourceFiles: filtered.sourceFiles
 		};
 	}
-	const { buildApp } = await import("./dist-DJFUIl5O.mjs");
+	const { buildApp } = await import("./dist-BVw5-nbD.mjs");
 	const { sourceFiles } = await buildApp({
 		root,
 		collectSources: true,
@@ -6788,7 +6784,7 @@ function registerDeployCommand(program) {
 			config = createCliConfig();
 			const root = resolveProjectRoot(options.dir);
 			const projectId = await resolveActiveProjectId(config, root);
-			if (!projectId) throw new Error("Usage: keystroke deploy --project <slug> (or run `keystroke project link --project <slug>`)");
+			if (!projectId) throw new Error("Usage: keystroke deploy --project <slug> (or run `keystroke projects link --project <slug>`)");
 			await runDeploy({
 				dir: options.dir,
 				projectId,
@@ -6853,7 +6849,7 @@ function runtimeChildEnv(parentEnv, overrides) {
 //#region src/project/bootstrap-run.ts
 /** Node args + env for `@keystrokehq/build` bootstrap (shared by start + dev). */
 async function resolveBootstrapRun(options) {
-	const { resolveRuntimeBuildArtifact } = await import("./dist-DJFUIl5O.mjs");
+	const { resolveRuntimeBuildArtifact } = await import("./dist-BVw5-nbD.mjs");
 	const loader = pathToFileURL(resolveRuntimeBuildArtifact(options.runtimeNodeModules, "dist/runtime-loader.mjs")).href;
 	const bootstrap = resolveRuntimeBuildArtifact(options.runtimeNodeModules, "dist/standalone-bootstrap.mjs");
 	const args = [`--import=${loader}`];
@@ -7002,7 +6998,7 @@ async function runDev(options) {
 	process.on("SIGINT", shutdown);
 	process.on("SIGTERM", shutdown);
 	try {
-		const { watchApp } = await import("./dist-DJFUIl5O.mjs");
+		const { watchApp } = await import("./dist-BVw5-nbD.mjs");
 		await watchApp({
 			root,
 			clean: false,
@@ -7494,7 +7490,7 @@ function registerInitCommand(program) {
 			process.stdout.write("\nNext steps:\n");
 			process.stdout.write(`  cd ${result.targetDir}\n`);
 			process.stdout.write("  keystroke auth login                  # once\n");
-			if (!project) process.stdout.write("  keystroke project link --project <slug>  # link this directory to a platform project\n");
+			if (!project) process.stdout.write("  keystroke projects link --project <slug>  # link this directory to a platform project\n");
 			process.stdout.write("  keystroke deploy                    # lint + typecheck + build + ship dist/\n");
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Init failed";
@@ -7654,7 +7650,7 @@ function registerOrganizationCommand(program) {
 	});
 }
 //#endregion
-//#region src/commands/project/run-project-link.ts
+//#region src/commands/projects/run-project-link.ts
 async function runProjectLink(config, projectRef, fromDir = process.cwd()) {
 	await withActivePlatformClient(config, async (platform) => {
 		const project = await resolveProjectRef(platform, projectRef);
@@ -7668,7 +7664,7 @@ async function runProjectLink(config, projectRef, fromDir = process.cwd()) {
 	}, fromDir, false);
 }
 //#endregion
-//#region src/commands/project/run-project-members.ts
+//#region src/commands/projects/run-project-members.ts
 async function resolveMembersProject(platform) {
 	const ref = resolveActiveProjectRef();
 	if (!ref) throw new Error("Usage: keystroke --project <slug> project members <command>");
@@ -7714,7 +7710,7 @@ async function runProjectMembersLeave(config) {
 	});
 }
 //#endregion
-//#region src/commands/project/members.ts
+//#region src/commands/projects/members.ts
 function collectEmails(value, previous) {
 	return [...previous, value];
 }
@@ -7775,7 +7771,7 @@ function registerProjectMembersCommand(project) {
 	});
 }
 //#endregion
-//#region src/commands/project/run-project-settings.ts
+//#region src/commands/projects/run-project-settings.ts
 async function resolveSettingsProject(platform) {
 	const ref = resolveActiveProjectRef();
 	if (!ref) throw new Error("Usage: keystroke --project <slug> project settings <command>");
@@ -7796,7 +7792,7 @@ async function runProjectSettingsUpdate(config, patch) {
 	});
 }
 //#endregion
-//#region src/commands/project/settings.ts
+//#region src/commands/projects/settings.ts
 function parseProjectRole(role) {
 	if (role === "admin" || role === "builder") return role;
 	throw new Error("Default role must be admin or builder");
@@ -7838,10 +7834,10 @@ function registerProjectSettingsCommand(project) {
 	});
 }
 //#endregion
-//#region src/commands/project/index.ts
-function registerProjectCommand(program) {
-	const project = program.command("project").description("List, create, update, and delete platform projects");
-	project.command("list").description("List projects in the active organization").option("--admin", "List all org resources (org owner or admin only)").action(async (options) => {
+//#region src/commands/projects/index.ts
+function registerProjectsCommand(program) {
+	const projects = program.command("projects").description("List, create, update, and delete platform projects");
+	projects.command("list").description("List projects in the active organization").option("--admin", "List all org resources (org owner or admin only)").action(async (options) => {
 		const config = createCliConfig();
 		try {
 			await runProjectList(config, { ...options.admin ? { admin: true } : {} });
@@ -7853,7 +7849,7 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("metrics").description("List rollup metrics for projects in the active organization").option("--admin", "List all org resources (org owner or admin only)").action(async (options) => {
+	projects.command("metrics").description("List rollup metrics for projects in the active organization").option("--admin", "List all org resources (org owner or admin only)").action(async (options) => {
 		const config = createCliConfig();
 		try {
 			const projectRef = resolveActiveProjectRef();
@@ -7869,11 +7865,11 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("deployments").description("View deployment history for platform projects").command("list").description("List deployment history for a project").action(async () => {
+	projects.command("deployments").description("View deployment history for platform projects").command("list").description("List deployment history for a project").action(async () => {
 		const config = createCliConfig();
 		try {
 			const projectRef = resolveActiveProjectRef();
-			if (!projectRef) throw new Error("Usage: keystroke project deployments list --project <slug> (or run `keystroke project link`)");
+			if (!projectRef) throw new Error("Usage: keystroke projects deployments list --project <slug> (or run `keystroke projects link`)");
 			await runProjectDeploymentsList(config, { projectRef });
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "List deployments failed", {
@@ -7883,11 +7879,11 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("link").description("Link this directory to a platform project in keystroke.config.ts").option("--dir <path>", "Project directory", process.cwd()).action(async (options) => {
+	projects.command("link").description("Link this directory to a platform project in keystroke.config.ts").option("--dir <path>", "Project directory", process.cwd()).action(async (options) => {
 		const config = createCliConfig();
 		try {
 			const projectRef = resolveActiveProjectRef(options.dir);
-			if (!projectRef) throw new Error("Usage: keystroke project link --project <slug> (see: keystroke project list)");
+			if (!projectRef) throw new Error("Usage: keystroke projects link --project <slug> (see: keystroke projects list)");
 			await runProjectLink(config, projectRef, options.dir);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Link project failed", {
@@ -7897,7 +7893,7 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("create").description("Create a platform project in the active organization").requiredOption("--name <name>", "Project name").option("--description <description>", "Project description").action(async (options) => {
+	projects.command("create").description("Create a platform project in the active organization").requiredOption("--name <name>", "Project name").option("--description <description>", "Project description").action(async (options) => {
 		const config = createCliConfig();
 		try {
 			await runProjectCreate(config, {
@@ -7912,11 +7908,11 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("update").description("Update a platform project's name and/or description").option("--name <name>", "Project name").option("--description <description>", "Project description").action(async (options) => {
+	projects.command("update").description("Update a platform project's name and/or description").option("--name <name>", "Project name").option("--description <description>", "Project description").action(async (options) => {
 		const config = createCliConfig();
 		try {
 			const projectId = await resolveActiveProjectId(config);
-			if (!projectId) throw new Error("Usage: keystroke --project <slug> project update --name <name>");
+			if (!projectId) throw new Error("Usage: keystroke --project <slug> projects update --name <name>");
 			if (!options.name && options.description === void 0) throw new Error("At least one of --name or --description is required");
 			await runProjectUpdate(config, {
 				projectId,
@@ -7931,11 +7927,11 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	project.command("delete").description("Delete a platform project").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
+	projects.command("delete").description("Delete a platform project").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
 		const config = createCliConfig();
 		try {
 			const projectId = await resolveActiveProjectId(config);
-			if (!projectId) throw new Error("Usage: keystroke --project <slug> project delete");
+			if (!projectId) throw new Error("Usage: keystroke --project <slug> projects delete");
 			if (!options.yes) throw new Error("Pass --yes to confirm project deletion");
 			await runProjectDelete(config, projectId);
 		} catch (error) {
@@ -7946,8 +7942,8 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
-	registerProjectMembersCommand(project);
-	registerProjectSettingsCommand(project);
+	registerProjectMembersCommand(projects);
+	registerProjectSettingsCommand(projects);
 }
 //#endregion
 //#region src/commands/pull/run-pull.ts
@@ -8035,7 +8031,7 @@ async function runStart(options) {
 	const apiPort = Number(new URL(serverUrl).port || 80);
 	const runtimeNodeModules = resolveCliRuntimeNodeModules(resolveCliRoot(import.meta.url));
 	ensureNativeDeps(runtimeNodeModules);
-	const { buildApp } = await import("./dist-DJFUIl5O.mjs");
+	const { buildApp } = await import("./dist-BVw5-nbD.mjs");
 	await buildApp({
 		root,
 		clean: false
@@ -8066,11 +8062,18 @@ function registerStartCommand(program) {
 	});
 }
 //#endregion
-//#region src/commands/trigger/list.ts
+//#region src/commands/triggers/list.ts
+/** Copy-ready pause/resume commands, printed to stderr so stdout JSON stays pipeable. */
+function writeToggleHints(triggers) {
+	if (triggers.length === 0) return;
+	process.stderr.write("\nPause/resume without redeploy (disabled state survives deploys):\n");
+	for (const entry of triggers) process.stderr.write(`  keystroke triggers disable ${entry.slug}    # enable to resume; --workflow/--agent to narrow\n`);
+}
 function registerTriggerListCommand(trigger) {
 	trigger.command("list").description("List discovered triggers").option("--endpoint <endpoint>", "Only webhook triggers on this shared endpoint").action((options) => runProjectCliCommand("List triggers failed", async ({ client }) => {
 		const result = await client.triggers.list(options.endpoint ? { endpoint: options.endpoint } : void 0);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+		writeToggleHints(result.triggers);
 	}));
 }
 function registerTriggerGetCommand(trigger) {
@@ -8080,13 +8083,13 @@ function registerTriggerGetCommand(trigger) {
 	}));
 }
 function registerTriggerUrlCommand(trigger) {
-	trigger.command("url").description("Print the webhook URL for a trigger").argument("<id>", "Attachment key or webhook route").action((id) => runProjectCliCommand("Resolve webhook URL failed", async ({ client }) => {
+	trigger.command("url").description("Print the webhook URL for a trigger").argument("<triggerSlug>", "Trigger id or slug").action((id) => runProjectCliCommand("Resolve webhook URL failed", async ({ client }) => {
 		const url = await client.triggers.webhookUrl(id);
 		process.stdout.write(`${url}\n`);
 	}));
 }
 //#endregion
-//#region src/commands/trigger/poll.ts
+//#region src/commands/triggers/poll.ts
 function collect(value, previous) {
 	return [...previous, value];
 }
@@ -8101,65 +8104,140 @@ function registerTriggerPollCommand(trigger) {
 	}));
 }
 //#endregion
-//#region src/commands/trigger/runs.ts
-function registerTriggerRunsCommand(trigger) {
-	const runs = trigger.command("runs").description("List and inspect trigger runs");
-	runs.command("list").description("List runs for a trigger attachment").argument("<attachmentId>", "Trigger attachment key").option("--limit <n>", "Page size (1–100)", "20").option("--cursor <cursor>", "Pagination cursor from a previous page").option("--trigger-type <type>", "Filter by trigger type (cron, webhook, poll)").action((attachmentId, options) => runProjectCliCommand("List trigger runs failed", async ({ client }) => {
-		const result = await client.triggers.listRuns(attachmentId, {
-			limit: Number(options.limit),
-			...options.cursor ? { cursor: options.cursor } : {},
-			...options.triggerType ? { triggerType: options.triggerType } : {}
-		});
-		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-	}));
-	runs.command("get").description("Get full details for a trigger run").argument("<attachmentId>", "Trigger attachment key").argument("<runId>", "Trigger run id").option("--include <parts>", "Comma-separated: workflows, trace").action((attachmentId, runId, options) => runProjectCliCommand("Get trigger run failed", async ({ client }) => {
-		const result = await client.triggers.getRun(attachmentId, runId, { include: options.include });
-		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-	}));
-}
-//#endregion
-//#region src/commands/trigger/resolve-trigger-attachment.ts
-function findAssignment(assignments, attachmentRef) {
-	return assignments.find((entry) => entry.attachmentId === attachmentRef || entry.attachmentSlug === attachmentRef);
-}
-async function resolveTriggerAttachment(platform, triggerRef, attachmentRef) {
+//#region src/commands/triggers/resolve-trigger-attachment.ts
+async function loadTrigger(platform, triggerRef) {
 	let trigger = await platform.triggers.get(triggerRef);
 	if (!trigger) {
 		const summary = (await platform.triggers.list()).find((entry) => entry.id === triggerRef || entry.slug === triggerRef) ?? null;
 		if (summary) trigger = await platform.triggers.get(summary.id);
 	}
 	if (!trigger) throw new Error(`Trigger not found: ${triggerRef}`);
-	const assignment = findAssignment(trigger.assignments, attachmentRef);
-	if (!assignment) throw new Error(`Attachment not found on trigger ${trigger.slug}: ${attachmentRef}`);
+	return trigger;
+}
+/**
+* Resolve which attachments a toggle applies to. With no target, every attachment on the
+* trigger is returned ("disable the trigger"). A `--workflow`/`--agent` target narrows to
+* the single binding for that workflow/agent — so callers never handle attachment ids.
+*/
+async function resolveTriggerAttachments(platform, triggerRef, target) {
+	const trigger = await loadTrigger(platform, triggerRef);
+	if (!target) {
+		if (trigger.assignments.length === 0) throw new Error(`Trigger ${trigger.slug} has no attachments`);
+		return {
+			trigger,
+			attachments: trigger.assignments
+		};
+	}
+	const match = trigger.assignments.find((entry) => entry.kind === target.kind && entry.slug === target.slug);
+	if (!match) {
+		const available = trigger.assignments.map((entry) => `${entry.kind} ${entry.slug}`).join(", ");
+		throw new Error(`No ${target.kind} "${target.slug}" attached to trigger ${trigger.slug}` + (available ? ` (attached: ${available})` : ""));
+	}
 	return {
-		triggerId: trigger.id,
-		attachmentId: assignment.attachmentId,
 		trigger,
-		assignment
+		attachments: [match]
+	};
+}
+/** Attachment slug passed to runtime trigger run APIs (one target required). */
+function attachmentSlugForRuns(attachments) {
+	if (attachments.length === 1) return attachments[0].attachmentSlug;
+	throw new Error(`Trigger has ${attachments.length} attachments — pass --workflow or --agent to list runs for one target`);
+}
+//#endregion
+//#region src/commands/triggers/runs.ts
+function resolveTarget$1(options) {
+	if (options.workflow && options.agent) throw new Error("Pass only one of --workflow or --agent");
+	if (options.workflow) return {
+		kind: "workflow",
+		slug: options.workflow
 	};
+	if (options.agent) return {
+		kind: "agent",
+		slug: options.agent
+	};
+}
+async function resolveRunsAttachmentSlug(triggerRef, target) {
+	const config = createCliConfig();
+	let attachmentSlug = "";
+	await withActivePlatformClient(config, async (platform) => {
+		const { attachments } = await resolveTriggerAttachments(platform, triggerRef, target);
+		attachmentSlug = attachmentSlugForRuns(attachments);
+	});
+	return attachmentSlug;
+}
+function registerTriggerRunsCommand(trigger) {
+	const runs = trigger.command("runs").description("List and inspect trigger runs");
+	runs.command("list").description("List runs for a trigger").argument("<triggerSlug>", "Trigger id or slug").option("--workflow <slug>", "Narrow to the attachment bound to this workflow").option("--agent <slug>", "Narrow to the attachment bound to this agent").option("--limit <n>", "Page size (1–100)", "20").option("--cursor <cursor>", "Pagination cursor from a previous page").option("--trigger-type <type>", "Filter by trigger type (cron, webhook, poll)").action(async (triggerSlug, options) => {
+		const config = createCliConfig();
+		try {
+			const attachmentSlug = await resolveRunsAttachmentSlug(triggerSlug, resolveTarget$1(options));
+			await runProjectCliCommand("List trigger runs failed", async ({ client }) => {
+				const result = await client.triggers.listRuns(attachmentSlug, {
+					limit: Number(options.limit),
+					...options.cursor ? { cursor: options.cursor } : {},
+					...options.triggerType ? { triggerType: options.triggerType } : {}
+				});
+				process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+			});
+		} catch (error) {
+			process.stderr.write(`${formatCliError(error, "List trigger runs failed", {
+				serverUrl: getPlatformUrl(config),
+				webUrl: getWebUrl(config)
+			})}\n`);
+			process.exitCode = 1;
+		}
+	});
+	runs.command("get").description("Get full details for a trigger run").argument("<triggerSlug>", "Trigger id or slug").argument("<runId>", "Trigger run id").option("--workflow <slug>", "Narrow to the attachment bound to this workflow").option("--agent <slug>", "Narrow to the attachment bound to this agent").option("--include <parts>", "Comma-separated: workflows, trace").action(async (triggerSlug, runId, options) => {
+		const config = createCliConfig();
+		try {
+			const attachmentSlug = await resolveRunsAttachmentSlug(triggerSlug, resolveTarget$1(options));
+			await runProjectCliCommand("Get trigger run failed", async ({ client }) => {
+				const result = await client.triggers.getRun(attachmentSlug, runId, { include: options.include });
+				process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+			});
+		} catch (error) {
+			process.stderr.write(`${formatCliError(error, "Get trigger run failed", {
+				serverUrl: getPlatformUrl(config),
+				webUrl: getWebUrl(config)
+			})}\n`);
+			process.exitCode = 1;
+		}
+	});
 }
 //#endregion
-//#region src/commands/trigger/run-attachment-enabled.ts
-async function runTriggerAttachmentEnabled(config, options) {
+//#region src/commands/triggers/run-attachment-enabled.ts
+async function runTriggerEnabled(config, options) {
 	await withActivePlatformClient(config, async (platform) => {
-		const resolved = await resolveTriggerAttachment(platform, options.triggerRef, options.attachmentRef);
-		const trigger = await platform.triggers.updateAttachment(resolved.triggerId, resolved.attachmentId, { enabled: options.enabled });
-		process.stdout.write(`${JSON.stringify(trigger, null, 2)}\n`);
+		const { trigger, attachments } = await resolveTriggerAttachments(platform, options.triggerRef, options.target);
+		let detail = trigger;
+		for (const attachment of attachments) detail = await platform.triggers.updateAttachment(trigger.id, attachment.attachmentId, { enabled: options.enabled });
+		process.stdout.write(`${JSON.stringify(detail, null, 2)}\n`);
 	});
 }
 //#endregion
-//#region src/commands/trigger/attachment.ts
-function registerAttachmentToggleCommand(attachment, command, enabled) {
-	attachment.command(command).description(`${command === "enable" ? "Enable" : "Disable"} a trigger attachment`).argument("<triggerRef>", "Trigger id or slug").argument("<attachmentRef>", "Attachment id or slug (for example signup:signup-pipeline)").action(async (triggerRef, attachmentRef) => {
+//#region src/commands/triggers/toggle.ts
+function resolveTarget(options) {
+	if (options.workflow && options.agent) throw new Error("Pass only one of --workflow or --agent");
+	if (options.workflow) return {
+		kind: "workflow",
+		slug: options.workflow
+	};
+	if (options.agent) return {
+		kind: "agent",
+		slug: options.agent
+	};
+}
+function registerToggle(trigger, command, enabled) {
+	trigger.command(command).description(`${command === "enable" ? "Enable" : "Disable"} a trigger — all attachments by default, or one with --workflow/--agent`).argument("<trigger-slug>", "Trigger id or slug").option("--workflow <slug>", "Only the attachment bound to this workflow").option("--agent <slug>", "Only the attachment bound to this agent").action(async (triggerRef, options) => {
 		const config = createCliConfig();
 		try {
-			await runTriggerAttachmentEnabled(config, {
+			await runTriggerEnabled(config, {
 				triggerRef,
-				attachmentRef,
+				target: resolveTarget(options),
 				enabled
 			});
 		} catch (error) {
-			process.stderr.write(`${formatCliError(error, `${command} trigger attachment failed`, {
+			process.stderr.write(`${formatCliError(error, `${command} trigger failed`, {
 				serverUrl: getPlatformUrl(config),
 				webUrl: getWebUrl(config)
 			})}\n`);
@@ -8167,24 +8245,23 @@ function registerAttachmentToggleCommand(attachment, command, enabled) {
 		}
 	});
 }
-function registerTriggerAttachmentCommand(trigger) {
-	const attachment = trigger.command("attachment").description("Enable or disable individual trigger attachments");
-	registerAttachmentToggleCommand(attachment, "disable", false);
-	registerAttachmentToggleCommand(attachment, "enable", true);
+function registerTriggerToggleCommands(trigger) {
+	registerToggle(trigger, "disable", false);
+	registerToggle(trigger, "enable", true);
 }
 //#endregion
-//#region src/commands/trigger/index.ts
-function registerTriggerCommand(program) {
-	const trigger = program.command("trigger").description("Invoke and inspect triggers");
-	registerTriggerListCommand(trigger);
-	registerTriggerGetCommand(trigger);
-	registerTriggerUrlCommand(trigger);
-	registerTriggerPollCommand(trigger);
-	registerTriggerRunsCommand(trigger);
-	registerTriggerAttachmentCommand(trigger);
+//#region src/commands/triggers/index.ts
+function registerTriggersCommand(program) {
+	const triggers = program.command("triggers").description("Invoke and inspect triggers");
+	registerTriggerListCommand(triggers);
+	registerTriggerGetCommand(triggers);
+	registerTriggerUrlCommand(triggers);
+	registerTriggerPollCommand(triggers);
+	registerTriggerRunsCommand(triggers);
+	registerTriggerToggleCommands(triggers);
 }
 //#endregion
-//#region src/commands/workflow/list.ts
+//#region src/commands/workflows/list.ts
 function registerWorkflowListCommand(workflow) {
 	workflow.command("list").description("List workflows in the active organization").option("--admin", "List all org resources (org owner or admin only)").action((options) => runCliCommand("List workflows failed", async () => {
 		const config = createCliConfig();
@@ -8200,32 +8277,32 @@ function registerWorkflowListCommand(workflow) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/workflow/run.ts
+//#region src/commands/workflows/run.ts
 function registerWorkflowRunCommand(workflow) {
 	workflow.command("run").description("Invoke a workflow").argument("<workflowId>", "Workflow key / route id").option("--input <json>", "JSON request body (defaults to {})", "{}").addHelpText("after", `
 Examples:
-  ${cliBinaryName()} workflow run math --input '{"first":1,"second":2}'
-  ${cliBinaryName()} workflow run incoming-message --input '{"message":"Hi","sender":"you"}'
+  ${cliBinaryName()} workflows run math --input '{"first":1,"second":2}'
+  ${cliBinaryName()} workflows run incoming-message --input '{"message":"Hi","sender":"you"}'
 `).action((workflowId, options) => runProjectCliCommand("Workflow run failed", async ({ client }) => {
 		const input = parseJsonOption(options.input, "--input");
 		const result = await client.workflows.run(workflowId, input);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-		if (isQueuedRunResponse(result)) process.stderr.write(`Run queued. Track progress:\n  ${cliBinaryName()} workflow runs get ${workflowId} ${result.runId} --include steps,trace\n`);
+		if (isQueuedRunResponse(result)) process.stderr.write(`Run queued. Track progress:\n  ${cliBinaryName()} workflows runs get ${workflowId} ${result.runId} --include steps,trace\n`);
 	}, { usage: {
-		command: `${cliBinaryName()} workflow run ${workflowId}`,
+		command: `${cliBinaryName()} workflows run ${workflowId}`,
 		flag: "--input"
 	} }));
 }
 //#endregion
-//#region src/commands/workflow/cancel-run.ts
-async function runWorkflowRunCancel(config, runId) {
+//#region src/commands/workflows/cancel-run.ts
+async function runWorkflowRunCancel(config, _workflowId, runId) {
 	await withActivePlatformClient(config, async (platform) => {
 		const run = await platform.workflows.cancelRun(runId);
 		process.stdout.write(`${JSON.stringify(run, null, 2)}\n`);
 	});
 }
 //#endregion
-//#region src/commands/workflow/runs.ts
+//#region src/commands/workflows/runs.ts
 function registerWorkflowRunsCommand(workflow) {
 	const runs = workflow.command("runs").description("List and inspect workflow runs");
 	runs.command("list").description("List runs for a workflow").argument("<workflowId>", "Workflow key / route id").option("--limit <n>", "Page size (1–100)", "20").option("--cursor <cursor>", "Pagination cursor from a previous page").option("--status <status>", "Filter by status").option("--trigger <trigger>", "Filter by trigger kind").action((workflowId, options) => runProjectCliCommand("List workflow runs failed", async ({ client }) => {
@@ -8245,10 +8322,10 @@ function registerWorkflowRunsCommand(workflow) {
 		const result = await client.workflows.listHooks(workflowId, runId);
 		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
 	}));
-	runs.command("cancel").description("Cancel a running or queued workflow run").argument("<runId>", "Workflow run id").action(async (runId) => {
+	runs.command("cancel").description("Cancel a running or queued workflow run").argument("<workflowId>", "Workflow key / route id").argument("<runId>", "Workflow run id").action(async (workflowId, runId) => {
 		const config = createCliConfig();
 		try {
-			await runWorkflowRunCancel(config, runId);
+			await runWorkflowRunCancel(config, workflowId, runId);
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "Cancel workflow run failed", {
 				serverUrl: getPlatformUrl(config),
@@ -8259,15 +8336,15 @@ function registerWorkflowRunsCommand(workflow) {
 	});
 }
 //#endregion
-//#region src/commands/workflow/index.ts
-function registerWorkflowCommand(program) {
-	const workflow = program.command("workflow").description("Invoke and inspect workflows");
-	registerWorkflowListCommand(workflow);
-	registerWorkflowRunCommand(workflow);
-	registerWorkflowRunsCommand(workflow);
+//#region src/commands/workflows/index.ts
+function registerWorkflowsCommand(program) {
+	const workflows = program.command("workflows").description("Invoke and inspect workflows");
+	registerWorkflowListCommand(workflows);
+	registerWorkflowRunCommand(workflows);
+	registerWorkflowRunsCommand(workflows);
 }
 //#endregion
-//#region src/commands/channel/run-channel.ts
+//#region src/commands/channels/run-channel.ts
 async function runChannelPlatformsList(client) {
 	return client.channels.listPlatforms();
 }
@@ -8290,7 +8367,7 @@ async function runChannelUnbind(client, projectId, input) {
 	return client.channels.removeBinding(projectId, input);
 }
 //#endregion
-//#region src/commands/channel/platforms.ts
+//#region src/commands/channels/platforms.ts
 function registerChannelPlatformsCommand(channel) {
 	channel.command("platforms").description("Browse gateway-enabled apps").command("list").description("List apps that support agent external channels").action(() => runCliCommand("List channel platforms failed", async () => {
 		const config = createCliConfig();
@@ -8301,17 +8378,17 @@ function registerChannelPlatformsCommand(channel) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/commands/channel/resolve-channel-project.ts
+//#region src/commands/channels/resolve-channel-project.ts
 async function resolveChannelProjectId(config) {
 	const platform = createCliPlatformClient(config);
 	await ensureLinkedOrganization(config);
 	await ensureActiveOrganization(config);
 	const ref = resolveActiveProjectRef();
-	if (!ref) throw new Error("Project is required. Pass --project <slug> or run `keystroke project link --project <slug>`.");
+	if (!ref) throw new Error("Project is required. Pass --project <slug> or run `keystroke projects link --project <slug>`.");
 	return (await resolveProjectRef(platform, ref)).id;
 }
 //#endregion
-//#region src/commands/channel/list.ts
+//#region src/commands/channels/list.ts
 function registerChannelAccountsCommand(channel) {
 	channel.command("accounts").description("List available workspace accounts for a platform").requiredOption("--platform <key>", "Platform key (slack)").action(async (options) => runCliCommand("List channel accounts failed", async () => {
 		const config = createCliConfig();
@@ -8343,13 +8420,13 @@ function registerChannelDirectoryCommand(channel) {
 	}));
 }
 function registerChannelBindCommand(channel) {
-	channel.command("bind").description("Bind an agent to a channel").requiredOption("--agent <id>", "Agent id").requiredOption("--platform <key>", "Platform key (slack)").requiredOption("--account <id>", "Workspace account id (team id)").requiredOption("--channel <id>", "Provider channel id").option("--channel-name <name>", "Provider channel name").option("--mode <mode>", "Listen mode (mention, all, dm)", "mention").action(async (options) => runCliCommand("Bind channel failed", async () => {
+	channel.command("bind").description("Bind an agent to a channel").argument("<agent>", "Agent id or slug").requiredOption("--platform <key>", "Platform key (slack)").requiredOption("--account <id>", "Workspace account id (team id)").requiredOption("--channel <id>", "Provider channel id").option("--channel-name <name>", "Provider channel name").option("--mode <mode>", "Listen mode (mention, all, dm)", "mention").action(async (agent, options) => runCliCommand("Bind channel failed", async () => {
 		const config = createCliConfig();
 		const projectId = await resolveChannelProjectId(config);
 		const client = createCliPlatformClient(config);
 		await ensureActiveOrganization(config);
 		const connection = await runChannelBind(client, projectId, {
-			agentId: options.agent,
+			agentId: agent,
 			platform: options.platform,
 			accountId: options.account,
 			binding: {
@@ -8393,16 +8470,16 @@ function registerChannelUpdateBindingCommand(channel) {
 	}));
 }
 //#endregion
-//#region src/commands/channel/index.ts
-function registerChannelCommand(program) {
-	const channel = program.command("channel").description("Manage agent external channel bindings");
-	registerChannelPlatformsCommand(channel);
-	registerChannelAccountsCommand(channel);
-	registerChannelListCommand(channel);
-	registerChannelDirectoryCommand(channel);
-	registerChannelBindCommand(channel);
-	registerChannelUnbindCommand(channel);
-	registerChannelUpdateBindingCommand(channel);
+//#region src/commands/channels/index.ts
+function registerChannelsCommand(program) {
+	const channels = program.command("channels").description("Manage agent external channel bindings");
+	registerChannelPlatformsCommand(channels);
+	registerChannelAccountsCommand(channels);
+	registerChannelListCommand(channels);
+	registerChannelDirectoryCommand(channels);
+	registerChannelBindCommand(channels);
+	registerChannelUnbindCommand(channels);
+	registerChannelUpdateBindingCommand(channels);
 }
 //#endregion
 //#region src/commands/config/preferences-patch.ts
@@ -8495,37 +8572,6 @@ function registerConfigCommand(program) {
 	});
 }
 //#endregion
-//#region src/commands/skill/index.ts
-function registerSkillCommand(program) {
-	program.command("skill").description("Inspect platform skills").command("list").description("List skills in the active organization").option("--admin", "List all org resources (org owner or admin only)").action((options) => runCliCommand("List skills failed", async () => {
-		const config = createCliConfig();
-		const client = createCliPlatformClient(config);
-		await ensureActiveOrganization(config);
-		if (options.admin) await requireAdminRole(config);
-		const projectId = await resolveActiveProjectId(config);
-		const result = await client.skills.list({
-			...projectId ? { projectId } : {},
-			...options.admin ? { admin: true } : {}
-		});
-		process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-	}, void 0, { orgScoped: true }));
-}
-//#endregion
-//#region src/commands/skills.ts
-function registerSkillsCommand(program) {
-	program.command("skills").description("Manage the scaffolded AGENTS guide").command("sync").description("Overwrite AGENTS.md with the CLI version").option("--dir <path>", "Project directory", process.cwd()).action(async (options) => {
-		try {
-			const root = resolveProjectRoot(options.dir);
-			await scaffoldAgentsGuide(root);
-			process.stdout.write(`Synced AGENTS.md at ${root}\n`);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : "AGENTS guide sync failed";
-			process.stderr.write(`${message}\n`);
-			process.exitCode = 1;
-		}
-	});
-}
-//#endregion
 //#region src/skills/sync-agents-guide.ts
 function commandPath(command) {
 	const names = [];
@@ -8537,9 +8583,7 @@ function commandPath(command) {
 }
 function shouldSkipAutoSync(command) {
 	if (process.env.CI === "true" || process.env.CI === "1") return true;
-	const path = commandPath(command);
-	if (path[0] === "init") return true;
-	if (path[0] === "skills") return true;
+	if (commandPath(command)[0] === "init") return true;
 	return false;
 }
 function resolveAutoSyncRoot(command) {
@@ -8576,14 +8620,12 @@ function createProgram() {
 	registerConfigCommand(program);
 	registerOrganizationCommand(program);
 	registerApiKeyCommand(program);
-	registerProjectCommand(program);
+	registerProjectsCommand(program);
 	registerHistoryCommand(program);
 	registerCredentialsCommand(program);
 	registerHealthCommand(program);
 	registerDocsCommand(program);
 	registerInitCommand(program);
-	registerSkillsCommand(program);
-	registerSkillCommand(program);
 	registerBuildCommand(program);
 	registerLintCommand(program);
 	registerTypecheckCommand(program);
@@ -8592,11 +8634,11 @@ function createProgram() {
 	registerPullCommand(program);
 	registerDevCommand(program);
 	registerStartCommand(program);
-	registerAgentCommand(program);
-	registerChannelCommand(program);
-	registerAppCommand(program);
-	registerWorkflowCommand(program);
-	registerTriggerCommand(program);
+	registerAgentsCommand(program);
+	registerChannelsCommand(program);
+	registerAppsCommand(program);
+	registerWorkflowsCommand(program);
+	registerTriggersCommand(program);
 	return program;
 }
 async function runCli(argv) {