@hitch42/applet 0.1.1-beta.19 → 0.1.1-beta.21

package/dist/{hitch-client-Cw-WZ_8v.js → hitch-client-Dph_kzDd.js}

@@ -1,18 +1,17 @@
-import { n as withFilesUpload, r as getRegisteredHitchContract } from "./upload-DRbVhuDm.js";
-import { t as withBatchRecorder } from "./batch-_ZjAg-Kk.js";
-import { t as createLazyClientProxy } from "./lazy-client-CwIzYAoE.js";
+import { n as withFilesUpload, r as getRegisteredHitchContract } from "./upload-DtMavo8Q.js";
+import { t as withBatchRecorder } from "./batch-CiLZ177G.js";
+import { t as createLazyClientProxy } from "./lazy-client--QCL0wiu.js";
 import { createORPCClient } from "@orpc/client";
 import { OpenAPILink } from "@orpc/openapi-client/fetch";
 import { createTanstackQueryUtils } from "@orpc/tanstack-query";
-//#region src/hitch/browser.ts
+// src/hitch/browser.ts
 function createHitchClient(contract) {
 	return createLazyClientProxy(() => createORPCClient(new OpenAPILink(contract, {
 		url: `${location.origin}/api`,
 		fetch: (request, init) => globalThis.fetch(request, init)
 	})));
 }
