terse-cli 0.6.2 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/actorDevUi.d.ts +2 -1
- package/dist/actorDevUi.d.ts.map +1 -1
- package/dist/actorDevUi.js +4 -3
- package/dist/actorDevUi.js.map +1 -1
- package/dist/commands/actor.d.ts.map +1 -1
- package/dist/commands/actor.js +13 -8
- package/dist/commands/actor.js.map +1 -1
- package/dist/commands/actorGenerate.d.ts.map +1 -1
- package/dist/commands/actorGenerate.js +24 -7
- package/dist/commands/actorGenerate.js.map +1 -1
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +2 -0
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +26 -31
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +5 -63
- package/dist/commands/install.js.map +1 -1
- package/dist/index.js +7 -474
- package/dist/index.js.map +1 -1
- package/dist/localActors.d.ts.map +1 -1
- package/dist/localActors.js +4 -3
- package/dist/localActors.js.map +1 -1
- package/dist/productFeatures.d.ts +5 -0
- package/dist/productFeatures.d.ts.map +1 -0
- package/dist/productFeatures.js +6 -0
- package/dist/productFeatures.js.map +1 -0
- package/dist/projectActorTools.d.ts +5 -0
- package/dist/projectActorTools.d.ts.map +1 -0
- package/dist/projectActorTools.js +34 -0
- package/dist/projectActorTools.js.map +1 -0
- package/dist/providers/typescript/actorCodegen.d.ts.map +1 -1
- package/dist/providers/typescript/actorCodegen.js +14 -10
- package/dist/providers/typescript/actorCodegen.js.map +1 -1
- package/dist/providers/typescript/actorSources.d.ts +4 -2
- package/dist/providers/typescript/actorSources.d.ts.map +1 -1
- package/dist/providers/typescript/actorSources.js +12 -5
- package/dist/providers/typescript/actorSources.js.map +1 -1
- package/package.json +5 -4
package/dist/actorDevUi.d.ts
CHANGED
|
@@ -3,9 +3,10 @@ interface ActorDevSettings {
|
|
|
3
3
|
actorUrl: string;
|
|
4
4
|
projectId: string;
|
|
5
5
|
apiKey?: string;
|
|
6
|
+
entryFile?: string;
|
|
6
7
|
}
|
|
7
8
|
export declare function formatActorDevLog(line: string, colors?: ChalkInstance): string;
|
|
8
|
-
export declare function formatActorDevReady({ actorUrl, projectId, apiKey }: ActorDevSettings): string;
|
|
9
|
+
export declare function formatActorDevReady({ actorUrl, projectId, apiKey, entryFile }: ActorDevSettings): string;
|
|
9
10
|
export declare function createActorDevOutput(settings: ActorDevSettings, writeLine: (line: string) => void): (line: string) => void;
|
|
10
11
|
export {};
|
|
11
12
|
//# sourceMappingURL=actorDevUi.d.ts.map
|
package/dist/actorDevUi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actorDevUi.d.ts","sourceRoot":"","sources":["../src/actorDevUi.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAKjD,UAAU,gBAAgB;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"actorDevUi.d.ts","sourceRoot":"","sources":["../src/actorDevUi.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAKjD,UAAU,gBAAgB;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB;AAID,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,aAAqB,GAAG,MAAM,CAYrF;AAED,wBAAgB,mBAAmB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAA2B,EAAE,EAAE,gBAAgB,GAAG,MAAM,CAmB1H;AAID,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAoC1H"}
|
package/dist/actorDevUi.js
CHANGED
|
@@ -16,7 +16,7 @@ export function formatActorDevLog(line, colors = chalk) {
|
|
|
16
16
|
const route = actor ? `${colors.bold(`${actor[2]}/${actor[3]}`)} ${colors.dim(`· ${actor[4]} · project ${actor[1]}`)}` : runtime ? colors.dim(`Runtime · ${runtime[1]}`) : path;
|
|
17
17
|
return ` ${statusColor(status)} ${colors.dim(method.padEnd(6))} ${colors.dim(`${latency} ms`.padStart(10))} ${route}`;
|
|
18
18
|
}
|
|
19
|
-
export function formatActorDevReady({ actorUrl, projectId, apiKey }) {
|
|
19
|
+
export function formatActorDevReady({ actorUrl, projectId, apiKey, entryFile = "src/actors.ts" }) {
|
|
20
20
|
const accent = chalk.hex("#04AB62");
|
|
21
21
|
const overrides = [actorUrl !== DEFAULT_ACTOR_URL ? `TERSE_ACTOR_URL=${actorUrl}` : undefined, apiKey ? `TERSE_API_KEY=${apiKey}` : undefined].filter(Boolean);
|
|
22
22
|
return [
|
|
@@ -25,7 +25,7 @@ export function formatActorDevReady({ actorUrl, projectId, apiKey }) {
|
|
|
25
25
|
"",
|
|
26
26
|
` ${accent.bold("Ready")} ${new URL(actorUrl).origin}`,
|
|
27
27
|
...(projectId !== "local" ? [` ${chalk.bold("Project")} ${projectId}`] : []),
|
|
28
|
-
` ${chalk.dim(
|
|
28
|
+
` ${chalk.dim(`Watching ${entryFile} · Ctrl+C to stop`)}`,
|
|
29
29
|
"",
|
|
30
30
|
...(overrides.length
|
|
31
31
|
? [` ${chalk.bold("Client overrides")} ${chalk.dim("· .env")}`, ` ${chalk.dim("Set these in the app that calls your actors.")}`, ...overrides.map(value => ` ${value}`), ""]
|
|
@@ -36,7 +36,7 @@ export function formatActorDevReady({ actorUrl, projectId, apiKey }) {
|
|
|
36
36
|
""
|
|
37
37
|
].join("\n");
|
|
38
38
|
}
|
|
39
|
-
// The
|
|
39
|
+
// The native runtime prints its own onboarding block without a quiet flag.
|
|
40
40
|
// Replace only that known block; keep diagnostics, source reloads, and actor logs.
|
|
41
41
|
export function createActorDevOutput(settings, writeLine) {
|
|
42
42
|
let inBanner = false;
|
|
@@ -65,6 +65,7 @@ export function createActorDevOutput(settings, writeLine) {
|
|
|
65
65
|
"Authentication is enabled. Set DURABLE_ACTORS_SECRET in your backend to the same value.",
|
|
66
66
|
"Update the secret after restarting this actor server.",
|
|
67
67
|
"2. Generate your client",
|
|
68
|
+
"durable-actors generate",
|
|
68
69
|
"durable-actors generate --remote"
|
|
69
70
|
].includes(plain))
|
|
70
71
|
return;
|
package/dist/actorDevUi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actorDevUi.js","sourceRoot":"","sources":["../src/actorDevUi.ts"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"actorDevUi.js","sourceRoot":"","sources":["../src/actorDevUi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/commands/actor.ts"],"names":[],"mappings":"AAaA,wBAAsB,QAAQ,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"actor.d.ts","sourceRoot":"","sources":["../../src/commands/actor.ts"],"names":[],"mappings":"AAaA,wBAAsB,QAAQ,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DjG"}
|
package/dist/commands/actor.js
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { chalkStderr } from "chalk";
|
|
2
2
|
import { spawn } from "node:child_process";
|
|
3
3
|
import { createInterface } from "node:readline";
|
|
4
|
-
import { fileURLToPath } from "node:url";
|
|
5
4
|
import { DEFAULT_ACTOR_DEV_PORT, DEFAULT_ACTOR_DEV_PROJECT_ID } from "terse-types/ActorEndpoint";
|
|
6
5
|
import { createActorDevOutput, formatActorDevLog } from "../actorDevUi.js";
|
|
7
6
|
import { assertProjectRoot } from "../assertProjectRoot.js";
|
|
8
7
|
import { CliError } from "../cliError.js";
|
|
9
8
|
import { ensureDotenvLoaded } from "../dotenv.js";
|
|
9
|
+
import { loadProjectActorTools, resolveProjectActorTools } from "../projectActorTools.js";
|
|
10
10
|
import { typeScriptProvider } from "../providers/typescript/TypeScriptProvider.js";
|
|
11
|
-
import { ACTOR_ENTRY_FILE } from "../providers/typescript/actorSources.js";
|
|
11
|
+
import { ACTOR_ENTRY_FILE, resolveActorEntryFile } from "../providers/typescript/actorSources.js";
|
|
12
12
|
export async function actorDev(options = {}) {
|
|
13
|
-
|
|
13
|
+
const entryFile = resolveActorEntryFile(process.cwd()) ?? ACTOR_ENTRY_FILE;
|
|
14
|
+
assertProjectRoot(typeScriptProvider, { requiredFiles: ["package.json", "tsconfig.json", entryFile], description: "Terse actor project root" });
|
|
14
15
|
ensureDotenvLoaded();
|
|
15
16
|
const projectId = options.projectId ?? ((process.env.TERSE_ACTOR_PROJECT_ID ?? process.env.DURABLE_ACTORS_PROJECT_ID)?.trim() || DEFAULT_ACTOR_DEV_PROJECT_ID);
|
|
16
17
|
const configuredPort = (process.env.TERSE_ACTOR_PORT ?? process.env.DURABLE_ACTORS_PORT)?.trim();
|
|
@@ -18,14 +19,18 @@ export async function actorDev(options = {}) {
|
|
|
18
19
|
if (!Number.isInteger(port) || port < 1 || port > 65535)
|
|
19
20
|
throw new CliError("invalid_port", "--port must be an integer between 1 and 65535.");
|
|
20
21
|
const apiKey = (process.env.TERSE_ACTOR_SECRET ?? process.env.DURABLE_ACTORS_SECRET)?.trim() || undefined;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const
|
|
22
|
+
const project = process.cwd();
|
|
23
|
+
await loadProjectActorTools(project);
|
|
24
|
+
const devOptions = { project, projectId, entrypoint: entryFile, port, storage: "local", watch: true, dataDir: process.env.DURABLE_ACTORS_DATA_DIR };
|
|
25
|
+
const script = `import { runActorDev } from ${JSON.stringify(resolveProjectActorTools(project))};
|
|
26
|
+
try { process.exitCode = await runActorDev({ ...${JSON.stringify(devOptions)}, apiKey: process.env.DURABLE_ACTORS_SECRET }); }
|
|
27
|
+
catch (error) { console.error(error instanceof Error ? error.message : String(error)); process.exitCode = 1; }`;
|
|
28
|
+
const runtime = spawn(process.execPath, ["--input-type=module", "--eval", script], {
|
|
24
29
|
env: {
|
|
25
30
|
...process.env,
|
|
26
31
|
DURABLE_ACTORS_PROJECT_ID: projectId,
|
|
27
32
|
DURABLE_ACTORS_PROJECT: process.cwd(),
|
|
28
|
-
DURABLE_ACTORS_ENTRYPOINT:
|
|
33
|
+
DURABLE_ACTORS_ENTRYPOINT: entryFile,
|
|
29
34
|
DURABLE_ACTORS_STORAGE: "local",
|
|
30
35
|
DURABLE_ACTORS_SECRET: apiKey,
|
|
31
36
|
DURABLE_ACTORS_PARENT_LIFETIME_STDIN: "1"
|
|
@@ -34,7 +39,7 @@ export async function actorDev(options = {}) {
|
|
|
34
39
|
});
|
|
35
40
|
const actorUrl = `http://127.0.0.1:${port}/v1/projects/${encodeURIComponent(projectId)}/actors`;
|
|
36
41
|
const output = createInterface({ input: runtime.stdout });
|
|
37
|
-
output.on("line", createActorDevOutput({ actorUrl, projectId, apiKey }, line => console.log(line)));
|
|
42
|
+
output.on("line", createActorDevOutput({ actorUrl, projectId, apiKey, entryFile }, line => console.log(line)));
|
|
38
43
|
const errors = createInterface({ input: runtime.stderr });
|
|
39
44
|
errors.on("line", line => console.error(formatActorDevLog(line, chalkStderr)));
|
|
40
45
|
let stopping = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/commands/actor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"actor.js","sourceRoot":"","sources":["../../src/commands/actor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AAEhG,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAA;AAEjG,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,UAAiD,EAAE;IAC9E,MAAM,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,gBAAgB,CAAA;IAC1E,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,aAAa,EAAE,CAAC,cAAc,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAC,CAAA;IAC/I,kBAAkB,EAAE,CAAA;IACpB,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,IAAI,4BAA4B,CAAC,CAAA;IAC9J,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,CAAA;IAChG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAA;IAC/F,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,KAAK;QAAE,MAAM,IAAI,QAAQ,CAAC,cAAc,EAAE,gDAAgD,CAAC,CAAA;IAC7I,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,IAAI,SAAS,CAAA;IACzG,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC7B,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,UAAU,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAA;IACnJ,MAAM,MAAM,GAAG,+BAA+B,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;kDACjD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;+GACmC,CAAA;IAC3G,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,qBAAqB,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;QAC/E,GAAG,EAAE;YACD,GAAG,OAAO,CAAC,GAAG;YACd,yBAAyB,EAAE,SAAS;YACpC,sBAAsB,EAAE,OAAO,CAAC,GAAG,EAAE;YACrC,yBAAyB,EAAE,SAAS;YACpC,sBAAsB,EAAE,OAAO;YAC/B,qBAAqB,EAAE,MAAM;YAC7B,oCAAoC,EAAE,GAAG;SAC5C;QACD,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,oBAAoB,IAAI,gBAAgB,kBAAkB,CAAC,SAAS,CAAC,SAAS,CAAA;IAC/F,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACzD,MAAM,CAAC,EAAE,CACL,MAAM,EACN,oBAAoB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAC9F,CAAA;IACD,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACzD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;IAC9E,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,MAAM,IAAI,GAAG,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,CAAA;QACf,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QACnB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC3B,CAAC,CAAA;IACD,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC5B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7B,IAAI,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YAC7B,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,QAAQ,IAAI,IAAI,KAAK,CAAC;oBAAE,OAAO,EAAE,CAAA;;oBAChC,MAAM,CAAC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,+BAA+B,MAAM,IAAI,IAAI,oCAAoC,CAAC,CAAC,CAAA;YACpI,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;YAAS,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC3B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QACnB,MAAM,CAAC,KAAK,EAAE,CAAA;QACd,MAAM,CAAC,KAAK,EAAE,CAAA;IAClB,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actorGenerate.d.ts","sourceRoot":"","sources":["../../src/commands/actorGenerate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"actorGenerate.d.ts","sourceRoot":"","sources":["../../src/commands/actorGenerate.ts"],"names":[],"mappings":"AAoBA,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuC9E"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { generateTypeScript } from "durable-actors/codegen";
|
|
2
1
|
import fs from "node:fs/promises";
|
|
3
2
|
import path from "node:path";
|
|
4
3
|
import { formatActorDiagnostic } from "terse-types/ActorDiagnostics";
|
|
@@ -8,6 +7,7 @@ import { z } from "zod";
|
|
|
8
7
|
import { CliError } from "../cliError.js";
|
|
9
8
|
import { BACKEND_URL } from "../config.js";
|
|
10
9
|
import { ensureDotenvLoaded } from "../dotenv.js";
|
|
10
|
+
import { loadProjectActorTools } from "../projectActorTools.js";
|
|
11
11
|
import { getStoredApiKey } from "../userConfig.js";
|
|
12
12
|
const publicationSchema = z.object({
|
|
13
13
|
codeRevision: z.string().min(1).optional(),
|
|
@@ -16,6 +16,7 @@ const publicationSchema = z.object({
|
|
|
16
16
|
});
|
|
17
17
|
export async function actorGenerate(options) {
|
|
18
18
|
ensureDotenvLoaded();
|
|
19
|
+
const { generateClientArtifacts } = await loadProjectActorTools(process.cwd());
|
|
19
20
|
const actorUrl = process.env.TERSE_ACTOR_URL?.trim() || DEFAULT_ACTOR_URL;
|
|
20
21
|
let endpoint;
|
|
21
22
|
try {
|
|
@@ -30,28 +31,35 @@ export async function actorGenerate(options) {
|
|
|
30
31
|
let files;
|
|
31
32
|
try {
|
|
32
33
|
// The upstream generator validates the complete public contract before emitting code.
|
|
33
|
-
files = await
|
|
34
|
+
files = await generateClientArtifacts(publication.contract);
|
|
34
35
|
}
|
|
35
36
|
catch (error) {
|
|
36
37
|
throw new CliError("actor_generation_failed", formatActorDiagnostic(error instanceof Error ? error.message : String(error)));
|
|
37
38
|
}
|
|
38
39
|
const directory = path.resolve(options.outDir);
|
|
39
40
|
for (const [fileName, code] of files) {
|
|
41
|
+
if (fileName.startsWith("runtime/"))
|
|
42
|
+
continue;
|
|
40
43
|
const destination = path.resolve(directory, fileName);
|
|
41
44
|
const relative = path.relative(directory, destination);
|
|
42
45
|
if (relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative) || relative === "..") {
|
|
43
46
|
throw new CliError("actor_generation_failed", "Generated actor file is outside the output directory.");
|
|
44
47
|
}
|
|
45
48
|
await fs.mkdir(path.dirname(destination), { recursive: true });
|
|
46
|
-
await fs.writeFile(destination, withTerseActorImports(code));
|
|
49
|
+
await fs.writeFile(destination, fileName === "index.js" || fileName === "index.d.ts" ? withTerseActorImports(code) : code);
|
|
47
50
|
}
|
|
51
|
+
// Old generated TypeScript shadows the new JavaScript/declaration entry points.
|
|
52
|
+
const previousEntry = path.join(directory, "index.ts");
|
|
53
|
+
const previousSource = await fs.readFile(previousEntry, "utf8").catch(() => "");
|
|
54
|
+
if (previousSource.startsWith("// Generated by terse actor generate"))
|
|
55
|
+
await fs.rm(previousEntry);
|
|
48
56
|
const source = publication.codeRevision ? `revision ${publication.codeRevision}` : `contract ${publication.contractHash}`;
|
|
49
57
|
console.log(`Generated actor client in ${path.relative(process.cwd(), directory) || "."} from ${source}.`);
|
|
50
58
|
}
|
|
51
59
|
function withTerseActorImports(code) {
|
|
52
60
|
const source = ts.createSourceFile("index.ts", code, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
|
|
53
61
|
const edits = [];
|
|
54
|
-
const modules = new Set(["durable-actors/generated", "durable-actors/proxy", "durable-actors/backend"]);
|
|
62
|
+
const modules = new Set(["durable-actors/generated", "durable-actors/proxy", "durable-actors/backend", "./runtime/index.js"]);
|
|
55
63
|
const names = new Set();
|
|
56
64
|
const collectNames = (node) => {
|
|
57
65
|
if (ts.isIdentifier(node) && !(ts.isImportTypeNode(node.parent) && node.parent.qualifier === node))
|
|
@@ -60,12 +68,17 @@ function withTerseActorImports(code) {
|
|
|
60
68
|
};
|
|
61
69
|
collectNames(source);
|
|
62
70
|
const typeImports = new Map();
|
|
63
|
-
const isProxyParameter = (node) =>
|
|
71
|
+
const isProxyParameter = (node) => (ts.isIdentifier(node.name) && ["options", "dependencies"].includes(node.name.text)) ||
|
|
72
|
+
(!!node.type && ts.isImportTypeNode(node.type) && !!node.type.qualifier && ["SocketProxyOptions", "SocketProxyDependencies"].includes(node.type.qualifier.getText(source)));
|
|
64
73
|
const removeTrailingItems = (items, first) => {
|
|
65
74
|
edits.push({ start: first === 0 ? items[0].getStart(source) : items[first - 1].getEnd(), end: items.at(-1).getEnd(), text: "" });
|
|
66
75
|
};
|
|
67
76
|
const visit = (node) => {
|
|
68
|
-
if (ts.
|
|
77
|
+
if (ts.isExportDeclaration(node) && node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier) && modules.has(node.moduleSpecifier.text)) {
|
|
78
|
+
edits.push({ start: node.getStart(source), end: node.getEnd(), text: "" });
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
if (ts.isConstructorDeclaration(node) || ts.isMethodDeclaration(node) || ts.isMethodSignature(node)) {
|
|
69
82
|
const first = node.parameters.findIndex(isProxyParameter);
|
|
70
83
|
if (first !== -1)
|
|
71
84
|
removeTrailingItems(node.parameters, first);
|
|
@@ -77,7 +90,10 @@ function withTerseActorImports(code) {
|
|
|
77
90
|
if (first !== -1)
|
|
78
91
|
removeTrailingItems(node.arguments, first);
|
|
79
92
|
}
|
|
80
|
-
if (ts.isTypeReferenceNode(node) &&
|
|
93
|
+
if (ts.isTypeReferenceNode(node) &&
|
|
94
|
+
node.typeName.getText(source) === "Omit" &&
|
|
95
|
+
(ts.isMethodDeclaration(node.parent.parent) || ts.isMethodSignature(node.parent.parent)) &&
|
|
96
|
+
node.parent.parent.name.getText(source) === "prepareWebsocket") {
|
|
81
97
|
const authorization = node.typeArguments?.[0]?.getText(source);
|
|
82
98
|
if (authorization?.endsWith(".Authorization")) {
|
|
83
99
|
const metadata = authorization.replace(/\.Authorization$/, ".Metadata");
|
|
@@ -116,6 +132,7 @@ function withTerseActorImports(code) {
|
|
|
116
132
|
code = `${code.slice(0, start)}${text}${code.slice(end)}`;
|
|
117
133
|
}
|
|
118
134
|
return code
|
|
135
|
+
.replace(/^[\t ]+$/gm, "")
|
|
119
136
|
.replace("Generated by durable-actors", "Generated by terse actor generate")
|
|
120
137
|
.replace("/**\n", "/**\n * Add `terse-sdk` to your package.json dependencies: `npm install terse-sdk`.\n *\n");
|
|
121
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actorGenerate.js","sourceRoot":"","sources":["../../src/commands/actorGenerate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actorGenerate.js","sourceRoot":"","sources":["../../src/commands/actorGenerate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AA0O1D,wBAAsB,eAAe,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AA0O1D,wBAAsB,eAAe,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,CA2C/H;AAED,wBAAgB,MAAM,IAAI,OAAO,CAEhC;AAmBD,wBAAsB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAK1F"}
|
package/dist/commands/auth.js
CHANGED
|
@@ -252,6 +252,8 @@ export async function loginAndPersist(opts) {
|
|
|
252
252
|
return null;
|
|
253
253
|
}
|
|
254
254
|
setActiveOrgToken(result.organizationId, result.apiKey, result.organizationName);
|
|
255
|
+
// readApiKey prefers the environment, which may still contain the rejected key.
|
|
256
|
+
process.env.TERSE_API_KEY = result.apiKey;
|
|
255
257
|
log.info(chalk.dim(`Saved credentials to ${getAuthFilePath()}`));
|
|
256
258
|
return { apiKey: result.apiKey, displayName: result.displayName };
|
|
257
259
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAI1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AAOxE,wBAAsB,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,gBAAuE,EAAE,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqG5K"}
|
package/dist/commands/init.js
CHANGED
|
@@ -2,21 +2,18 @@ import { intro, log, outro } from "@clack/prompts";
|
|
|
2
2
|
import chalk from "chalk";
|
|
3
3
|
import fs from "node:fs";
|
|
4
4
|
import path from "node:path";
|
|
5
|
-
import { CliError
|
|
6
|
-
import { isNonInteractive } from "../cliHelpers.js";
|
|
5
|
+
import { CliError } from "../cliError.js";
|
|
7
6
|
import { createSpinner } from "../cliUi.js";
|
|
7
|
+
import { actorScaffoldFiles } from "../productFeatures.js";
|
|
8
8
|
import { PROJECT_CONFIG_FILENAME, createRemoteProject, writeProjectConfig } from "../projectConfig.js";
|
|
9
9
|
import { fetchSdkVersion } from "../providers/fetchSdkVersion.js";
|
|
10
10
|
import { resolveProvider } from "../providers/resolveProvider.js";
|
|
11
11
|
import { renderTemplate } from "../providers/templateUtils.js";
|
|
12
12
|
import { loginAndPersist } from "./auth.js";
|
|
13
|
-
import { generate } from "./generate.js";
|
|
14
|
-
import { listAndPromptIntegrations } from "./integrate.js";
|
|
15
13
|
export async function init(projectName, provider = resolveProvider({ command: "init", language: "ts" }), opts) {
|
|
16
|
-
const nonInteractive = isNonInteractive(opts);
|
|
17
14
|
if (!projectName && fs.existsSync(path.join(process.cwd(), "package.json"))) {
|
|
18
15
|
throw new CliError("init_in_existing_project", "Detected an existing npm project in this directory.", {
|
|
19
|
-
detail: `terse init is for scaffolding new projects only.
|
|
16
|
+
detail: `terse init is for scaffolding new projects only. Run "terse init <project-name>" to create a separate project directory.`
|
|
20
17
|
});
|
|
21
18
|
}
|
|
22
19
|
intro("terse init");
|
|
@@ -39,7 +36,7 @@ export async function init(projectName, provider = resolveProvider({ command: "i
|
|
|
39
36
|
}
|
|
40
37
|
fs.mkdirSync(path.join(targetDir, "src"), { recursive: true });
|
|
41
38
|
const templateContext = provider.buildInitTemplateContext(resolvedName, sdkVersion);
|
|
42
|
-
const scaffoldFiles = provider.scaffoldFiles();
|
|
39
|
+
const scaffoldFiles = actorScaffoldFiles(provider.scaffoldFiles());
|
|
43
40
|
for (const file of scaffoldFiles) {
|
|
44
41
|
const rendered = renderTemplate(file.template, templateContext);
|
|
45
42
|
const outputPath = path.join(targetDir, file.output);
|
|
@@ -69,30 +66,28 @@ export async function init(projectName, provider = resolveProvider({ command: "i
|
|
|
69
66
|
log.warn(`You'll need to create a ${PROJECT_CONFIG_FILENAME} manually before running terse deploy.`);
|
|
70
67
|
}
|
|
71
68
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
});
|
|
95
|
-
console.log("");
|
|
69
|
+
const accent = chalk.hex("#04AB62");
|
|
70
|
+
outro(accent.bold("Your actors start here."));
|
|
71
|
+
console.log([
|
|
72
|
+
"",
|
|
73
|
+
` ${chalk.bold("Make it yours")}`,
|
|
74
|
+
` Edit ${chalk.cyan("src/actor.ts")} to define your actors.`,
|
|
75
|
+
"",
|
|
76
|
+
` ${chalk.bold("Run locally")}`,
|
|
77
|
+
...(projectName ? [` ${accent(`cd ${projectName}`)}`] : []),
|
|
78
|
+
` ${accent("terse actor dev")}`,
|
|
79
|
+
"",
|
|
80
|
+
` ${chalk.bold("Connect your app")}`,
|
|
81
|
+
" Keep the actor server running. In another terminal,",
|
|
82
|
+
" open your application project, then run:",
|
|
83
|
+
` ${accent("terse actor generate")}`,
|
|
84
|
+
"",
|
|
85
|
+
` ${chalk.bold("Deploy when you're ready")}`,
|
|
86
|
+
" From this actor project:",
|
|
87
|
+
...(!isAuthenticated ? [` ${chalk.dim("Sign in first:")}`, ` ${accent("terse auth login")}`] : []),
|
|
88
|
+
` ${accent("terse deploy")}`,
|
|
89
|
+
""
|
|
90
|
+
].join("\n"));
|
|
96
91
|
}
|
|
97
92
|
catch (err) {
|
|
98
93
|
if (createdTargetDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAoB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAoB,MAAM,kBAAkB,CAAA;AAMvE,wBAAsB,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CActE;AAED,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAI5C"}
|
package/dist/commands/install.js
CHANGED
|
@@ -9,36 +9,25 @@ import { readApiKey } from "../api.js";
|
|
|
9
9
|
import { CliError } from "../cliError.js";
|
|
10
10
|
import { isNonInteractive } from "../cliHelpers.js";
|
|
11
11
|
import { loginAndPersist } from "./auth.js";
|
|
12
|
-
const REPO_SLUG = "TerseAI/Terse";
|
|
13
|
-
const MARKETPLACE_URL = `https://raw.githubusercontent.com/${REPO_SLUG}/main/.claude-plugin/marketplace.json`;
|
|
14
12
|
const CLAUDE_PERMISSION_RULE = "Bash(terse:*)";
|
|
15
13
|
export async function install(opts) {
|
|
16
14
|
intro("terse install");
|
|
17
15
|
await ensureGlobalCli(opts);
|
|
18
|
-
const bundle = await fetchSkillBundle();
|
|
19
|
-
await installSkillBundle(bundle);
|
|
20
|
-
await offerClaudePermissions(opts);
|
|
21
16
|
await ensureAuth(opts);
|
|
17
|
+
await offerClaudePermissions(opts);
|
|
22
18
|
const installationMessage = [
|
|
23
19
|
chalk.green("Terse installation is complete."),
|
|
24
20
|
"",
|
|
25
|
-
|
|
26
|
-
""
|
|
27
|
-
|
|
28
|
-
`2. Run this slash command: ${chalk.green("/terse-create <describe your workflow>")}`,
|
|
29
|
-
"",
|
|
30
|
-
chalk.bold("OR"),
|
|
31
|
-
"",
|
|
32
|
-
`Create a project from the CLI: ${chalk.green("terse init <projectName>")}`
|
|
21
|
+
`Create your first actor project: ${chalk.green("terse init <projectName>")}`,
|
|
22
|
+
`Run actors locally: ${chalk.green("terse actor dev")}`,
|
|
23
|
+
`Deploy your actors: ${chalk.green("terse deploy")}`
|
|
33
24
|
].join("\n");
|
|
34
25
|
outro(installationMessage);
|
|
35
26
|
}
|
|
36
27
|
export async function update() {
|
|
37
28
|
intro("terse update");
|
|
38
29
|
await updateGlobalCli();
|
|
39
|
-
|
|
40
|
-
await updateSkillBundle(bundle);
|
|
41
|
-
outro("Terse CLI and skills are up to date.");
|
|
30
|
+
outro("Terse CLI is up to date.");
|
|
42
31
|
}
|
|
43
32
|
async function ensureGlobalCli(opts) {
|
|
44
33
|
if (!isNonInteractive(opts)) {
|
|
@@ -56,49 +45,6 @@ async function updateGlobalCli() {
|
|
|
56
45
|
log.step("Updating the Terse CLI");
|
|
57
46
|
await runStreaming("npm", ["install", "-g", "terse-cli@latest"]);
|
|
58
47
|
}
|
|
59
|
-
// The official skill set is whatever the plugin marketplace manifest on main
|
|
60
|
-
// declares — the CLI ships no copy of its own, so skill releases and renames
|
|
61
|
-
// propagate to stale CLIs without a CLI release.
|
|
62
|
-
async function fetchSkillBundle() {
|
|
63
|
-
const raw = await fetchJson(MARKETPLACE_URL);
|
|
64
|
-
if (raw === null) {
|
|
65
|
-
throw new CliError("marketplace_unreachable", `Could not fetch the Terse skill list from ${MARKETPLACE_URL}.`, {
|
|
66
|
-
detail: "Check your network connection and try again."
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
const parsed = marketplaceSchema.safeParse(raw);
|
|
70
|
-
if (!parsed.success) {
|
|
71
|
-
throw new CliError("marketplace_malformed", "The published Terse plugin manifest is malformed. Please report this at https://github.com/TerseAI/Terse/issues.");
|
|
72
|
-
}
|
|
73
|
-
const skills = parsed.data.plugins.flatMap(plugin => plugin.skills ?? []).map(skillPath => path.posix.basename(skillPath));
|
|
74
|
-
if (skills.length === 0) {
|
|
75
|
-
throw new CliError("no_skills_published", "The published Terse plugin manifest lists no skills. Please report this at https://github.com/TerseAI/Terse/issues.");
|
|
76
|
-
}
|
|
77
|
-
return { version: parsed.data.metadata?.version ?? "unknown", skills };
|
|
78
|
-
}
|
|
79
|
-
async function fetchJson(url) {
|
|
80
|
-
try {
|
|
81
|
-
const response = await fetch(url, { signal: AbortSignal.timeout(10_000) });
|
|
82
|
-
if (!response.ok)
|
|
83
|
-
return null;
|
|
84
|
-
return await response.json();
|
|
85
|
-
}
|
|
86
|
-
catch {
|
|
87
|
-
return null;
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
async function installSkillBundle(bundle) {
|
|
91
|
-
log.step(`Installing Terse skills into your coding agents: ${bundle.skills.join(", ")}`);
|
|
92
|
-
const skillFlags = bundle.skills.flatMap(skill => ["--skill", skill]);
|
|
93
|
-
const command = ["npx", "-y", "skills@latest", "add", REPO_SLUG, "-y", "-g", ...skillFlags];
|
|
94
|
-
await runStreaming(command[0], command.slice(1));
|
|
95
|
-
}
|
|
96
|
-
async function updateSkillBundle(bundle) {
|
|
97
|
-
log.step(`Updating Terse skills in your coding agents: ${bundle.skills.join(", ")}`);
|
|
98
|
-
const skillFlags = bundle.skills.flatMap(skill => ["--skill", skill]);
|
|
99
|
-
const command = ["npx", "-y", "skills@latest", "update", REPO_SLUG, "-y", "-g", ...skillFlags];
|
|
100
|
-
await runStreaming(command[0], command.slice(1));
|
|
101
|
-
}
|
|
102
48
|
async function offerClaudePermissions(opts) {
|
|
103
49
|
const claudeDir = path.join(os.homedir(), ".claude");
|
|
104
50
|
if (!fs.existsSync(claudeDir))
|
|
@@ -177,10 +123,6 @@ function runStreaming(command, args) {
|
|
|
177
123
|
});
|
|
178
124
|
}
|
|
179
125
|
// Types
|
|
180
|
-
const marketplaceSchema = z.looseObject({
|
|
181
|
-
metadata: z.looseObject({ version: z.string().optional() }).optional(),
|
|
182
|
-
plugins: z.array(z.looseObject({ skills: z.array(z.string()).optional() }))
|
|
183
|
-
});
|
|
184
126
|
const claudeSettingsSchema = z.looseObject({
|
|
185
127
|
permissions: z.looseObject({ allow: z.array(z.string()).optional() }).optional()
|
|
186
128
|
});
|