@keystrokehq/cli 0.1.24 → 0.1.26

package/dist/index.mjs

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
 import { $ as GetCustomAppResponseSchema, $n as slugifyAppName, $t as SlugAvailabilityResponseSchema, A as CreateCustomAppRequestSchema, An as WorkflowRunHooksResponseSchema, At as PollRunResponseSchema, B as CredentialConsumerListQuerySchema, Bt as ProjectReachabilityResponseSchema, C as ConnectAuthorizeUrlResponseSchema, Cn as UploadProjectSourceResponseSchema, Ct as ListProjectsResponseSchema, D as CreateCredentialInstanceBodySchema, Dn as UserPreferencesPatchSchema, Dt as OrganizationSidebarBrandingSchema, E as CreateApiKeyResponseSchema, En as UserAvatarSchema, Et as OrganizationSidebarBrandingPatchSchema, F as CreateProjectRequestSchema, Fn as WorkspaceTriggerFileSchema, Ft as PresignProjectSourceRequestSchema, G as DOCS_QUERY_TOOL, Gt as PromptResponseSchema, H as CredentialInstanceListResponseSchema, Hn as detectProjectPackageManagerFromSnapshot, Ht as ProjectSettingsResponseSchema, I as CreateProjectResponseSchema, In as WorkspaceTriggerListResponseSchema, It as PresignProjectSourceResponseSchema, J as DownloadActiveProjectArtifactResponseSchema, Jn as parseErrorResponse, Jt as QueuedRunResponseSchema, K as DOCS_SEARCH_TOOL, L as CredentialAssignmentListQuerySchema, Ln as WorkspaceTriggerOverviewSchema, Lt as PresignUserAvatarRequestSchema, M as CreateOrganizationRequestSchema, Mn as WorkflowSummaryDetailResponseSchema, Mt as PresignChatAttachmentResponseSchema, N as CreateOrganizationResponseSchema, Nn as WorkflowSummaryListResponseSchema, Nt as PresignOrgLogoRequestSchema, O as CreateCredentialsRequestSchema, On as UserPreferencesSchema, Ot as PROJECT_PULL_STATE_RELATIVE_PATH, P as CreateProjectArtifactResponseSchema, Pn as WorkspaceTriggerDetailSchema, Pt as PresignOrgLogoResponseSchema, Q as GetCredentialResponseSchema, Qn as resolvePublicPlatformOrigin, Qt as SkillSummaryListResponseSchema, R as CredentialAssignmentListResponseSchema, Rn as WorkspaceTriggerRunListResponseSchema, Rt as PresignUserAvatarResponseSchema, S as CompleteProjectArtifactResponseSchema, Sn as UploadProjectSourceManifestRequestSchema, St as ListProjectMetricsResponseSchema, T as CreateApiKeyRequestSchema, Tn as UserAvatarPatchSchema, Tt as OpenApiDiscoverResponseSchema, U as CredentialInstanceRecordSchema, Un as isAcceptableInstallExit, Ut as ProjectSlugAvailabilityResponseSchema, V as CredentialConsumerListResponseSchema, Vn as deriveCustomAppDisplay, Vt as ProjectResponseSchema, Wn as listenPortFromPublicUrl, Wt as PromptInputSchema, X as ErrorResponseSchema, Xn as resolveConnectAppSlug, Xt as RecentResourceListResponseSchema, Y as DownloadActiveProjectSourceResponseSchema, Z as GatewayAttachmentRecordSchema, Zn as resolveDocsMcpUrl, Zt as SkillSummaryDetailResponseSchema, _ as ChannelAccountListResponseSchema, _n as UpdateOrganizationRequestSchema, _t as ListOrganizationMembersResponseSchema, a as AgentSessionDetailResponseSchema, an as StartOAuthConnectionResultSchema, at as HistoryRunListResponseSchema, b as ChannelDirectoryListResponseSchema, bn as UpdateProjectRequestSchema, bt as ListProjectFilesResponseSchema, c as AgentSummaryListResponseSchema, cn as TriggerDetailResponseSchema, ct as InviteProjectMembersRequestSchema, d as AssignCredentialBodySchema, dn as TriggerRunListResponseSchema, dt as ListAgentMemoryFilesResponseSchema, en as StartKeystrokeConnectionInputSchema, et as GraphqlDiscoverResponseSchema, f as BindChannelBodySchema, fn as UpdateChannelBindingBodySchema, ft as ListAgentWorkspaceFilesResponseSchema, g as CatalogAppsPageResponseSchema, gn as UpdateOrganizationMemberResponseSchema, gt as ListOrganizationInvitationsResponseSchema, h as CatalogAppDetailResponseSchema, hn as UpdateOrganizationMemberRequestSchema, ht as ListCredentialsResponseSchema, i as AgentSessionChatStateResponseSchema, in as StartOAuthConnectionInputSchema, it as HistoryRunListQuerySchema, j as CreateCustomAppResponseSchema, jn as WorkflowRunListResponseSchema, jt as PresignChatAttachmentRequestSchema, k as CreateCredentialsResponseSchema, kn as WorkflowRunDetailResponseSchema, kt as PROJECT_REACHABILITY_REQUEST_TIMEOUT_MS, l as AgentTriggerSummaryListResponseSchema, ln as TriggerListResponseSchema, lt as InviteProjectMembersResponseSchema, m as CatalogActionsPageResponseSchema, mn as UpdateCredentialRequestSchema, mt as ListAppsResponseSchema, n as AcceptOrganizationInvitationResponseSchema, nn as StartMcpOAuthConnectionInputSchema, nt as HistoryRunCancelResponseSchema, o as AgentSessionListResponseSchema, on as SubmitMarketingContactRequestSchema, ot as InviteOrganizationMembersRequestSchema, p as CatalogActionDetailResponseSchema, pn as UpdateCredentialInstanceBodySchema, pt as ListApiKeysResponseSchema, q as DeclineOrganizationInvitationResponseSchema, qn as parseAppSlug, qt as QueuedAgentPromptResponseSchema, r as ActiveOrganizationResponseSchema, rn as StartMcpOAuthConnectionResultSchema, rt as HistoryRunDetailResponseSchema, s as AgentSummaryDetailResponseSchema, sn as SubmitTeamRequestRequestSchema, st as InviteOrganizationMembersResponseSchema, t as ACTIVE_ORG_HEADER, tn as StartKeystrokeConnectionResultSchema, tt as HealthResponseSchema, u as AppSlugAvailabilityResponseSchema, un as TriggerRunDetailResponseSchema, v as ChannelConnectionListResponseSchema, vn as UpdateProjectMemberRequestSchema, vt as ListOrganizationsResponseSchema, w as ConnectProvidersResponseSchema, wn as UpsertGatewayAttachmentBodySchema, wt as McpDiscoverResponseSchema, x as ChannelPlatformSchema, xn as UpdateProjectSettingsRequestSchema, xt as ListProjectMembersResponseSchema, y as ChannelConnectionSchema, yn as UpdateProjectMemberResponseSchema, yt as ListProjectDeploymentsResponseSchema, z as CredentialAssignmentRecordSchema, zn as buildConnectDeeplink, zt as ProjectPullStateSchema } from "./dist-BOhrc_Nv.mjs";
 import { i as packProjectArtifact, n as withMcpReadClient, r as mergeFilteredArtifact, t as mapInParallelBatches } from "./dist-Re6HHSqz.mjs";
