@usecontextlayer/cli 0.13.0 → 0.14.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as url, a as whoami, c as array, d as literal, f as looseObject, g as unknown, h as string, i as login, l as boolean, m as record, n as getAccessToken, o as env, p as object, r as getCurrentUser, s as _enum, t as getLocalAppId, u as hostname, v as uuid, y as execa } from "./app-CRgSQabE.mjs";
+import { S as execa, _ as record, a as getAccessToken, b as url, c as whoami, d as boolean, f as discriminatedUnion, g as object, h as looseObject, i as secretNameSchema, l as env, m as literal, n as readLocalManifest, o as getCurrentUser, p as hostname, r as connectionRequirementSchema, s as login, t as getLocalAppId, u as array, v as string, x as uuid, y as unknown } from "./app-CJgT3IKd.mjs";
 import { cp, readFile, writeFile } from "node:fs/promises";
 import path, { join } from "node:path";
 import { EventEmitter } from "node:events";
@@ -3004,7 +3004,41 @@ async function runLocalAgent(name, prompt) {
 	}
 }
 //#endregion
+//#region ../shared/dist/app-connections.mjs
+const appConnectionSchema = connectionRequirementSchema.extend({
+	connection_id: string().nullable(),
+	slug: string()
+});
+const appConnectionsSchema = object({ connections: array(appConnectionSchema) });
+//#endregion
+//#region owner.ts
+const ownerOptionsSchema = object({ org: string().min(1).optional() });
+async function resolveOwner(org, headers) {
+	if (!org) return {
+		id: (await getCurrentUser(headers)).id,
+		type: "user"
+	};
+	const response = await fetch(new URL("/api/platform/organizations", env.CTX_AUTH_ISSUER), { headers });
+	if (!response.ok) throw new Error(`Organization lookup failed: HTTP ${response.status}`);
+	const { organizations } = object({ organizations: array(object({
+		id: string().min(1),
+		slug: string()
+	})) }).parse(await response.json());
+	const organization = organizations.find((organization) => organization.slug === org);
+	if (!organization) throw new Error("Organization is not in your memberships");
+	return {
+		id: organization.id,
+		type: "organization"
+	};
+}
+function ownerPath(owner) {
+	return `${owner.type === "organization" ? "org" : "user"}/${encodeURIComponent(owner.id)}`;
+}
+//#endregion
 //#region connections.ts
