@alexkroman1/aai-cli 5.11.0 → 5.13.0

package/dist/{studio-DPDFKZ9i.mjs → studio-GSFd4s5O.mjs}

@@ -1,181 +1,14 @@
 #!/usr/bin/env node
 import { a as ok, t as CliError } from "./_output-CC300DzW.mjs";
-import { n as log, t as fmtUrl } from "./_ui-DfwfDbT-.mjs";
-import { s as updateProjectConfig } from "./_config-DMyolIk9.mjs";
-import { t as resolveServerEnv } from "./_server-common-DX8Bfrf5.mjs";
-import { i as resolveDeployTarget } from "./_agent-DS2PUJcl.mjs";
-import { layerScaffold } from "./_templates-DmdG-voA.mjs";
-import { n as apiRequest } from "./_api-client-B-upMGkc.mjs";
+import { n as log, t as fmtUrl } from "./_ui-u7T4YooX.mjs";
+import { s as updateProjectConfig } from "./_config-CzwAWOWr.mjs";
+import { t as resolveServerEnv } from "./_server-common-61fL__39.mjs";
+import { i as resolveDeployTarget } from "./_agent-C8Jk-ZcP.mjs";
+import { layerScaffold } from "./_templates-B1kt3BGt.mjs";
+import { n as apiRequest } from "./_api-client-BX8Qv51n.mjs";
+import { a as publishStudioProject, i as projectNameFromDir, n as fetchStudioProject, o as pushStudioSource, r as listStudioProjects, s as studioProjectUrl, t as collectSourceFiles } from "./_studio-D2ciIhbi.mjs";
 import path from "node:path";