-import { a as installPlaygroundDependencies, c as createCliConfig, d as getEffectiveApiTarget, f as getPlatformUrl, g as resolvePlatformUrlForWebUrl, i as installDependencies$1, l as getCliConfigDir, m as DEFAULT_PLATFORM_URL, n as buildPlaygroundWorkspace, o as resolvePackageManager, p as getWebUrl, s as resolveCliRoot, t as readCliVersion, u as getConfigDir } from "./version-DcR3O1UD.mjs";
+import { a as installPlaygroundDependencies, c as createCliConfig, d as getEffectiveApiTarget, f as getPlatformUrl, g as resolvePlatformUrlForWebUrl, i as installDependencies$1, l as getCliConfigDir, m as DEFAULT_PLATFORM_URL, n as buildPlaygroundWorkspace, o as resolvePackageManager, p as getWebUrl, s as resolveCliRoot, t as readCliVersion, u as getConfigDir } from "./version-pY9N8XlL.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
-import { platform } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { Entry } from "@napi-rs/keyring";
 import { confirm, input, select } from "@inquirer/prompts";
 import { existsSync, lstatSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { access, copyFile, cp, lstat, mkdir, readFile, readdir, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
+import { access, copyFile, lstat, mkdir, readFile, readdir, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
 import { pathToFileURL } from "node:url";
 //#region ../../node_modules/.pnpm/ky@2.0.2/node_modules/ky/distribution/errors/KyError.js
@@ -4685,7 +4684,7 @@ 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 config use project <slug>\`.`);
+		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>\`.`);
 		throw error;
 	}
 	const match = (await platform.projects.list()).find((project) => project.slug === ref);
@@ -4847,6 +4846,78 @@ function readDevSession(configDir = getCliConfigDir()) {
 	}
 }
 //#endregion