+async function getLocalManifest(target) {
+	return target === "local" ? readLocalManifest() : void 0;
+}
 async function resolveAppTarget(target) {
 	if (target !== "local") return target;
 	return getLocalAppId();
@@ -3014,6 +3048,7 @@ async function assignAppConnection(target, slug, connectionId) {
 	const response = await fetch(new URL(`/api/apps/${encodeURIComponent(appTarget)}/connections/assign`, env.CTX_PLATFORM_URL), {
 		body: JSON.stringify({
 			connection_id: connectionId,
+			manifest: await getLocalManifest(target),
 			slug
 		}),
 		headers: {
@@ -3031,7 +3066,7 @@ async function assignAppConnection(target, slug, connectionId) {
 }
 async function listAppConnections(target) {
 	const appTarget = await resolveAppTarget(target);
-	const manifest = target === "local" ? JSON.parse(await readFile("public/slate.json", "utf8")) : void 0;
+	const manifest = await getLocalManifest(target);
 	const response = await fetch(new URL(`/api/apps/${encodeURIComponent(appTarget)}/connections/list`, env.CTX_PLATFORM_URL), {
 		body: JSON.stringify({ manifest }),
 		headers: {
@@ -3041,12 +3076,7 @@ async function listAppConnections(target) {
 		method: "POST"
 	});
 	if (!response.ok) throw new Error(`App connections request failed: HTTP ${response.status}`);
-	const { connections } = object({ connections: array(object({
-		connection_id: string().nullable(),
-		mode: _enum(["individual", "shared"]),
-		slug: string(),
-		toolkit: string()
-	})) }).parse(await response.json());
+	const { connections } = appConnectionsSchema.parse(await response.json());
 	if (!connections.length) {
 		console.log("No connection requirements.");
 		return;
@@ -3056,22 +3086,26 @@ async function listAppConnections(target) {
 		connection: connection_id ?? "unassigned"
 	})));
 }
-async function addConnection(toolkit) {
-	const response = await fetch(new URL("/api/connections", env.CTX_PLATFORM_URL), {
+async function addConnection(toolkit, org) {
+	const headers = { authorization: `Bearer ${await getAccessToken()}` };
+	const owner = await resolveOwner(org, headers);
+	const response = await fetch(new URL(`/api/connections/${ownerPath(owner)}`, env.CTX_PLATFORM_URL), {
 		body: JSON.stringify({ toolkit }),
 		headers: {
-			authorization: `Bearer ${await getAccessToken()}`,
+			...headers,
 			"content-type": "application/json"
 		},
 		method: "POST"
 	});
 	if (!response.ok) throw new Error(`Connection authorization failed: HTTP ${response.status}`);
 	const { redirect_url } = object({ redirect_url: url() }).parse(await response.json());
-	console.log(`Open this link to connect your account:\n${redirect_url}`);
-	console.log("After authorization, run ctx connections list to see your account.");
+	console.log(`Open this link to authorize the Owner's account:\n${redirect_url}`);
+	console.log(`After authorization, run ctx connections${org ? ` --org ${org}` : ""} list to see the Owner's account.`);
 }
-async function listConnections() {
-	const response = await fetch(new URL("/api/connections", env.CTX_PLATFORM_URL), { headers: { authorization: `Bearer ${await getAccessToken()}` } });
+async function listConnections(org) {
+	const headers = { authorization: `Bearer ${await getAccessToken()}` };
+	const owner = await resolveOwner(org, headers);
+	const response = await fetch(new URL(`/api/connections/${ownerPath(owner)}`, env.CTX_PLATFORM_URL), { headers });
 	if (!response.ok) throw new Error(`Connection list failed: HTTP ${response.status}`);
 	const { connections } = object({ connections: array(object({
 		alias: string().nullable(),
@@ -3128,7 +3162,7 @@ async function gitCredential(operation) {
 }
 //#endregion
 //#region package.json
-var version = "0.13.0";
+var version = "0.14.1";
 //#endregion
 //#region ../../node_modules/.pnpm/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/utils.js
 const getCodePointsLength = (() => {
@@ -3819,40 +3853,29 @@ ${r ? styleText("cyan", S_BAR_END) : ""}
 `${styleText("dim", "↑/↓")}`, `${styleText("dim", "Enter:")}`;
 `${styleText("gray", S_BAR)}`;
 //#endregion
-//#region secrets.ts
-const secretNameSchema = string().regex(/^[A-Z_][A-Z0-9_]*$/);
-const secretOptionsSchema = object({
-	org: string().min(1).optional(),
-	stdin: boolean().default(false)
+//#region ../shared/dist/app-usage.mjs
+const ownerSchema = discriminatedUnion("type", [object({
+	id: string().min(1),
+	type: literal("user")
+}), object({
+	id: string().min(1),
+	type: literal("organization")
+})]);
+object({
+	id: uuid(),
+	owner: ownerSchema
 });
+//#endregion
+//#region secrets.ts
+const secretOptionsSchema = ownerOptionsSchema.extend({ stdin: boolean().default(false) });
 const valueSchema = string().min(1);
 const confirmationSchema = object({
 	name: secretNameSchema,
-	owner: object({
-		id: string().min(1),
-		type: _enum(["organization", "user"])
-	})
+	owner: ownerSchema
 });
 async function resolveSecretUrl(name, org, headers) {
-	let type;
-	let id;
-	if (org) {
-		const url = new URL("/api/platform/organizations", env.CTX_AUTH_ISSUER);
-		const response = await fetch(url, { headers });
-		if (!response.ok) throw new Error(`Organization lookup failed: HTTP ${response.status}`);
-		const { organizations } = object({ organizations: array(object({
-			id: string().min(1),
-			slug: string()
-		})) }).parse(await response.json());
-		const organization = organizations.find((organization) => organization.slug === org);
-		if (!organization) throw new Error("Organization is not in your memberships");
-		type = "org";
-		id = organization.id;
-	} else {
-		id = (await getCurrentUser(headers)).id;
-		type = "user";
-	}
-	return new URL(`/api/secrets/${type}/${encodeURIComponent(id)}/${encodeURIComponent(name)}`, env.CTX_PLATFORM_URL);
+	const owner = await resolveOwner(org, headers);
+	return new URL(`/api/secrets/${ownerPath(owner)}/${encodeURIComponent(name)}`, env.CTX_PLATFORM_URL);
 }
 async function setSecret(name, options) {
 	const headers = { authorization: `Bearer ${await getAccessToken()}` };
@@ -3997,13 +4020,18 @@ program.command("login").description("Sign in by approving a browser code and co
 });
 program.command("git-credential <operation>").description("Git credential helper using the saved login; invoked automatically by Git").action(gitCredential);
 program.command("whoami").description("Show your ContextLayer user ID using the saved login").action(whoami);
-const connections = program.command("connections").description("Manage your connected accounts").argument("[target]", "AppID, public hostname, or local (run from the app root)").addArgument(new Argument("[operation]", "App connection operation").choices(["list"])).action(async (target, operation) => {
+const connections = program.command("connections").description("Manage Owner-owned connected accounts or list an app's requirements").option("--org <org_slug>", "Manage this organization's connections; defaults to the signed-in user").argument("[target]", "AppID, public hostname, or local (run from the app root)").addArgument(new Argument("[operation]", "App connection operation").choices(["list"])).action(async (target, operation) => {
 	if (!target || !operation) connections.error("Expected: ctx connections <target> list");
 	await listAppConnections(target);
 });
-connections.command("list").description("List your Composio accounts with their toolkit, identity, and status").action(listConnections);
-connections.command("add <toolset>").description("Print a Composio authorization link to connect an account (for example, gmail)").action(addConnection);
-program.command("connection").description("Assign a connection to an app requirement").argument("<target>", "AppID, public hostname, or local (run from the app root)").addArgument(new Argument("<operation>").choices(["assign"])).argument("<slug>", "Connection requirement slug").argument("<connection_id>", "Composio connected-account ID").action(async (target, _operation, slug, connectionId) => {
+connections.command("list").description("List the selected Owner's Composio accounts with their toolkit, identity, and status").action(async (_options, command) => {
+	await listConnections(ownerOptionsSchema.parse(command.optsWithGlobals()).org);
+});
+connections.command("add <toolkit>").description("Print a Composio authorization link for the selected Owner's account (for example, gmail)").action(async (toolkit, _options, command) => {
+	const options = ownerOptionsSchema.parse(command.optsWithGlobals());
+	await addConnection(string().min(1).parse(toolkit), options.org);
+});
+program.command("connection").description("Assign a connection using the requirement’s viewer or owner mode; owner mode requires app management").argument("<target>", "AppID, public hostname, or local (run from the app root)").addArgument(new Argument("<operation>").choices(["assign"])).argument("<slug>", "Connection requirement slug").argument("<connection_id>", "Composio connected-account ID").action(async (target, _operation, slug, connectionId) => {
 	await assignAppConnection(target, slug, connectionId);
 });
 program.command("agent").addArgument(new Argument("<target>", "Run from the app root").choices(["local"])).addArgument(new Argument("<operation>").choices(["run"])).argument("<name>", "Agent directory under agents/").argument("<prompt>", "Task to send as the user message").description("Run agents/<name>/instructions.md locally with Claude Agent SDK and native Claude authentication; no platform server or ctx login required").action(async (_target, _operation, name, prompt) => {