-import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
-import { PREVIEW_SLUG_SUFFIX, VALID_SLUG_RE } from "@alexkroman1/aai/utils";
-//#region _studio.ts
-/**
-* Internals of the studio-workspace commands (`aai list/pull/push/publish`):
-* the local source-file walk and the thin clients for the platform's
-* `/studio/projects` routes. The workspace is the single source of truth —
-* these helpers only move files between a local directory and the project's
-* workspace row; production deploys happen exclusively through the studio's
-* Publish route (which runs the deploy machinery in the project's sandbox).
-*/
-/**
-* Mirrors of the studio workspace caps (`aai-studio-server/studio-limits.ts`)
-* — by value, like `aai-guest/limits.ts`, since the CLI cannot depend on the
-* private server package. The server re-validates every push; these exist so
-* an oversized file is a named warning locally instead of a rejected upload.
-*/
-const MAX_STUDIO_FILE_BYTES = 256e3;
-/**
-* What never syncs to a workspace — the same set the guest's snapshot skips
-* (`aai-guest/studio-workspace-fs.ts`), plus what only exists locally:
-* secrets (`.env` rides the secret routes, never a workspace row) and
-* lockfiles (regenerated by install, noise in the studio editor).
-*/
-const IGNORED_DIRS = /* @__PURE__ */ new Set([
-	"node_modules",
-	".git",
-	"dist",
-	".aai"
-]);
-const IGNORED_FILES = [
-	/^\.env(\..+)?$/,
-	/^pnpm-lock\.yaml$/,
-	/^package-lock\.json$/,
-	/^yarn\.lock$/,
-	/^\.DS_Store$/
-];
-function isIgnoredFile(name) {
-	return IGNORED_FILES.some((re) => re.test(name));
-}
-/** Project-relative paths of every syncable file under `dir`, sorted. */
-async function walkProject(dir, current = dir) {
-	const out = [];
-	const entries = await readdir(current, { withFileTypes: true });
-	for (const entry of entries) {
-		if (entry.isSymbolicLink()) continue;
-		const abs = path.join(current, entry.name);
-		if (entry.isDirectory()) {
-			if (!IGNORED_DIRS.has(entry.name)) out.push(...await walkProject(dir, abs));
-		} else if (entry.isFile() && !isIgnoredFile(entry.name)) out.push(path.relative(dir, abs));
-	}
-	return out.sort((a, b) => a.localeCompare(b));
-}
-/**
-* Decode `buf` as UTF-8, or null when it isn't valid UTF-8.
-*
-* `fatal` makes an invalid sequence throw instead of becoming U+FFFD, which
-* is the whole point: a workspace is a JSON path→string map and cannot carry
-* arbitrary bytes, so a lossy read turned a pushed PNG into replacement
-* characters while reporting success — and a later `aai pull` wrote the
-* mangled version back over the local original. `ignoreBOM` keeps a leading
-* U+FEFF in the string; without it the decoder strips the BOM and the check
-* meant to stop corruption would quietly perform some of its own.
-*/
-const UTF8_STRICT = new TextDecoder("utf-8", {
-	fatal: true,
-	ignoreBOM: true
-});
-function decodeUtf8(buf) {
-	try {
-		return UTF8_STRICT.decode(buf);
-	} catch {
-		return null;
-	}
-}
-/**
-* Walk a local project into the path→content record a workspace stores —
-* the CLI-side twin of the guest's `snapshotWorkspace`: same ignored
-* directories, same caps, oversized and non-text files skipped with a
-* warning rather than failing the whole push.
-*/
-async function collectSourceFiles(dir) {
-	const paths = await walkProject(dir);
-	const files = {};
-	const warnings = [];
-	if (paths.length > 100) warnings.push(`Project has ${paths.length} files; only the first 100 sync to the studio.`);
-	const read = await Promise.all(paths.slice(0, 100).map(async (rel) => {
-		const abs = path.join(dir, rel);
-		const st = await stat(abs);
-		if (st.size > 256e3) return {
-			ok: false,
-			warning: `${rel} is ${st.size} bytes (max ${MAX_STUDIO_FILE_BYTES}) — not synced.`
-		};
-		const content = decodeUtf8(await readFile(abs));
-		if (content === null) return {
-			ok: false,
-			warning: `${rel} is not valid UTF-8 (binary file?) — not synced.`
-		};
-		return {
-			ok: true,
-			rel,
-			content
-		};
-	}));
-	for (const entry of read) {
-		if (!entry.ok) {
-			warnings.push(entry.warning);
-			continue;
-		}
-		files[entry.rel.split(path.sep).join("/")] = entry.content;
-	}
-	return {
-		files,
-		warnings
-	};
-}
-/**
-* A studio project name derived from a directory name, or null if unusable.
-*
-* A `-preview` suffix is deliberately unusable. Publishing a project deploys
-* it under the project's own name, so a `*-preview` project would claim a
-* slug the studio's orphan-preview sweep reaps hourly — deleting the agent,
-* its app-database schema, and its secrets on a schedule the user never
-* asked for. Refusing the name is recoverable (rename the directory); losing
-* a published agent to the reaper is not.
-*/
-function projectNameFromDir(dir) {
-	const name = path.basename(dir).toLowerCase().replace(/[^a-z0-9-_]+/g, "-").replace(/-{2,}/g, "-").replace(/^[-_]+|[-_]+$/g, "").slice(0, 64);
-	if (name.endsWith(PREVIEW_SLUG_SUFFIX)) return null;
-	return VALID_SLUG_RE.test(name) ? name : null;
-}
-/** The shareable studio URL for a project — what every command prints. */
-function studioProjectUrl(serverUrl, project) {
-	return `${serverUrl}/studio/chat/${project}`;
-}
-function listStudioProjects(serverUrl, apiKey) {
-	return apiRequest(`${serverUrl}/studio/projects`, {
-		apiKey,
-		action: "list"
-	}).then((res) => res.projects);
-}
-/** Fetch a project, or null when it doesn't exist (the push existence probe). */
-function fetchStudioProject(serverUrl, apiKey, project) {
-	return apiRequest(`${serverUrl}/studio/projects/${encodeURIComponent(project)}`, {
-		apiKey,
-		action: "pull",
-		allow404: true
-	});
-}
-/** `PUT /studio/projects/:project/source` — the atomic whole-tree push. */
-function pushStudioSource(serverUrl, apiKey, project, body) {
-	return apiRequest(`${serverUrl}/studio/projects/${encodeURIComponent(project)}/source`, {
-		apiKey,
-		action: "push",
-		method: "PUT",
-		body,
-		hints: { 409: "The studio has newer changes. Run `aai pull` to fetch them, or `aai push --force` to overwrite." }
-	});
-}
-/** `POST /studio/projects/:project/deploy` — Publish, in the project's sandbox. */
-function publishStudioProject(serverUrl, apiKey, project) {
-	return apiRequest(`${serverUrl}/studio/projects/${encodeURIComponent(project)}/deploy`, {
-		apiKey,
-		action: "publish",
-		method: "POST",
-		retry: 0
-	});
-}
-//#endregion
+import { mkdir, readdir, writeFile } from "node:fs/promises";
 //#region studio.ts
 /**
 * The studio-workspace commands: `aai list`, `aai pull`, `aai push`,
@@ -310,11 +143,11 @@ async function executePush(opts) {
 * deploy time, which is why publish syncs them BEFORE deploying when the
 * slug is already known.
 */