-//#endregion
-//#region src/author/hitch-client.ts
+// src/author/hitch-client.ts
 function buildClientHitch() {
 	const contract = getRegisteredHitchContract();
 	if (contract === void 0) throw new Error("`hitch` is unavailable: run `applet generate` first. The framework imports your .hitch automatically at build; in plain node import your .hitch once before calling hitch.");
@@ -20,5 +19,4 @@ function buildClientHitch() {
 }
 const hitchClient = createLazyClientProxy(buildClientHitch);
 const hitch = withFilesUpload(createTanstackQueryUtils(hitchClient), () => hitchClient.files);
-//#endregion
 export { hitch as t };

package/dist/{hitch-file-url-BPKj9zVG.js → hitch-file-url--AMjDOzP.js}

@@ -1,4 +1,4 @@
-//#region src/react/hitch-file-url.ts
+// src/react/hitch-file-url.ts
 const HITCH_FILE_PREFIX = "hitch-file://";
 const DOWNLOAD_URL_TTL_MS = 3e6;
 const downloadUrlCache = /* @__PURE__ */ new Map();
@@ -21,5 +21,4 @@ function seedDownloadUrl(id, url) {
 function invalidateDownloadUrl(id) {
 	downloadUrlCache.delete(id);
 }
-//#endregion
 export { seedDownloadUrl as i, cachedDownloadUrl as n, invalidateDownloadUrl as r, HITCH_FILE_PREFIX as t };

package/dist/index.d.ts

@@ -1,16 +1,13 @@
-import { a as AppletSourceDefinition, c as RegisteredCatalog, d as RegisteredRouter, f as RegisteredVariableKeys, h as registerHitchContract, i as AppletPackages, l as RegisteredContract, m as RegisteredWorkflows, n as AppletManifest, o as RegisteredAppletSourceDefinition, p as RegisteredVariables, r as AppletManifestObject, s as HitchRegister, t as AppletDefinition, u as RegisteredManifest } from "./manifest-BBHD_EY9.js";
-import { n as pruneContract, t as NarrowContract } from "./contract-CJv-n1l3.js";
-import { a as UploadedHitchFile, c as filesContract, i as UploadProgress, n as FilesUpload, r as UploadFileOptions, s as uploadFile, t as FilesClient } from "./upload-D_kkmne_.js";
-import { a as EmailTracker, c as HitchEmailMessage, f as ListEmailTrackersOutput, g as emailContract, h as SendHitchEmailInput, i as EmailContract, l as HitchEmailThread, m as ListHitchEmailThreadsInput, n as TelephonyMessageReceivedEvent, o as HitchEmailAddress, p as ListHitchEmailMessagesInput, s as HitchEmailAttachment, t as EmailMessageReceivedEvent, u as HitchMailbox } from "./email-protocol-B9u_dh2p.js";
+import { a as AppletSourceDefinition, c as RegisteredCatalog, d as RegisteredRouter, f as RegisteredVariableKeys, h as registerHitchContract, i as AppletPackages, l as RegisteredContract, m as RegisteredWorkflows, n as AppletManifest, o as RegisteredAppletSourceDefinition, p as RegisteredVariables, r as AppletManifestObject, s as HitchRegister, t as AppletDefinition, u as RegisteredManifest } from "./manifest-CpghlaJc.js";
+import { n as pruneContract, t as NarrowContract } from "./contract-CUc0B2rl.js";
+import { a as UploadedHitchFile, c as filesContract, i as UploadProgress, n as FilesUpload, r as UploadFileOptions, s as uploadFile, t as FilesClient } from "./upload-DXZyjZSS.js";
+import { a as EmailTracker, c as HitchEmailMessage, f as ListEmailTrackersOutput, g as emailContract, h as SendHitchEmailInput, i as EmailContract, l as HitchEmailThread, m as ListHitchEmailThreadsInput, n as TelephonyMessageReceivedEvent, o as HitchEmailAddress, p as ListHitchEmailMessagesInput, s as HitchEmailAttachment, t as EmailMessageReceivedEvent, u as HitchMailbox } from "./email-protocol-CEqzASSx.js";
 import { ContractProcedure, Meta, Schema } from "@orpc/contract";
-//#region ../shared/auth/src/workspace.d.mts
 interface HitchConfig {
   sdk: string;
   org: string;
   githubWorkflow?: boolean;
 }
-//#endregion
-//#region src/hitch/me.d.ts
 type HitchPerson = {
   id: string;
   firstName: string;
@@ -38,8 +35,6 @@ type MeContract = {
   get: ContractProcedure<Schema<void, void>, Schema<HitchMe, HitchMe>, Record<never, never>, Meta>;
 };
 declare const meContract: MeContract;
-//#endregion
-//#region src/hitch/telephony.d.ts
 type HitchPhoneNumber = {
   id: string;
   e164: string;
@@ -142,10 +137,9 @@ type TelephonyContract = {
   };
 };
 declare const telephonyContract: TelephonyContract;
-//#endregion
-//#region src/hitch/teams.d.ts
 type HitchTeam = {
   id: string;
+  code: string;
   name: string;
 };
 type HitchTeamMember = {
@@ -154,9 +148,9 @@ type HitchTeamMember = {
   lastName: string;
   email: string;
 };
-type TeamIdInput = {
+type TeamInput = {
   params: {
-    id: string;
+    team: string;
   };
 };
 type TeamsOutput = {
@@ -168,9 +162,8 @@ type TeamMembersOutput = {
 type TeamsContract = {
   list: ContractProcedure<Schema<void, void>, Schema<TeamsOutput, TeamsOutput>, Record<never, never>, Meta>;
   members: {
-    list: ContractProcedure<Schema<TeamIdInput, TeamIdInput>, Schema<TeamMembersOutput, TeamMembersOutput>, Record<never, never>, Meta>;
+    list: ContractProcedure<Schema<TeamInput, TeamInput>, Schema<TeamMembersOutput, TeamMembersOutput>, Record<never, never>, Meta>;
   };
 };
 declare const teamsContract: TeamsContract;
-//#endregion
 export { type AppletDefinition, type AppletManifest, type AppletManifestObject, type AppletPackages, type AppletSourceDefinition, type EmailContract, type EmailMessageReceivedEvent, type EmailTracker, type FilesClient, type FilesUpload, type HitchConfig, type HitchEmailAddress, type HitchEmailAttachment, type HitchEmailMessage, type HitchEmailThread, type HitchMailbox, type HitchMe, type HitchMessage, type HitchPhoneNumber, type HitchRegister, type HitchTeam, type HitchTeamMember, type ListEmailTrackersOutput, type ListHitchEmailMessagesInput, type ListHitchEmailThreadsInput, type ListHitchMessagesInput, type NarrowContract, type RegisteredAppletSourceDefinition, type RegisteredCatalog, type RegisteredContract, type RegisteredManifest, type RegisteredRouter, type RegisteredVariableKeys, type RegisteredVariables, type RegisteredWorkflows, type SendHitchEmailInput, type SendHitchMessageInput, type TelephonyContract, type TelephonyMessageReceivedEvent, type UploadFileOptions, type UploadProgress, type UploadedHitchFile, emailContract, filesContract, meContract, pruneContract, registerHitchContract, teamsContract, telephonyContract, uploadFile };

package/dist/index.js

@@ -1,56 +1,56 @@
-import { i as registerHitchContract, t as uploadFile } from "./upload-DRbVhuDm.js";
-import { t as pruneContract } from "./contract-BeKz1Qcs.js";
+import { i as registerHitchContract, t as uploadFile } from "./upload-DtMavo8Q.js";
+import { t as pruneContract } from "./contract-D9LCNGjD.js";
 import { oc, type } from "@orpc/contract";
-//#region src/hitch/email.ts
+// src/hitch/email.ts
 function emailContract(appletCode) {
-	const path = `/v1/applets/${encodeURIComponent(appletCode)}/email/tracking`;
+	const path = `/resource/v1/applets/${encodeURIComponent(appletCode)}/email/trackers`;
 	return {
 		mailboxes: { list: oc.route({
 			method: "GET",
-			path: "/v1/email/mailboxes"
+			path: "/resource/v1/email/mailboxes"
 		}).input(type()).output(type()) },
 		threads: {
 			list: oc.route({
 				method: "GET",
-				path: "/v1/email/threads"
+				path: "/resource/v1/email/threads"
 			}).input(type()).output(type()),
 			get: oc.route({
 				method: "GET",
-				path: "/v1/email/threads/{id}"
+				path: "/resource/v1/email/threads/{id}"
 			}).input(type()).output(type())
 		},
 		messages: {
 			list: oc.route({
 				method: "GET",
-				path: "/v1/email/messages"
+				path: "/resource/v1/email/messages"
 			}).input(type()).output(type()),
 			get: oc.route({
 				method: "GET",
-				path: "/v1/email/messages/{id}"
+				path: "/resource/v1/email/messages/{id}"
 			}).input(type()).output(type()),
 			send: oc.route({
 				method: "POST",
-				path: "/v1/email/messages",
+				path: "/resource/v1/email/messages",
 				successStatus: 201
 			}).input(type()).output(type()),
 			raw: oc.route({
 				method: "GET",
-				path: "/v1/email/messages/{id}/raw"
+				path: "/resource/v1/email/messages/{id}/raw"
 			}).input(type()).output(type())
 		},
 		attachments: { get: oc.route({
 			method: "GET",
-			path: "/v1/email/attachments/{id}"
+			path: "/resource/v1/email/attachments/{id}"
 		}).input(type()).output(type()) },
 		tracking: {
 			createPixel: oc.route({
 				method: "POST",
-				path: `${path}/pixels`,
+				path,
 				successStatus: 201
 			}).input(type()).output(type()),
 			markSent: oc.route({
-				method: "POST",
-				path: `${path}/{id}/sent`
+				method: "PATCH",
+				path: `${path}/{id}`
 			}).input(type()).output(type()),
 			get: oc.route({
 				method: "GET",
@@ -58,83 +58,78 @@ function emailContract(appletCode) {
 			}).input(type()).output(type()),
 			list: oc.route({
 				method: "POST",
-				path: `${path}/list`
+				path: `${path}/query`
 			}).input(type()).output(type())
 		}
 	};
 }
-//#endregion
-//#region src/hitch/files.ts
+// src/hitch/files.ts
 const filesContract = {
 	create: oc.route({
 		method: "POST",
-		path: "/v1/files",
+		path: "/resource/v1/files",
 		successStatus: 201,
 		inputStructure: "detailed"
 	}).input(type()).output(type()),
 	confirm: oc.route({
 		method: "POST",
-		path: "/v1/files/{id}/confirm",
+		path: "/resource/v1/files/{file}/confirm",
 		successStatus: 200,
 		inputStructure: "detailed"
 	}).input(type()).output(type()),
 	get: oc.route({
 		method: "GET",
-		path: "/v1/files/{id}",
+		path: "/resource/v1/files/{file}",
 		inputStructure: "detailed"
 	}).input(type()).output(type())
 };
-//#endregion
-//#region src/hitch/me.ts
+// src/hitch/me.ts
 const meContract = { get: oc.route({
 	method: "GET",
-	path: "/v1/me"
+	path: "/me/v1"
 }).input(type()).output(type()) };
-//#endregion
-//#region src/hitch/telephony.ts
+// src/hitch/telephony.ts
 const telephonyContract = {
 	calls: {
 		get: oc.route({
 			method: "GET",
-			path: "/v1/telephony/calls/{id}"
+			path: "/resource/v1/telephony/calls/{id}"
 		}).input(type()).output(type()),
 		list: oc.route({
 			method: "GET",
-			path: "/v1/telephony/calls"
+			path: "/resource/v1/telephony/calls"
 		}).input(type()).output(type())
 	},
 	numbers: { list: oc.route({
 		method: "GET",
-		path: "/v1/telephony/numbers"
+		path: "/resource/v1/telephony/numbers"
 	}).input(type()).output(type()) },
 	messages: {
 		get: oc.route({
 			method: "GET",
-			path: "/v1/telephony/messages/{id}"
+			path: "/resource/v1/telephony/messages/{id}"
 		}).input(type()).output(type()),
 		list: oc.route({
 			method: "GET",
-			path: "/v1/telephony/messages"
+			path: "/resource/v1/telephony/messages"
 		}).input(type()).output(type()),
 		send: oc.route({
 			method: "POST",
-			path: "/v1/telephony/messages",
+			path: "/resource/v1/telephony/messages",
 			successStatus: 201
 		}).input(type()).output(type())
 	}
 };
-//#endregion
-//#region src/hitch/teams.ts
+// src/hitch/teams.ts
 const teamsContract = {
 	list: oc.route({
 		method: "GET",
-		path: "/v1/teams"
+		path: "/resource/v1/teams"
 	}).input(type()).output(type()),
 	members: { list: oc.route({
 		method: "GET",
-		path: "/v1/teams/{id}/members",
+		path: "/resource/v1/teams/{team}/members",
 		inputStructure: "detailed"
 	}).input(type()).output(type()) }
 };
-//#endregion
 export { emailContract, filesContract, meContract, pruneContract, registerHitchContract, teamsContract, telephonyContract, uploadFile };

package/dist/{init-DT0faD-q.js → init-Bb6WT8UB.js}

@@ -1,12 +1,17 @@
-import { c as resolveInstanceUrl, s as resolveAuthForOrg } from "./store-B8N_8JIN.js";
-import { n as readWorkspaceConfig } from "./workspace-8yqXsvce.js";
-import { r as runGenerate } from "./generate-8yyxKRSz.js";
-import { n as loadAppletSourceDefinition, o as APPLET_CODE_PATTERN, s as ORG_CODE_PATTERN } from "./load-config-BYrBjPlr.js";
-import { a as writeAppletSupport, n as loadCliManifest, o as writeWorkspaceSupport, t as assertWorkspaceCli } from "./project-CWVwic2C.js";
+import { r as writeGeneratedAgents } from "./generated-agents-BUnJ0FQA.js";
+import { f as resolveAuth, m as resolveInstanceUrl, p as resolveAuthForOrg } from "./store-E5NhITHl.js";
+import { a as findWorkspaceRoot, i as findWorkspaceConfig, o as isRootLayout, r as findParentRoot, s as readWorkspaceConfig } from "./workspace-CtIKSgMD.js";
+import { r as orgUsesHitchGit, t as canCheckHitchGit } from "./auth-DuMRqSGe.js";
+import { n as loadAppletSourceDefinition } from "./load-config-Cffvj-aM.js";
+import { r as runGenerate } from "./generate-48pqFh5M.js";
+import { n as ORG_CODE_PATTERN, t as APPLET_CODE_PATTERN } from "./manifest-patterns-BfxqImlp.js";
+import { l as writeRootSupport, n as loadCliManifest, r as loadPackageManifest, s as writeAppletSupport, t as assertWorkspaceCli, u as writeWorkspaceSupport } from "./project-DZGk765E.js";
+import { n as childApplets } from "./parent-Zx8Eg1Ki.js";
+import { t as migrateIfEnabled } from "./git-migration-CIq-sN61.js";
 import { access, cp, mkdir, readdir, writeFile } from "node:fs/promises";
 import { relative, resolve } from "node:path";
 import { spawn } from "node:child_process";
-//#region src/init.ts
+// src/init.ts
 function isMissingFile(error) {
 	return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
@@ -151,10 +156,34 @@ export default {
 	const nextSteps = [...installResult === "succeeded" ? [] : ["pnpm install"], "pnpm exec applet new <code>"];
 	console.log(`Workspace created in ${target}.\n\nNext steps:\n${nextSteps.map((step) => `  ${step}`).join("\n")}`);
 }
+async function bootstrapApplet(root, options) {
+	const cli = await loadCliManifest();
+	if (cli === void 0) throw new Error("The CLI package manifest is not published.");
+	await writeRootSupport(root, await loadAppletSourceDefinition(root), cli);
+	if (await installDependencies(root, options.install ?? true) === "failed") throw new Error(`Dependency installation failed in ${root}.`);
+	console.log(`Applet files generated in ${root}.`);
+}
 async function runBootstrap(options = {}) {
-	const target = process.cwd();
+	const cwd = process.cwd();
+	const workspace = findWorkspaceRoot(cwd);
+	const parent = workspace === void 0 ? findParentRoot(cwd) : void 0;
+	if (parent !== void 0) {
+		await writeGeneratedAgents(parent);
+		for (const child of await childApplets(parent)) await bootstrapApplet(child, options);
+		return;
+	}
+	const target = workspace ?? cwd;
 	const config = readWorkspaceConfig(target);
-	if (config === void 0) throw new Error(`Not a Hitch workspace root: ${target}. Run applet bootstrap from the directory that contains hitch.config.ts.`);
+	if (config === void 0) throw new Error(`Not a Hitch workspace or applet: ${target}.`);
+	if (isRootLayout(target)) {
+		await bootstrapApplet(target, options);
+		return;
+	}
+	const migration = await migrateIfEnabled(cwd, options.message);
+	if (migration !== void 0) {
+		for (const child of migration.roots) await bootstrapApplet(child, options);
+		return;
+	}
 	const cli = await loadCliManifest();
 	if (cli === void 0) throw new Error("The CLI package manifest is not published.");
 	assertWorkspaceCli(config, cli);
@@ -176,19 +205,35 @@ async function runBootstrap(options = {}) {
 async function runNew(options) {
 	if (!APPLET_CODE_PATTERN.test(options.code)) throw new Error(`Invalid applet code "${options.code}".`);
 	if (options.clientOnly === true && options.serverOnly === true) throw new Error("Use only one of --client-only or --server-only.");
-	const workspaceRoot = process.cwd();
+	const cwd = process.cwd();
+	const previousConfig = findWorkspaceConfig(cwd);
+	const migration = await migrateIfEnabled(cwd, options.message);
+	const workspaceRoot = migration === void 0 ? findWorkspaceRoot(cwd) ?? findParentRoot(cwd) ?? cwd : migration.roots.length === 1 ? migration.roots[0] : migration.root;
 	const name = options.code.replaceAll("_", " ").replace(/^./, (character) => character.toUpperCase());
-	const config = readWorkspaceConfig(workspaceRoot);
-	if (config === void 0) throw new Error(`Not a Hitch workspace root: ${workspaceRoot}. Run applet new from the directory that contains hitch.config.ts.`);
+	const workspaceConfig = readWorkspaceConfig(workspaceRoot);
+	const childOrgs = findParentRoot(workspaceRoot) === workspaceRoot ? [...new Set((await childApplets(workspaceRoot)).map((child) => readWorkspaceConfig(child).org))] : [];
+	const org = workspaceConfig?.org ?? previousConfig?.org ?? process.env.HITCH_DEFAULT_ORG ?? (childOrgs.length === 1 ? childOrgs[0] : void 0) ?? (await resolveAuth(await resolveInstanceUrl()))?.orgCode;
+	if (org === void 0 || !ORG_CODE_PATTERN.test(org)) throw new Error("Set HITCH_DEFAULT_ORG or log in to one organization before applet new.");
+	const hitchGit = await canCheckHitchGit() && await orgUsesHitchGit(org);
+	if (!hitchGit && cwd !== workspaceRoot) throw new Error(`Not a Hitch workspace root: ${cwd}. Run applet new from the directory that contains hitch.config.ts.`);
+	if (!hitchGit && (workspaceConfig === void 0 || isRootLayout(workspaceRoot))) throw new Error("Hitch git is off. Run applet new in a legacy workspace.");
 	const cli = await loadCliManifest({ allowDevelopment: true });
-	if (cli !== void 0) assertWorkspaceCli(config, cli);
-	const appletTarget = resolve(workspaceRoot, "applets", options.code);
+	if (cli !== void 0 && !hitchGit) assertWorkspaceCli(workspaceConfig, cli);
+	const config = workspaceConfig ?? {
+		org,
+		sdk: `@hitch42/applet@${cli?.version ?? "0.0.0"}`
+	};
+	const appletTarget = resolve(workspaceRoot, ...hitchGit ? [] : ["applets"], options.code);
 	await assertTargetIsAvailable([resolve(appletTarget, "applet.manifest.ts"), resolve(appletTarget, "src")], "an applet");
 	const hasClient = options.serverOnly !== true;
 	const hasServer = options.clientOnly !== true;
 	if (hasClient) await cp(new URL("../scaffold/applet", import.meta.url), appletTarget, { recursive: true });
 	await Promise.all([hasClient ? mkdir(resolve(appletTarget, "src/client/routes"), { recursive: true }) : void 0, hasServer ? mkdir(resolve(appletTarget, "src/server"), { recursive: true }) : void 0]);
 	const definition = {
+		...hitchGit ? {
+			org,
+			sdk: (cli ?? await loadPackageManifest()).version
+		} : {},
 		name,
 		code: options.code,
 		objects: [],
@@ -199,7 +244,7 @@ async function runNew(options) {
 		writeFile(resolve(appletTarget, "applet.manifest.ts"), `import type { AppletSourceDefinition } from "@hitch42/applet";
 
 export default {
-  name: "${name}",
+${hitchGit ? `  org: ${JSON.stringify(org)},\n  sdk: ${JSON.stringify(definition.sdk)},\n` : ""}  name: "${name}",
   code: "${options.code}",
   objects: [],
   dependencies: {},
@@ -224,16 +269,23 @@ const router = {
 export default { router };
 `) : void 0
 	]);
-	await Promise.all([writeAppletSupport(appletTarget, definition), cli === void 0 ? void 0 : writeWorkspaceSupport(workspaceRoot, config, cli)]);
-	const installResult = await installDependencies(workspaceRoot, options.install ?? true);
+	if (hitchGit) {
+		if (cli === void 0) await writeAppletSupport(appletTarget, definition);
+		else await writeRootSupport(appletTarget, definition, cli);
+		if (!await runGit(appletTarget, [
+			"init",
+			"-b",
+			"main"
+		])) throw new Error("Could not initialize the applet repo.");
+	} else await Promise.all([writeAppletSupport(appletTarget, definition), cli === void 0 ? void 0 : writeWorkspaceSupport(workspaceRoot, config, cli)]);
+	const installResult = await installDependencies(hitchGit ? appletTarget : workspaceRoot, options.install ?? true);
 	const generateSucceeded = await generateAppletFiles(appletTarget, config.org, installResult);
 	const relativeTarget = relative(workspaceRoot, appletTarget);
 	const nextSteps = [
-		...installResult === "succeeded" ? [`cd ${JSON.stringify(relativeTarget)}`] : ["pnpm install", `cd ${JSON.stringify(relativeTarget)}`],
+		...installResult === "succeeded" ? [`cd ${JSON.stringify(relativeTarget)}`] : hitchGit ? [`cd ${JSON.stringify(relativeTarget)}`, "pnpm install"] : ["pnpm install", `cd ${JSON.stringify(relativeTarget)}`],
 		...generateSucceeded ? [] : ["pnpm exec applet generate"],
 		"pnpm exec vite"
 	];
 	console.log(`Applet created in ${relativeTarget}.\n\nNext steps:\n${nextSteps.map((step) => `  ${step}`).join("\n")}`);
 }
-//#endregion
 export { runBootstrap, runInit, runNew };

package/dist/{lazy-client-CwIzYAoE.js → lazy-client--QCL0wiu.js}

@@ -1,4 +1,4 @@
-//#region src/lazy-client.ts
+// src/lazy-client.ts
 function createLazyClientProxy(build) {
 	let client;
 	const at = (path) => new Proxy(() => void 0, {
@@ -10,5 +10,4 @@ function createLazyClientProxy(build) {
 	});
 	return at([]);
 }
-//#endregion
 export { createLazyClientProxy as t };

package/dist/{load-config-BYrBjPlr.js → load-config-Cffvj-aM.js}

@@ -1,14 +1,17 @@
-import { n as readWorkspaceConfig } from "./workspace-8yqXsvce.js";
+import { c as validateRootManifest, i as findWorkspaceConfig, n as findAppletRoot, o as isRootLayout } from "./workspace-CtIKSgMD.js";
+import { n as ORG_CODE_PATTERN, t as APPLET_CODE_PATTERN } from "./manifest-patterns-BfxqImlp.js";
 import { z } from "zod";
 import { existsSync } from "node:fs";
-import { basename, dirname, resolve } from "node:path";
+import { resolve } from "node:path";
 import { loadConfigFromFile } from "vite";
 import { Cron } from "croner";
-//#region src/manifest-patterns.ts
-const APPLET_CODE_PATTERN = /^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/;
-const ORG_CODE_PATTERN = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
-//#endregion
-//#region src/manifest.ts
+// src/workspace.ts
+function resolveWorkspaceOrg(appletRoot) {
+	const config = findWorkspaceConfig(appletRoot);
+	if (config !== void 0) return config.org;
+	throw new Error(`No Hitch workspace found for ${appletRoot}. Expected applet.manifest.ts or hitch.config.ts.`);
+}
+// src/manifest.ts
 const RESERVED_ATTRIBUTE_CODES = /* @__PURE__ */ new Set([
 	"id",
 	"name",
@@ -124,6 +127,13 @@ const checkPublicFields = (manifest, context) => {
 	}));
 };
 const appletManifestSchema = z.strictObject(appletManifestShape).superRefine(checkDuplicateCodes).superRefine(checkPublicFields);
+function appletReleaseManifest(source, org) {
+	const { sdk: _sdk, org: _org, dependencies: _dependencies, devDependencies: _devDependencies, ...definition } = source;
+	return appletManifestSchema.parse({
+		org,
+		...definition
+	});
+}
 z.strictObject({
 	name: appletManifestShape.name,
 	code: appletManifestShape.code,
@@ -135,6 +145,9 @@ z.strictObject({
 	variables: appletManifestShape.variables,
 	objects: appletManifestShape.objects
 }).superRefine(checkDuplicateCodes).superRefine(checkPublicFields);
+function appletMountPath({ code, public: isPublic }) {
+	return isPublic ? `pages/${code}` : code;
+}
 const packageVersionsSchema = z.record(z.string().min(1), z.string().min(1)).readonly();
 const RESERVED_APPLET_PACKAGES = /* @__PURE__ */ new Set([
 	"@fontsource-variable/geist-mono",
@@ -199,6 +212,8 @@ const checkSourcePackages = (manifest, context) => {
 	});
 };
 const appletSourceDefinitionSchema = z.strictObject({
+	org: appletManifestShape.org.optional(),
+	sdk: z.string().optional(),
 	name: appletManifestShape.name,
 	code: appletManifestShape.code,
 	requiresChangeset: appletManifestShape.requiresChangeset,
@@ -215,19 +230,9 @@ const appletSourceDefinitionSchema = z.strictObject({
 	checkSourcePackages(manifest, context);
 	checkPublicFields(manifest, context);
 });
-//#endregion
-//#region src/workspace.ts
-function resolveWorkspaceOrg(appletRoot) {
-	const appletsDir = dirname(appletRoot);
-	if (basename(appletsDir) === "applets") {
-		const config = readWorkspaceConfig(dirname(appletsDir));
-		if (config !== void 0) return config.org;
-	}
-	throw new Error(`No Hitch workspace found for ${appletRoot}. An applet must live at <workspace>/applets/<code> with hitch.config.ts in the workspace root.`);
-}
-//#endregion
-//#region src/typegen/load-config.ts
+// src/typegen/load-config.ts
 async function loadAppletSourceDefinition(root) {
+	root = findAppletRoot(root) ?? root;
 	const path = resolve(root, "applet.manifest.ts");
 	if (!existsSync(path)) throw new Error(`No applet manifest found at ${path}.`);
 	const loaded = await loadConfigFromFile({
@@ -235,16 +240,12 @@ async function loadAppletSourceDefinition(root) {
 		mode: "production"
 	}, path, root);
 	if (loaded === null) throw new Error(`No applet manifest found at ${path}.`);
+	if (isRootLayout(root)) validateRootManifest(loaded.config);
 	const parsed = appletSourceDefinitionSchema.safeParse(loaded.config);
 	if (!parsed.success) throw new Error(`Invalid applet manifest at ${loaded.path}: ${parsed.error.message}`);
 	return parsed.data;
 }
 async function loadAppletConfig(root) {
-	const { dependencies: _dependencies, devDependencies: _devDependencies, ...definition } = await loadAppletSourceDefinition(root);
-	return {
-		org: resolveWorkspaceOrg(root),
-		...definition
-	};
+	return appletReleaseManifest(await loadAppletSourceDefinition(root), resolveWorkspaceOrg(root));
 }
-//#endregion
-export { appletSourceDefinitionSchema as a, appletManifestSchema as i, loadAppletSourceDefinition as n, APPLET_CODE_PATTERN as o, resolveWorkspaceOrg as r, ORG_CODE_PATTERN as s, loadAppletConfig as t };
+export { appletSourceDefinitionSchema as a, appletReleaseManifest as i, loadAppletSourceDefinition as n, resolveWorkspaceOrg as o, appletMountPath as r, loadAppletConfig as t };

package/dist/{log-context-DWznGjfz.js → log-context-BepwdjrR.js}

@@ -1,5 +1,5 @@
 import { channel } from "node:diagnostics_channel";
-//#region src/server/log-context.ts
+// src/server/log-context.ts
 const REQUEST_CONTEXT_CHANNEL = "hitch.request.context";
 const APP_CONTEXT_CHANNEL = "hitch.request.app";
 const isUuid = (value) => typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
@@ -65,5 +65,4 @@ function createNoteLog(initial) {
 	publishNote(initial.requestId, initial);
 	return log;
 }
-//#endregion
 export { errorNote as a, requestIdFrom as c, createNoteLog as i, REQUEST_CONTEXT_CHANNEL as n, isUuid as o, cloudflareRequestFields as r, publishNote as s, APP_CONTEXT_CHANNEL as t };

package/dist/login-BWZKo7Ui.js

@@ -0,0 +1,21 @@
+import { c as normalizeInstanceUrl, h as revokeOAuthCredentials, m as resolveInstanceUrl, s as deleteCredentials, t as AuthenticationError, u as readCredentialStore } from "./store-E5NhITHl.js";
+import { t as loginWithDevice } from "./device-CZWWckCq.js";
+import { i as findWorkspaceConfig } from "./workspace-CtIKSgMD.js";
+// src/login.ts
+async function runLogin(options) {
+	if (process.env.HITCH_API_KEY !== void 0) throw new AuthenticationError("HITCH_API_KEY is set — unset it to manage stored logins.");
+	const { me, membership } = await loginWithDevice(await resolveInstanceUrl(), {
+		expectedOrg: findWorkspaceConfig(process.cwd())?.org,
+		noBrowser: options.noBrowser
+	});
+	console.log(`Signed in as ${me.person.email} to ${membership.name}.`);
+}
+async function runLogout() {
+	if (process.env.HITCH_API_KEY !== void 0) throw new AuthenticationError("HITCH_API_KEY is set — unset it to manage stored logins.");
+	const instance = await resolveInstanceUrl();
+	const credentials = Object.values((await readCredentialStore()).instances[normalizeInstanceUrl(instance)] ?? {});
+	await Promise.all(credentials.filter((item) => item.type === "oauth").map((item) => revokeOAuthCredentials(instance, item)));
+	await deleteCredentials(instance);
+	console.log(`Logged out of ${instance}.`);
+}
+export { runLogin, runLogout };

package/dist/{logs-CEIikWzV.js → logs-glCVHI-8.js}

@@ -1,8 +1,9 @@
-import { n as readWorkspaceConfig } from "./workspace-8yqXsvce.js";
-import { t as fetchWithOrgAuth } from "./auth-D3CrCtZq.js";
-import { o as APPLET_CODE_PATTERN, r as resolveWorkspaceOrg, t as loadAppletConfig } from "./load-config-BYrBjPlr.js";
+import { s as readWorkspaceConfig } from "./workspace-CtIKSgMD.js";
+import { n as fetchWithOrgAuth } from "./auth-DuMRqSGe.js";
+import { o as resolveWorkspaceOrg, t as loadAppletConfig } from "./load-config-Cffvj-aM.js";
+import { t as APPLET_CODE_PATTERN } from "./manifest-patterns-BfxqImlp.js";
 import { z } from "zod";
-//#region src/logs.ts
+// src/logs.ts
 const LOG_LEVELS = [
 	"debug",
 	"log",
@@ -128,7 +129,7 @@ async function runLogs(options) {
 	const startedAt = Date.now();
 	const requestLogs = async (from, to) => {
 		const response = await fetchWithOrgAuth(org, (instanceUrl, accessToken) => {
-			const url = new URL(`/api/v1/applets/${encodeURIComponent(code)}/logs/query`, `${instanceUrl}/`);
+			const url = new URL(`/api/manage/v1/applets/${encodeURIComponent(code)}/logs/query`, `${instanceUrl}/`);
 			const levelFilter = level === void 0 ? void 0 : { level: { $in: LOG_LEVELS.slice(LOG_LEVELS.indexOf(level)) } };
 			return fetch(url, {
 				method: "POST",
@@ -177,5 +178,4 @@ async function runLogs(options) {
 		lastTimestamp = Math.max(lastTimestamp, ...logs.map(({ timestamp }) => timestamp));
 	}
 }
-//#endregion
 export { runLogs };

package/dist/{manifest-BBHD_EY9.d.ts → manifest-CpghlaJc.d.ts}

@@ -1,8 +1,7 @@
-import { t as AnyWorkflowDefinition } from "./workflow-DurM6Fwx.js";
+import { t as AnyWorkflowDefinition } from "./workflow-BnBrJIzu.js";
 import { AnyProcedure, AnyRouter, Lazy } from "@orpc/server";
 import { AnyContractRouter } from "@orpc/contract";
 import { z } from "zod";
-//#region src/hitch/registry.d.ts
 interface HitchRegister {}
 type RegisteredCatalog = HitchRegister extends {
   catalog: infer C;
@@ -26,8 +25,6 @@ type RegisteredWorkflows = HitchRegister extends {
   workflows: infer W extends Record<string, AnyWorkflowDefinition>;
 } ? W : Record<string, AnyWorkflowDefinition>;
 declare function registerHitchContract(contract: AnyContractRouter): void;
-//#endregion
-//#region src/manifest.d.ts
 interface AppletManifest {
   org: string;
   name: string;
@@ -69,7 +66,10 @@ interface AppletPackages {
   dependencies?: Readonly<Record<string, string>>;
   devDependencies?: Readonly<Record<string, string>>;
 }
-type AppletSourceDefinition = AppletDefinition & AppletPackages;
+type AppletSourceDefinition = AppletDefinition & AppletPackages & {
+  org?: string;
+  sdk?: string;
+};
 type RegisteredAppletManifestObject = { [Code in keyof RegisteredCatalog]: Omit<AppletManifestObject, "code" | "readOnly" | "readWrite"> & {
   code: Code;
   readOnly: readonly RegisteredCatalog[Code][];
@@ -95,6 +95,5 @@ type RegisteredAppletManifest = (RegisteredAppletManifestFields & {
 });
 type DistributiveOmit<T, K extends PropertyKey> = T extends unknown ? Omit<T, K> : never;
 type RegisteredAppletDefinition = DistributiveOmit<RegisteredAppletManifest, "org">;
-type RegisteredAppletSourceDefinition = RegisteredAppletDefinition & AppletPackages;
-//#endregion
+type RegisteredAppletSourceDefinition = RegisteredAppletDefinition & AppletPackages & Pick<AppletSourceDefinition, "org" | "sdk">;
 export { AppletSourceDefinition as a, RegisteredCatalog as c, RegisteredRouter as d, RegisteredVariableKeys as f, registerHitchContract as h, AppletPackages as i, RegisteredContract as l, RegisteredWorkflows as m, AppletManifest as n, RegisteredAppletSourceDefinition as o, RegisteredVariables as p, AppletManifestObject as r, HitchRegister as s, AppletDefinition as t, RegisteredManifest as u };

package/dist/manifest-patterns-BfxqImlp.js

@@ -0,0 +1,4 @@
+// src/manifest-patterns.ts
+const APPLET_CODE_PATTERN = /^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/;
+const ORG_CODE_PATTERN = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
+export { ORG_CODE_PATTERN as n, APPLET_CODE_PATTERN as t };