+//#region src/project/resolve-keystroke-config-root.ts
+const KEYSTROKE_CONFIG$2 = "keystroke.config.ts";
+/** Walk up from `fromDir` and return the directory containing `keystroke.config.ts`, if any. */
+function resolveKeystrokeConfigRoot(fromDir = process.cwd()) {
+	let dir = resolve(fromDir);
+	while (dir !== dirname(dir)) {
+		if (existsSync(join(dir, KEYSTROKE_CONFIG$2))) return dir;
+		dir = dirname(dir);
+	}
+	if (existsSync(join(dir, KEYSTROKE_CONFIG$2))) return dir;
+	return null;
+}
+//#endregion
+//#region src/project/read-project-config.ts
+const KEYSTROKE_CONFIG$1 = "keystroke.config.ts";
+/** Remove line and block comments before scanning config literals. */
+function stripConfigComments(source) {
+	return source.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
+}
+/** Mask comments while preserving string length so match indices stay aligned. */
+function stripConfigCommentsPreservingLength(source) {
+	return source.replace(/\/\/[^\n]*/g, (match) => " ".repeat(match.length)).replace(/\/\*[\s\S]*?\*\//g, (match) => " ".repeat(match.length));
+}
+function readStringLiteral(source, key) {
+	const stripped = stripConfigComments(source);
+	const pattern = new RegExp(`\\b${key}\\s*:\\s*(['"])([^'"]*)\\1`);
+	return stripped.match(pattern)?.[2]?.trim() || void 0;
+}
+function parseLinkedProjectConfig(source) {
+	const project = readStringLiteral(source, "project");
+	const organization = readStringLiteral(source, "organization");
+	return {
+		...project ? { project } : {},
+		...organization ? { organization } : {}
+	};
+}
+/** Read optional project/organization slugs from keystroke.config.ts without executing it. */
+function readLinkedProjectConfig(fromDir = process.cwd()) {
+	const root = resolveKeystrokeConfigRoot(fromDir);
+	if (!root) return {};
+	return parseLinkedProjectConfig(readFileSync(join(root, KEYSTROKE_CONFIG$1), "utf8"));
+}
+//#endregion
+//#region src/target-options.ts
+let targetOptions = {};
+function setCliTargetOptions(options) {
+	targetOptions = options;
+}
+function getCliTargetOptions() {
+	return targetOptions;
+}
+//#endregion
+//#region src/resolve-project-target.ts
+function resolveLinkedProjectRef(fromDir = process.cwd()) {
+	return readLinkedProjectConfig(fromDir).project;
+}
+/** Activate the organization slug from keystroke.config.ts when present. */
+async function ensureLinkedOrganization(config, fromDir = process.cwd()) {
+	const linked = readLinkedProjectConfig(fromDir);
+	if (!linked.organization) return;
+	await activateOrganization(config, resolveOrganizationRef(await listOrganizations(config), linked.organization).organization.id);
+}
+async function resolveActiveProject(config, platform, fromDir = process.cwd()) {
+	const ref = getCliTargetOptions().projectId ?? readLinkedProjectConfig(fromDir).project;
+	if (!ref) return;
+	await ensureLinkedOrganization(config, fromDir);
+	return resolveProjectRef(platform ?? createCliPlatformClient(config), ref);
+}
+async function resolveActiveProjectId(config, fromDir = process.cwd()) {
+	return (await resolveActiveProject(config, void 0, fromDir))?.id;
+}
+//#endregion
 //#region src/resolve-api-target.ts
 /** Standalone local server default project id — keep in sync with @keystrokehq/database. */
 const DEFAULT_LOCAL_PROJECT_ID = "default";
@@ -4879,6 +4950,7 @@ function resolveOrgPlatformTarget(config) {
 	};
 }
 async function resolvePlatformTarget(config, projectRef) {
+	await ensureLinkedOrganization(config);
 	const platform = createCliPlatformClient(config);
 	let project;
 	try {
@@ -4906,20 +4978,11 @@ async function resolveApiTarget(config, options = {}) {
 	if (options.projectId) return resolvePlatformTarget(config, options.projectId);
 	if (getEffectiveApiTarget(config) === "local") return resolveLocalTarget(options);
 	if (!options.projectScoped) return resolveOrgPlatformTarget(config);
-	const projectRef = options.projectId ?? config.get("activeProjectId");
-	if (!projectRef) throw new Error("No project selected. Pass `--project <slug>` or run `keystroke config use project <slug>`.");
+	const projectRef = options.projectId ?? readLinkedProjectConfig().project;
+	if (!projectRef) throw new Error("No project selected. Pass `--project <slug>` or run `keystroke project link --project <slug>`.");
 	return resolvePlatformTarget(config, projectRef);
 }
 //#endregion
-//#region src/target-options.ts
-let targetOptions = {};
-function setCliTargetOptions(options) {
-	targetOptions = options;
-}
-function getCliTargetOptions() {
-	return targetOptions;
-}
-//#endregion
 //#region src/errors/example-input.ts
 function exampleValueFromValidationMessage(message) {
 	if (/expected number/i.test(message)) return 0;
@@ -5089,18 +5152,6 @@ async function requireAdminRole(config) {
 	if (!active || active.role !== "owner" && active.role !== "admin") throw new Error("--admin requires org owner or admin");
 }
 //#endregion
-//#region src/resolve-project-target.ts
-async function resolveActiveProject(config, platform) {
-	const ref = getCliTargetOptions().projectId ?? config.get("activeProjectId");
-	if (!ref) return;
-	const client = platform ?? createCliPlatformClient(config);
-	if (!getCliTargetOptions().projectId && looksLikeUuid(ref)) return resolveProjectRef(client, ref);
-	return resolveProjectRef(client, ref);
-}
-async function resolveActiveProjectId(config) {
-	return (await resolveActiveProject(config))?.id;
-}
-//#endregion
 //#region src/commands/agent/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 () => {
@@ -5129,7 +5180,8 @@ function registerAgentPromptCommand(agent) {
 }
 //#endregion
 //#region src/commands/project/run-project.ts
-async function withActivePlatformClient(config, fn) {
+async function withActivePlatformClient(config, fn, fromDir = process.cwd(), applyLinkedOrganization = true) {
+	if (applyLinkedOrganization) await ensureLinkedOrganization(config, fromDir);
 	const platform = createCliPlatformClient(config);
 	let active = await platform.organizations.getActive();
 	if (!active) active = await selectActiveOrganization(config);
@@ -5140,7 +5192,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} deploy --project ${formatProjectLabel(project)}\n`);
+		process.stderr.write(`Project ${formatProjectLabel(project)} is inactive. Deploy with: ${bin} project link --project ${formatProjectLabel(project)}, then ${bin} deploy\n`);
 	}
 }
 async function runProjectList(config, options = {}) {
@@ -5544,19 +5596,6 @@ function registerAppShowCommand(app) {
 	}, void 0, { orgScoped: true }));
 }
 //#endregion
-//#region src/project/resolve-keystroke-config-root.ts
-const KEYSTROKE_CONFIG = "keystroke.config.ts";
-/** Walk up from `fromDir` and return the directory containing `keystroke.config.ts`, if any. */
-function resolveKeystrokeConfigRoot(fromDir = process.cwd()) {
-	let dir = resolve(fromDir);
-	while (dir !== dirname(dir)) {
-		if (existsSync(join(dir, KEYSTROKE_CONFIG))) return dir;
-		dir = dirname(dir);
-	}
-	if (existsSync(join(dir, KEYSTROKE_CONFIG))) return dir;
-	return null;
-}
-//#endregion
 //#region src/commands/app/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("");
@@ -6315,6 +6354,7 @@ async function runDeploy(options) {
 	const root = resolveProjectRoot(options.dir);
 	const config = createCliConfig();
 	const client = createCliPlatformClient(config);
+	await ensureLinkedOrganization(config, root);
 	let active = await client.organizations.getActive();
 	if (!active) active = await selectActiveOrganization(config);
 	client.setActiveOrganizationId(active.organization.id);
@@ -6339,7 +6379,6 @@ async function runDeploy(options) {
 	while (Date.now() < deadline) {
 		const current = await client.projects.get(project.id);
 		if (current.status === "active") {
-			config.set("activeProjectId", project.id);
 			config.set("apiTarget", "platform");
 			process.stdout.write(`Project active${current.baseUrl ? `: ${current.baseUrl}` : ""}\n`);
 			return;
@@ -6352,8 +6391,8 @@ async function runDeploy(options) {
 function registerDeployCommand(program) {
 	program.command("deploy").description("Build, upload, and deploy the project to the platform").option("--dir <path>", "Project directory", process.cwd()).option("--filter <entry>", "Build and deploy only matching module entry keys (repeatable)", (value, previous) => [...previous, value], []).action(async (options) => {
 		try {
-			const projectId = await resolveActiveProjectId(createCliConfig());
-			if (!projectId) throw new Error("Usage: keystroke deploy --project <slug>");
+			const projectId = await resolveActiveProjectId(createCliConfig(), resolveProjectRoot(options.dir));
+			if (!projectId) throw new Error("Usage: keystroke deploy --project <slug> (or run `keystroke project link --project <slug>`)");
 			await runDeploy({
 				dir: options.dir,
 				projectId,
@@ -6774,7 +6813,7 @@ const INIT_CATALOG_VERSIONS = {
 	vitest: "^4.1.7",
 	"@types/node": "^25.9.1"
 };
-const INIT_KEYSTROKE_VERSION = "^0.1.22";
+const INIT_KEYSTROKE_VERSION = "^0.1.23";
 //#endregion
 //#region src/init/copy-template.ts
 function renderTemplate(content, variables) {
@@ -6864,6 +6903,26 @@ async function applyPlaygroundManifest(targetDir, projectName, monorepoRoot) {
 	await writeFile(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`);
 }
 //#endregion
+//#region src/skills/agents-guide-version.ts
+const BUNDLE_VERSION_FILENAME = ".bundle-version";
+const LEGACY_BUNDLE_VERSION_RELATIVE_PATH = join("skills", BUNDLE_VERSION_FILENAME);
+function agentsGuideDir(projectRoot) {
+	return join(projectRoot, ".agents");
+}
+function bundleVersionPath(projectRoot) {
+	return join(agentsGuideDir(projectRoot), BUNDLE_VERSION_FILENAME);
+}
+async function readBundleVersion(projectRoot) {
+	for (const path of [bundleVersionPath(projectRoot), join(agentsGuideDir(projectRoot), LEGACY_BUNDLE_VERSION_RELATIVE_PATH)]) try {
+		return (await readFile(path, "utf8")).trim();
+	} catch {}
+	return null;
+}
+async function writeBundleVersion(projectRoot) {
+	await mkdir(agentsGuideDir(projectRoot), { recursive: true });
+	await writeFile(bundleVersionPath(projectRoot), `${readCliVersion()}\n`);
+}
+//#endregion
 //#region src/skills/resolve-skills-bundle-dir.ts
 const SKILLS_BUNDLE = "skills-bundle";
 function resolveSkillsBundleDir(fromModuleUrl = import.meta.url) {
@@ -6875,53 +6934,59 @@ function resolveSkillsBundleDir(fromModuleUrl = import.meta.url) {
 		join(cliRoot, SKILLS_BUNDLE)
 	];
 	for (const candidate of candidates) if (existsSync(join(candidate, "_AGENTS.md"))) return candidate;
-	throw new Error("Bundled keystroke skills not found — run `pnpm --filter @keystrokehq/cli build`");
+	throw new Error("Bundled AGENTS guide not found — run `pnpm --filter @keystrokehq/cli build`");
 }
 //#endregion
-//#region src/skills/sync-bundled-skills.ts
-const BUNDLE_VERSION_FILENAME = ".bundle-version";
-function agentsSkillsDir(projectRoot) {
-	return join(projectRoot, ".agents", "skills");
-}
-function bundleVersionPath(projectRoot) {
-	return join(agentsSkillsDir(projectRoot), BUNDLE_VERSION_FILENAME);
-}
-async function readBundleVersion(projectRoot) {
-	try {
-		return (await readFile(bundleVersionPath(projectRoot), "utf8")).trim();
-	} catch {
-		return null;
-	}
-}
-async function ensureSymlink(target, linkPath, kind) {
+//#region src/skills/scaffold-agents-guide.ts
+async function ensureSymlink(target, linkPath) {
 	await mkdir(dirname(linkPath), { recursive: true });
 	await rm(linkPath, {
 		recursive: true,
 		force: true
 	});
-	await symlink(target, linkPath, platform() === "win32" && kind === "dir" ? "junction" : kind);
+	await symlink(target, linkPath, "file");
 }
-/** Overwrites `.agents/skills/`, AGENTS.md, and recreates `.claude` symlinks from the CLI bundle. */
-async function syncBundledSkills(projectRoot, fromModuleUrl = import.meta.url) {
+/** Writes AGENTS.md from the CLI bundle and recreates the CLAUDE.md symlink. */
+async function scaffoldAgentsGuide(projectRoot, fromModuleUrl = import.meta.url) {
 	const bundleDir = resolveSkillsBundleDir(fromModuleUrl);
-	const skillsDir = agentsSkillsDir(projectRoot);
 	const agentsMdPath = join(projectRoot, "AGENTS.md");
-	await mkdir(join(projectRoot, ".agents"), { recursive: true });
-	if ((await lstat(skillsDir).catch(() => null))?.isSymbolicLink()) {
-		await rm(skillsDir, { force: true });
-		await cp(join(bundleDir, "skills"), skillsDir, { recursive: true });
-	} else {
-		await mkdir(skillsDir, { recursive: true });
-		await cp(join(bundleDir, "skills"), skillsDir, {
-			recursive: true,
-			force: true
-		});
-	}
 	if ((await lstat(agentsMdPath).catch(() => null))?.isSymbolicLink()) await rm(agentsMdPath, { force: true });
 	await writeFile(agentsMdPath, await readFile(join(bundleDir, "_AGENTS.md"), "utf8"));
-	await ensureSymlink(relative(dirname(join(projectRoot, ".claude", "skills")), skillsDir), join(projectRoot, ".claude", "skills"), "dir");
-	await ensureSymlink(relative(dirname(join(projectRoot, "CLAUDE.md")), agentsMdPath), join(projectRoot, "CLAUDE.md"), "file");
-	await writeFile(bundleVersionPath(projectRoot), `${readCliVersion()}\n`);
+	await ensureSymlink(relative(dirname(join(projectRoot, "CLAUDE.md")), agentsMdPath), join(projectRoot, "CLAUDE.md"));
+	await writeBundleVersion(projectRoot);
+}
+//#endregion
+//#region src/project/write-project-config.ts
+const KEYSTROKE_CONFIG = "keystroke.config.ts";
+function upsertStringLiteral(source, key, value) {
+	const stripped = stripConfigCommentsPreservingLength(source);
+	const entryPattern = new RegExp(`\\b${key}\\s*:\\s*(['"])[^'"]*\\1,?\\s*\\n?`);
+	const entry = value === void 0 ? void 0 : `  ${key}: "${value}",\n`;
+	const match = stripped.match(entryPattern);
+	if (match?.index !== void 0) {
+		const start = match.index;
+		const end = start + match[0].length;
+		if (value === void 0) return source.slice(0, start) + source.slice(end);
+		return source.slice(0, start) + entry + source.slice(end);
+	}
+	if (value === void 0) return source;
+	const defineConfigPattern = /defineConfig\(\{\s*\n?/;
+	if (defineConfigPattern.test(source)) return source.replace(defineConfigPattern, `defineConfig({\n${entry}`);
+	throw new Error(`Could not find defineConfig({ ... }) in ${KEYSTROKE_CONFIG}`);
+}
+function upsertLinkedProjectConfig(source, input) {
+	let next = source;
+	if (input.project !== void 0) next = upsertStringLiteral(next, "project", input.project);
+	if (input.organization !== void 0) next = upsertStringLiteral(next, "organization", input.organization);
+	return next;
+}
+/** Write project/organization slugs into keystroke.config.ts. */
+function writeLinkedProjectConfig(input, fromDir = process.cwd()) {
+	const root = resolveKeystrokeConfigRoot(fromDir);
+	if (!root) throw new Error(`No ${KEYSTROKE_CONFIG} found — run from a keystroke project directory`);
+	const configPath = join(root, KEYSTROKE_CONFIG);
+	writeFileSync(configPath, upsertLinkedProjectConfig(readFileSync(configPath, "utf8"), input));
+	return configPath;
 }
 //#endregion
 //#region src/init/scaffold-empty-src-dirs.ts
@@ -7022,8 +7087,12 @@ async function runInit(options) {
 	}
 	if (playgroundRoot) await applyPlaygroundManifest(targetDir, projectName, playgroundRoot);
 	else await scaffoldProjectDotfiles(targetDir);
-	await syncBundledSkills(targetDir);
+	await scaffoldAgentsGuide(targetDir);
 	await copyFile(join(targetDir, ".env.example"), join(targetDir, ".env"));
+	if (options.project || options.organization) writeLinkedProjectConfig({
+		...options.project ? { project: options.project } : {},
+		...options.organization ? { organization: options.organization } : {}
+	}, targetDir);
 	if (!options.skipInstall) if (playgroundRoot) {
 		installPlaygroundDependencies(targetDir);
 		buildPlaygroundWorkspace(playgroundRoot);
@@ -7036,7 +7105,7 @@ async function runInit(options) {
 //#endregion
 //#region src/commands/init.ts
 function registerInitCommand(program) {
-	program.command("init").description("Create a new keystroke project from a template").argument("[directory]", "Directory to create the project in").option("--name <name>", "Project name (kebab-case)").option("--template <name>", "Template to use", "hello-world").option("-y, --yes", "Skip prompts (headless mode for scripts and AI agents)").option("--skip-install", "Skip dependency installation").option("--pm <manager>", "Package manager: npm, pnpm, yarn, or bun").option("--no-example", "Scaffold without the example action, agent, and workflow").action(async (directory, options) => {
+	program.command("init").description("Create a new keystroke project from a template").argument("[directory]", "Directory to create the project in").option("--name <name>", "Project name (kebab-case)").option("--template <name>", "Template to use", "hello-world").option("-y, --yes", "Skip prompts (headless mode for scripts and AI agents)").option("--skip-install", "Skip dependency installation").option("--pm <manager>", "Package manager: npm, pnpm, yarn, or bun").option("--no-example", "Scaffold without the example action, agent, and workflow").option("--project <slug>", "Platform project slug to write into keystroke.config.ts").option("--organization <slug>", "Platform organization slug to write into keystroke.config.ts").action(async (directory, options) => {
 		try {
 			const result = await runInit({
 				directory,
@@ -7046,14 +7115,16 @@ function registerInitCommand(program) {
 				skipInstall: options.skipInstall,
 				packageManager: options.pm,
 				noExample: options.example === false,
+				project: options.project,
+				organization: options.organization,
 				version: readCliVersion()
 			});
 			process.stdout.write(`Created keystroke project "${result.projectName}" at ${result.targetDir}\n`);
 			process.stdout.write("\nNext steps:\n");
 			process.stdout.write(`  cd ${result.targetDir}\n`);
 			process.stdout.write("  keystroke auth login                  # once\n");
-			process.stdout.write("  keystroke project list                # pick a project (or: project create)\n");
-			process.stdout.write("  keystroke deploy --project <id>       # build + ship src/ to the platform\n");
+			if (!options.project) process.stdout.write("  keystroke project link --project <slug>  # link this directory to a platform project\n");
+			process.stdout.write("  keystroke deploy                    # build + ship src/ to the platform\n");
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Init failed";
 			process.stderr.write(`${message}\n`);
@@ -7062,15 +7133,6 @@ function registerInitCommand(program) {
 	});
 }
 //#endregion
-//#region src/active-project.ts
-function clearActiveProjectIfMatches(config, project) {
-	const activeProjectId = config.get("activeProjectId");
-	if (activeProjectId === project.id || activeProjectId === project.slug) config.delete("activeProjectId");
-}
-function clearActiveProject(config) {
-	if (config.get("activeProjectId") !== void 0) config.delete("activeProjectId");
-}
-//#endregion
 //#region src/commands/organization/run-organization.ts
 async function runOrganizationUpdate(config, input) {
 	await withActivePlatformClient(config, async (platform) => {
@@ -7112,7 +7174,6 @@ async function runOrganizationLeave(config) {
 		await platform.members.removeOrganizationMember(user.id);
 		platform.setActiveOrganizationId(null);
 		config.delete("activeOrganizationId");
-		clearActiveProject(config);
 		process.stdout.write(`${JSON.stringify({ left: user.id }, null, 2)}\n`);
 	});
 }
@@ -7185,9 +7246,23 @@ function registerOrganizationCommand(program) {
 	});
 }
 //#endregion
+//#region src/commands/project/run-project-link.ts
+async function runProjectLink(config, projectRef, fromDir = process.cwd()) {
+	await withActivePlatformClient(config, async (platform) => {
+		const project = await resolveProjectRef(platform, projectRef);
+		const membership = (await listOrganizations(config)).find((entry) => entry.organization.id === project.organizationId);
+		if (!membership) throw new Error(`Organization for project ${formatProjectLabel(project)} was not found or you do not have access`);
+		const configPath = writeLinkedProjectConfig({
+			project: project.slug,
+			organization: membership.organization.slug
+		}, fromDir);
+		process.stdout.write(`Linked ${configPath} to ${membership.organization.slug}/${formatProjectLabel(project)}\nDeploy with: ${cliBinaryName()} deploy\n`);
+	}, fromDir, false);
+}
+//#endregion
 //#region src/commands/project/run-project-members.ts
 async function resolveMembersProject(platform, config, projectRef) {
-	const ref = projectRef ?? getCliTargetOptions().projectId ?? config.get("activeProjectId");
+	const ref = projectRef ?? getCliTargetOptions().projectId ?? readLinkedProjectConfig().project;
 	if (!ref) throw new Error("Usage: keystroke --project <slug> project members <command>");
 	return resolveProjectRef(platform, ref);
 }
@@ -7227,7 +7302,6 @@ async function runProjectMembersLeave(config, options) {
 	await withActivePlatformClient(config, async (platform) => {
 		const project = await resolveMembersProject(platform, config, options.projectRef);
 		await platform.members.leaveProject(project.id);
-		clearActiveProjectIfMatches(config, project);
 		process.stdout.write(`${JSON.stringify({ left: project.id }, null, 2)}\n`);
 	});
 }
@@ -7241,7 +7315,7 @@ function parseProjectRole$1(role) {
 	throw new Error("Role must be admin or builder");
 }
 function resolveProjectRefOption$1(config, optionsProject) {
-	return optionsProject ?? getCliTargetOptions().projectId ?? config.get("activeProjectId");
+	return optionsProject ?? getCliTargetOptions().projectId ?? readLinkedProjectConfig().project;
 }
 function projectRefInput$1(config, optionsProject) {
 	const projectRef = resolveProjectRefOption$1(config, optionsProject);
@@ -7307,7 +7381,7 @@ function registerProjectMembersCommand(project) {
 //#endregion
 //#region src/commands/project/run-project-settings.ts
 async function resolveSettingsProject(platform, config, projectRef) {
-	const ref = projectRef ?? getCliTargetOptions().projectId ?? config.get("activeProjectId");
+	const ref = projectRef ?? getCliTargetOptions().projectId ?? readLinkedProjectConfig().project;
 	if (!ref) throw new Error("Usage: keystroke --project <slug> project settings <command>");
 	return resolveProjectRef(platform, ref);
 }
@@ -7329,7 +7403,7 @@ async function runProjectSettingsUpdate(config, input) {
 //#endregion
 //#region src/commands/project/settings.ts
 function resolveProjectRefOption(config, optionsProject) {
-	return optionsProject ?? getCliTargetOptions().projectId ?? config.get("activeProjectId");
+	return optionsProject ?? getCliTargetOptions().projectId ?? readLinkedProjectConfig().project;
 }
 function projectRefInput(config, optionsProject) {
 	const projectRef = resolveProjectRefOption(config, optionsProject);
@@ -7410,8 +7484,8 @@ function registerProjectCommand(program) {
 	project.command("deployments").description("View deployment history for platform projects").command("list").description("List deployment history for a project").option("--project <slug>", "Project slug").action(async (options) => {
 		const config = createCliConfig();
 		try {
-			const projectRef = options.project ?? getCliTargetOptions().projectId ?? config.get("activeProjectId");
-			if (!projectRef) throw new Error("Usage: keystroke project deployments list --project <slug>");
+			const projectRef = options.project ?? getCliTargetOptions().projectId ?? resolveLinkedProjectRef();
+			if (!projectRef) throw new Error("Usage: keystroke project deployments list --project <slug> (or run `keystroke project link`)");
 			await runProjectDeploymentsList(config, { projectRef });
 		} catch (error) {
 			process.stderr.write(`${formatCliError(error, "List deployments failed", {
@@ -7421,6 +7495,18 @@ function registerProjectCommand(program) {
 			process.exitCode = 1;
 		}
 	});
+	project.command("link").description("Link this directory to a platform project in keystroke.config.ts").requiredOption("--project <slug>", "Platform project slug").option("--dir <path>", "Project directory", process.cwd()).action(async (options) => {
+		const config = createCliConfig();
+		try {
+			await runProjectLink(config, options.project, options.dir);
+		} catch (error) {
+			process.stderr.write(`${formatCliError(error, "Link project failed", {
+				serverUrl: getPlatformUrl(config),
+				webUrl: getWebUrl(config)
+			})}\n`);
+			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) => {
 		const config = createCliConfig();
 		try {
@@ -7523,7 +7609,7 @@ async function runPull(options) {
 	}
 	await writeSourceTree(targetDir, source.files);
 	installDependencies(targetDir, detectProjectPackageManagerFromSnapshot(source.files));
-	await syncBundledSkills(targetDir);
+	await scaffoldAgentsGuide(targetDir);
 	await writePullState({
 		targetDir,
 		projectId: options.projectId,
@@ -7536,7 +7622,7 @@ async function runPull(options) {
 function registerPullCommand(program) {
 	program.command("pull").description("Download the active deploy source snapshot into a local directory").option("--dir <path>", "Target directory", process.cwd()).option("--force", "Overwrite an existing local project tree").action(async (options) => runCliCommand("Pull failed", async () => {
 		const config = createCliConfig();
-		const projectId = await resolveActiveProjectId(config);
+		const projectId = await resolveActiveProjectId(config, resolveProjectRoot(options.dir));
 		if (!projectId) throw new Error("Usage: keystroke pull --project <slug>");
 		await runPull({
 			client: createCliPlatformClient(config),
@@ -7828,9 +7914,10 @@ function registerChannelPlatformsCommand(channel) {
 //#region src/commands/channel/resolve-channel-project.ts
 async function resolveChannelProjectId(config, projectRef) {
 	const platform = createCliPlatformClient(config);
+	await ensureLinkedOrganization(config);
 	await ensureActiveOrganization(config);
-	const ref = projectRef?.trim() || getCliTargetOptions().projectId?.trim() || config.get("activeProjectId")?.trim();
-	if (!ref) throw new Error("Project is required. Pass --project <slug> or set an active project.");
+	const ref = projectRef?.trim() || getCliTargetOptions().projectId?.trim() || readLinkedProjectConfig().project?.trim();
+	if (!ref) throw new Error("Project is required. Pass --project <slug> or run `keystroke project link --project <slug>`.");
 	return (await resolveProjectRef(platform, ref)).id;
 }
 //#endregion
@@ -7928,27 +8015,6 @@ function registerChannelCommand(program) {
 	registerChannelUpdateBindingCommand(channel);
 }
 //#endregion
-//#region src/commands/config/use-project.ts
-async function fetchProjectInOrg(config, projectRef) {
-	return resolveProjectRef(createCliPlatformClient(config), projectRef);
-}
-function assertProjectReadyForConfig(project) {
-	const label = formatProjectLabel(project);
-	if (project.status === "failed") throw new Error(project.lastError ? `Project ${label} deploy failed: ${project.lastError}` : `Project ${label} deploy failed`);
-	if (project.status === "starting") throw new Error(`Project ${label} is still starting. Wait for deploy to finish, then run \`keystroke config use project ${label}\`.`);
-}
-async function runConfigUseProject(config, projectRef) {
-	const project = await fetchProjectInOrg(config, projectRef);
-	assertProjectReadyForConfig(project);
-	config.set("activeProjectId", project.id);
-	config.set("apiTarget", "platform");
-	const label = formatProjectLabel(project);
-	return {
-		stdout: project.status === "active" ? `Using platform project ${label}\n` : `Using platform project ${label} (${project.status})\n`,
-		stderr: project.status === "inactive" ? `Project is not active yet. Deploy with: ${cliBinaryName()} deploy --project ${label}\n` : void 0
-	};
-}
-//#endregion
 //#region src/commands/config/preferences-patch.ts
 function parsePreferenceValue(rawValue) {
 	try {
@@ -8002,22 +8068,23 @@ function registerConfigCommand(program) {
 	config.command("show").description("Show CLI configuration").action(() => {
 		const cliConfig = createCliConfig();
 		const configDir = getConfigDir(cliConfig);
+		const linked = readLinkedProjectConfig();
 		process.stdout.write(`${JSON.stringify({
 			webUrl: cliConfig.get("webUrl"),
 			platformUrl: getPlatformUrl(cliConfig),
 			localApiUrl: resolveLocalApiOrigin(process.cwd()),
 			activeOrganizationId: cliConfig.get("activeOrganizationId"),
-			activeProjectId: cliConfig.get("activeProjectId"),
+			linkedProject: linked.project ?? null,
+			linkedOrganization: linked.organization ?? null,
 			apiTarget: getEffectiveApiTarget(cliConfig),
 			devSession: readDevSession(configDir) ?? null
 		}, null, 2)}\n`);
 	});
-	config.command("use").description("Switch API target (local/cloud/project) or active organization").argument("[mode]", "local, cloud, project, or org").argument("[id]", "Project or organization id when switching cloud target or org").action(async (mode, id) => {
+	config.command("use").description("Switch API target (local/cloud) or active organization").argument("[mode]", "local, cloud, or org").argument("[id]", "Organization slug when switching org").action(async (mode, id) => {
 		const cliConfig = createCliConfig();
 		if (!mode || mode === "local") {
 			cliConfig.set("apiTarget", "local");
-			const activeProjectId = cliConfig.get("activeProjectId");
-			process.stdout.write(activeProjectId ? `Using local keystroke server (cloud project ${activeProjectId} unchanged)\n` : "Using local keystroke server\n");
+			process.stdout.write("Using local keystroke server\n");
 			return;
 		}
 		if (mode === "org") {
@@ -8027,16 +8094,10 @@ function registerConfigCommand(program) {
 		}
 		if (mode === "cloud") {
 			cliConfig.set("apiTarget", "platform");
-			const activeProjectId = cliConfig.get("activeProjectId");
-			process.stdout.write(activeProjectId ? `Using platform API (default project ${activeProjectId} for project-scoped commands)\n` : "Using platform API\n");
+			process.stdout.write("Using platform API\n");
 			return;
 		}
-		if (mode !== "project") throw new Error("Usage: keystroke config use [local|cloud|project [slug]|org [slug]]");
-		const targetProjectId = id ?? cliConfig.get("activeProjectId");
-		if (!targetProjectId) throw new Error("Usage: keystroke config use project <slug>");
-		const result = await runConfigUseProject(cliConfig, targetProjectId);
-		process.stdout.write(result.stdout);
-		if (result.stderr) process.stderr.write(result.stderr);
+		throw new Error("Usage: keystroke config use [local|cloud|org [slug]]");
 	});
 	config.command("org").description("List organizations you belong to").action(async () => {
 		const organizations = await listOrganizations(createCliConfig());
@@ -8062,20 +8123,20 @@ function registerSkillCommand(program) {
 //#endregion
 //#region src/commands/skills.ts
 function registerSkillsCommand(program) {
-	program.command("skills").description("Manage bundled agent skills").command("sync").description("Overwrite bundled skills and AGENTS.md with the CLI version").option("--dir <path>", "Project directory", process.cwd()).action(async (options) => {
+	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 syncBundledSkills(root);
-			process.stdout.write(`Synced bundled skills at ${root}\n`);
+			await scaffoldAgentsGuide(root);
+			process.stdout.write(`Synced AGENTS.md at ${root}\n`);
 		} catch (error) {
-			const message = error instanceof Error ? error.message : "Skills sync failed";
+			const message = error instanceof Error ? error.message : "AGENTS guide sync failed";
 			process.stderr.write(`${message}\n`);
 			process.exitCode = 1;
 		}
 	});
 }
 //#endregion
-//#region src/skills/sync-skills.ts
+//#region src/skills/sync-agents-guide.ts
 function commandPath(command) {
 	const names = [];
 	for (let current = command; current; current = current.parent) {
@@ -8094,18 +8155,20 @@ function shouldSkipAutoSync(command) {
 function resolveAutoSyncRoot(command) {
 	return resolveKeystrokeConfigRoot(command.opts().dir ?? process.cwd());
 }
-/** Sync bundled skills when stale; no-op when not in a project or already up to date. */
-async function syncSkills(command) {
+/** Sync AGENTS.md when stale; no-op when not in a project or already up to date. */
+async function syncAgentsGuide(command) {
 	if (shouldSkipAutoSync(command)) return;
 	const projectRoot = resolveAutoSyncRoot(command);
 	if (!projectRoot) return;
-	const skillsDir = agentsSkillsDir(projectRoot);
-	if (!existsSync(skillsDir)) return;
-	if (lstatSync(skillsDir).isSymbolicLink()) return;
+	const agentsMdPath = join(projectRoot, "AGENTS.md");
+	if (!existsSync(agentsMdPath)) return;
+	if (lstatSync(agentsMdPath).isSymbolicLink()) return;
+	const legacySkillsDir = join(agentsGuideDir(projectRoot), "skills");
+	if (existsSync(legacySkillsDir) && lstatSync(legacySkillsDir).isSymbolicLink()) return;
 	const currentVersion = readCliVersion();
 	if (await readBundleVersion(projectRoot) === currentVersion) return;
-	await syncBundledSkills(projectRoot);
-	process.stderr.write(`Synced bundled skills to ${currentVersion}\n`);
+	await scaffoldAgentsGuide(projectRoot);
+	process.stderr.write(`Synced AGENTS.md to ${currentVersion}\n`);
 }
 //#endregion
 //#region src/program.ts
@@ -8116,7 +8179,7 @@ function createProgram() {
 			projectId: opts.project,
 			local: opts.local
 		});
-		await syncSkills(actionCommand);
+		await syncAgentsGuide(actionCommand);
 	});
 	registerAuthCommand(program);
 	registerConnectCommand(program);
@@ -8144,7 +8207,7 @@ function createProgram() {
 	return program;
 }
 async function runCli(argv) {
-	const { maybeAutoUpdate } = await import("./maybe-auto-update-q5MthdI8.mjs");
+	const { maybeAutoUpdate } = await import("./maybe-auto-update-BDvSKDZp.mjs");
 	await maybeAutoUpdate(argv);
 	createProgram().parse(argv);
 }