-async function syncEnvSecrets(cwd, serverUrl, apiKey, slug) {
+async function syncEnvSecrets(cwd, serverUrl, apiKey, project) {
 	const env = await resolveServerEnv(cwd);
 	const names = Object.keys(env);
 	if (names.length === 0) return [];
-	await apiRequest(`${serverUrl}/${slug}/secret`, {
+	await apiRequest(`${serverUrl}/studio/projects/${encodeURIComponent(project)}/secret`, {
 		apiKey,
 		action: "secret",
 		method: "PUT",
@@ -325,13 +158,13 @@ async function syncEnvSecrets(cwd, serverUrl, apiKey, slug) {
 }
 async function executePublish(opts) {
 	if (!opts.skipTypecheck) {
-		const { assertTypechecks } = await import("./_typecheck-gate-DB-PY0A3.mjs");
+		const { assertTypechecks } = await import("./_typecheck-gate-4v9UBZHh.mjs");
 		await assertTypechecks(opts.cwd);
 	}
 	const pushed = await pushProject(opts);
 	const { project, serverUrl, apiKey } = pushed;
 	const hadSlug = pushed.slug !== void 0;
-	if (pushed.slug) await syncEnvSecrets(opts.cwd, serverUrl, apiKey, pushed.slug);
+	if (pushed.slug) await syncEnvSecrets(opts.cwd, serverUrl, apiKey, project);
 	log.step(`Publishing ${project} (builds in the project's sandbox)…`);
 	const result = await publishStudioProject(serverUrl, apiKey, project);
 	if (typeof result?.slug !== "string" || typeof result?.output !== "string") throw new CliError("bad_publish_response", `Unexpected response from the publish route at ${serverUrl}.`, "Check that --server points at an aai platform server, then try again.");

package/dist/templates/dispatch-center/shared.ts

@@ -1,6 +1,7 @@
 // ─── Types ───────────────────────────────────────────────────────────────────
 
 import type { ToolContext } from "@alexkroman1/aai";
+import { createKeyedLock, withLock } from "@alexkroman1/aai";
 
 export const SEVERITIES = ["critical", "urgent", "moderate", "minor"] as const;
 export type Severity = (typeof SEVERITIES)[number];
@@ -198,7 +199,7 @@ function pruneState(state: DispatchState): void {
   }
 }
 
-const sessionLocks = new Map<string, Promise<unknown>>();
+const sessionLock = createKeyedLock();
 
 /**
  * Serialized update of the session's dispatch state.
@@ -206,33 +207,30 @@ const sessionLocks = new Map<string, Promise<unknown>>();
  * The LLM loop executes parallel tool calls concurrently. The state lives in
  * `ctx.state` now (one shared object, no snapshot/save round-trip), but a
  * mutator may be async, and two interleaving async mutators can each observe
- * the other's half-applied changes. This per-session promise chain makes
- * each update run against the previous one's finished result. It also
- * centralizes the shared bookkeeping every mutating tool needs: pruning and
- * alert-level recalculation.
+ * the other's half-applied changes. Holding the session's key makes each
+ * update run against the previous one's finished result. It also centralizes
+ * the shared bookkeeping every mutating tool needs: pruning and alert-level
+ * recalculation.
+ *
+ * `createKeyedLock` rather than a hand-rolled promise chain per session: the
+ * SDK's drops each key's entry once its chain drains (so a long-running agent
+ * does not accumulate one per session id) and does it by ownership, which is
+ * the part a hand-rolled chain gets wrong.
  *
  * There is no post-save callback: pushing the board to the client used to
  * need one, and `syncState` now does it after every tool call.
  */
-export async function updateState<R>(
+export function updateState<R>(
   ctx: ToolContext,
   mutator: (state: DispatchState) => R | Promise<R>,
 ): Promise<R> {
-  const prev = sessionLocks.get(ctx.sessionId) ?? Promise.resolve();
-  const run = prev.then(async () => {
+  return withLock(sessionLock, ctx.sessionId, async () => {
     const state = getState(ctx);
     const result = await mutator(state);
     pruneState(state);
     recalculateAlertLevel(state);
     return result;
   });
-  // Keep the chain alive across failures, and drop it once idle.
-  const tail = run.catch(() => {});
-  sessionLocks.set(ctx.sessionId, tail);
-  tail.then(() => {
-    if (sessionLocks.get(ctx.sessionId) === tail) sessionLocks.delete(ctx.sessionId);
-  });
-  return run;
 }
 
 // ─── Incident helpers ────────────────────────────────────────────────────────

package/dist/templates/pizza-ordering/agent.test.ts

@@ -21,6 +21,9 @@ function makeCtx(sessionId = "session-a") {
     generate: () => Promise.reject(new Error("generate not available in tests")),
     messages: [],
     sessionId,
+    // Never aborts — a test has no turn to cancel. `ctx.signal` is always
+    // present at runtime, so a stub supplies one rather than omitting it.
+    signal: new AbortController().signal,
     send: (event, data) => {
       sent.push({ event, data });
     },

package/dist/templates/retail/store.ts

@@ -1,5 +1,5 @@
 import type { ToolContext } from "@alexkroman1/aai";
-import { tool } from "@alexkroman1/aai";
+import { createKeyedLock, tool, withLock } from "@alexkroman1/aai";
 import type { z } from "zod";
 import seedJson from "./seed.json";
 import type {
@@ -151,34 +151,28 @@ export function requireOwnOrder(state: RetailState, orderId: string): Order | Er
 
 // ─── Serialized state updates ────────────────────────────────────────────────
 
-const sessionLocks = new Map<string, Promise<unknown>>();
+const sessionLock = createKeyedLock();
 
 /**
  * Serialized update of the session's store.
  *
  * The LLM loop can execute parallel tool calls, and a mutator may be async —
  * two interleaving async mutators can each observe the other's half-applied
- * changes. This per-session promise chain runs each update against the previous
- * one's finished result.
+ * changes. Holding the session's key runs each update against the previous
+ * one's finished result. `createKeyedLock` is the SDK's primitive for exactly
+ * this; the hand-rolled promise chain it replaced also had to remember to drop
+ * each key's entry by ownership once idle.
  *
  * NOT exported, unlike dispatch-center's equivalent. `retailTool` is the only
- * caller, so a tool body cannot re-enter it — which would chain the inner call
- * on a tail that only resolves once the inner call finishes, i.e. deadlock. A
- * hazard you can't reach beats a hazard you documented.
+ * caller, so a tool body cannot re-enter it — which would wait on a key only
+ * the outer call can release, i.e. deadlock. A hazard you can't reach beats a
+ * hazard you documented.
  */
-async function updateState<R>(
+function updateState<R>(
   ctx: ToolContext,
   mutator: (state: RetailState) => R | Promise<R>,
 ): Promise<R> {
-  const previous = sessionLocks.get(ctx.sessionId) ?? Promise.resolve();
-  const run = previous.then(() => mutator(getState(ctx)));
-  // Keep the chain alive across failures, and drop it once idle.
-  const tail = run.catch(() => {});
-  sessionLocks.set(ctx.sessionId, tail);
-  tail.then(() => {
-    if (sessionLocks.get(ctx.sessionId) === tail) sessionLocks.delete(ctx.sessionId);
-  });
-  return run;
+  return withLock(sessionLock, ctx.sessionId, async () => mutator(getState(ctx)));
 }
 
 // ─── The tool wrapper ────────────────────────────────────────────────────────

package/dist/templates/solo-rpg/agent.test.ts

@@ -54,6 +54,9 @@ function makeCtx(sessionId = "session-a", db: Db = makeDb().db): ToolContext {
     generate: () => Promise.reject(new Error("generate not available in tests")),
     messages: [],
     sessionId,
+    // Never aborts — a test has no turn to cancel. `ctx.signal` is always
+    // present at runtime, so a stub supplies one rather than omitting it.
+    signal: new AbortController().signal,
     send: vi.fn(),
   };
 }

package/dist/{test-C-V98oC-.mjs → test-2LWBcXvY.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { a as ok, n as fail } from "./_output-CC300DzW.mjs";
-import { n as log } from "./_ui-DfwfDbT-.mjs";
-import { a as errorMessage, n as binFromPackageJson, r as errorCode } from "./_utils-8KKw-bzi.mjs";
+import { n as log } from "./_ui-u7T4YooX.mjs";
+import { a as errorMessage, n as binFromPackageJson, r as errorCode } from "./_utils-0DHbcqUb.mjs";
 import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
 import path from "node:path";

package/dist/typecheck.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as errorMessage, n as binFromPackageJson } from "./_utils-8KKw-bzi.mjs";
+import { a as errorMessage, n as binFromPackageJson } from "./_utils-0DHbcqUb.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { spawn } from "node:child_process";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexkroman1/aai-cli",
-  "version": "5.11.0",
+  "version": "5.13.0",
   "type": "module",
   "bin": {
     "aai": "bin.mjs"
@@ -20,6 +20,11 @@
       "@dev/source": "./typecheck.ts",
       "types": "./dist/typecheck.d.ts",
       "import": "./dist/typecheck.mjs"
+    },
+    "./project-config": {
+      "@dev/source": "./project-config.ts",
+      "types": "./dist/project-config.d.ts",
+      "import": "./dist/project-config.mjs"
     }
   },
   "files": [
@@ -38,8 +43,8 @@
     "p-timeout": "^7.0.1",
     "vite": "^8.1.5",
     "zod": "^4.4.3",
-    "@alexkroman1/aai": "5.11.0",
-    "@alexkroman1/aai-ui": "5.11.0"
+    "@alexkroman1/aai": "5.13.0",
+    "@alexkroman1/aai-ui": "5.13.0"
   },
   "devDependencies": {
     "playwright": "^1.61.1",

package/dist/_slug-api-fRNNR8tz.mjs

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-import { n as getServerInfo } from "./_agent-DS2PUJcl.mjs";
-import { n as apiRequest, t as HINT_NOT_DEPLOYED } from "./_api-client-B-upMGkc.mjs";
-//#region _slug-api.ts
-/**
-* Authenticated request against a deployed agent's slug-scoped resource
-* (`${serverUrl}/${slug}${resourcePath}`) — the one shape every per-agent
-* command (secret, storage) shares, including the standard "not deployed"
-* 404 hint.
-*
-* Its own module (rather than living beside `getServerInfo` in `_agent.ts`)
-* so tests can mock `_agent.ts`/`_api-client.ts` while this composition
-* stays real — an intra-module call would bypass those mocks.
-*/
-async function slugRequest(cwd, resourcePath, init, server) {
-	const { serverUrl, slug, apiKey } = await getServerInfo(cwd, server);
-	return {
-		data: await apiRequest(`${serverUrl}/${slug}${resourcePath}`, {
-			...init,
-			apiKey,
-			hints: { 404: HINT_NOT_DEPLOYED }
-		}),
-		slug
-	};
-}
-//#endregion
-export { slugRequest as t };