@fastagent-sh/fastagent 0.29.0 → 0.30.1

package/dist/cli/commands/add.js

@@ -1,318 +1,60 @@
 /**
  * `fastagent add <channel>|skill` — scaffold channel glue (`src/channels/<kind>.ts`) or vendor an Agent Skills skill.
- * slack/feishu/lark additionally CREATE OR RESUME the platform app.
+ * A channel changes the program only (channel-setup.md §2): its platform app, and the values of the instance that runs
+ * it, are `channels setup`'s.
  */
-import { randomBytes } from "node:crypto";
 import { join, relative, resolve } from "node:path";
-import { assertIndependentFeishuApps, onboardFeishuCloudApp } from "../add-feishu.js";
-import { terminalPerson } from "../person.js";
-import { isInteractive, shellArg } from "../shared.js";
-import { checkTicket, printReport, refusedCheck, runTicket, startTicket, ticketExitCode, ticketReport, } from "../ticket.js";
-import { cloudFor } from "../../channels/feishu/cloud.js";
-import { feishuIngressFor } from "../../channels/feishu/setup-mode.js";
-import { markDevServe, unmarkDevServe } from "../../serving-command.js";
-import { channelIngress } from "../../channels/discover.js";
-import { buildDefinitionShape, prepareDefinition } from "../../harnesses/pi-durable/open.js";
+import { shellArg } from "../shared.js";
 import { enterAgentEnv } from "../../env.js";
-import { dotEnvPath, loadEnvValues } from "../../value-file.js";
-import { selectAgentEnvironment, resolveStateRoot, SECRETS_DIRNAME, isUnderDir, displayPath } from "../../paths.js";
+import { SECRETS_DIRNAME, displayPath } from "../../paths.js";
 import { detectRuntime, readPackageJson } from "../../runtime.js";
-import { appendChannelDotEnv, appendChannelEnv, assertChannelReady, channelExists, channelSetup, scaffoldChannel, scaffoldCompanionTools, } from "../../scaffold/add-channel.js";
+import { appendChannelEnv, assertChannelReady, channelExists, channelSetup, scaffoldChannel, scaffoldCompanionTools, } from "../../scaffold/add-channel.js";
 import { vendorSkill } from "../../scaffold/vendor-skill.js";
-import { failStartup, failUsage, agentDirOrExit } from "../fail.js";
-import { unprotectedSecretsNote } from "../../value-file.js";
-/** Without a terminal, how long an app's setup stays open for the person to finish their part. */
-const UNATTENDED_TIMEOUT_SECONDS = 900;
-/** `fastagent add <kind> [dir]`: scaffold `src/channels/<kind>.ts`, the adapter configured with a starter policy. */
-export async function runAddChannel(channelKind, dirArg, opts) {
-    if (opts.check !== undefined)
-        return checkSetup(channelKind, opts.check, opts);
-    if (opts.ticket !== undefined) {
-        // The process `startTicket` started: it takes the ticket before anything slow (the definition is built to plan),
-        // then does the whole `add`, its person the ticket's.
-        await runTicket(opts.ticket, async (step) => ({
-            ...(await addChannel(channelKind, await planAdd(channelKind, dirArg, opts), opts, step.person)),
-        }));
-        process.exit(0);
-    }
-    const plan = await planAdd(channelKind, dirArg, opts);
-    const unattended = opts.input === false || opts.json === true || !isInteractive();
-    if (unattended && opts.onboard !== false && channelKind !== "telegram") {
-        return setUpUnattended(channelKind, opts, plan);
-    }
-    const added = await addChannel(channelKind, plan, opts, terminalPerson).catch(failStartup);
-    if (opts.json)
-        console.log(JSON.stringify({ status: "done", ...added }, null, 2));
-    // App-creation flows leave platform/tunnel sockets behind that would otherwise hold the one-shot scaffold command
-    // open after all durable boundaries have completed.
-    process.exit(0);
-}
-/** What `add` settles before it changes anything, refusing what it can while nothing has changed. */
-async function planAdd(channelKind, dirArg, opts) {
-    // The channel (glue + companion tools + secrets) is agent surface: everything lands in the AGENT DIR.
-    if (opts.replaceConfig && opts.onboard === false) {
-        failUsage("--replace-config replaces onboarding credentials; it cannot be combined with --no-onboard");
-    }
+import { agentDirOrExit, failStartup, failUsage } from "../fail.js";
+/**
+ * `add <channel>`: the program only (channel-setup.md §2). It writes the channel file and its tools and names the
+ * values they read in `.secrets/.env.example`; it asks nothing and creates no app. The app, and the values of the
+ * instance that runs it, are `channels setup`'s.
+ */
+export async function runAddChannel(kind, dirArg, opts) {
     const target = agentDirOrExit(resolve(dirArg));
-    const environment = opts.environment ?? "dev";
-    if (environment !== "dev" && environment !== "production") {
-        failUsage(`--env must be "dev" or "production", got "${environment}"`);
-    }
-    selectAgentEnvironment(environment);
-    if (environment === "production")
-        unmarkDevServe();
-    else
-        markDevServe();
-    enterAgentEnv(target);
-    if (environment === "production" && (channelKind === "feishu" || channelKind === "lark")) {
-        try {
-            assertIndependentFeishuApps(target, [channelKind], loadEnvValues(dotEnvPath(target)));
-        }
-        catch (error) {
-            failStartup(error);
-        }
-    }
-    // Paths are printed to someone standing in their CWD, which may be elsewhere, while every file belongs to the AGENT
-    // dir — prefix them, or they point at nothing.
     const agentFromCwd = displayPath(process.cwd(), target);
     const inAgent = (p) => (agentFromCwd === undefined ? p : join(agentFromCwd, p));
-    // An existing channel file is authored glue: kept, never rewritten.
-    const file = join(target, "src", "channels", `${channelKind}.ts`);
-    const existsAlready = await channelExists(target, channelKind).catch(failStartup);
-    const ingress = resolveIngress(channelKind, opts.ingress);
-    if (existsAlready &&
-        (ingress.setting || (environment === "production" && opts.onboard !== false)) &&
-        (channelKind === "feishu" || channelKind === "lark")) {
-        await assertChannelReadsSetting(target, channelKind, ingress.setting ?? { [`${cloudFor(channelKind).envPrefix}_INGRESS`]: ingress.ingress }, inAgent(relative(target, file)));
-    }
-    return {
-        target,
-        environment,
-        inAgent,
-        agentFromCwd,
-        file,
-        existsAlready,
-        ...ingress,
-        rerun: `fastagent add ${channelKind}${agentFromCwd === undefined ? "" : ` ${shellArg(agentFromCwd)}`}` +
-            `${environment === "production" ? " --env production" : ""}${opts.ingress ? ` --ingress ${opts.ingress}` : ""}` +
-            `${opts.replaceConfig ? " --replace-config" : ""}`,
-    };
-}
-/**
- * Everything `add <kind>` does once the person's part can be done: the channel, its tools and variables, the app's
- * onboarding through `person`, and the next steps, printed and returned with the variables it wrote.
- */
-async function addChannel(channelKind, plan, opts, person) {
-    const { target, environment, inAgent, agentFromCwd, file, existsAlready, ingress, pinned, setting, rerun } = plan;
-    const envPath = dotEnvPath(target);
-    const envLabel = isUnderDir(envPath, target) ? inAgent(relative(target, envPath)) : envPath;
-    const before = loadEnvValues(envPath);
-    if (existsAlready) {
-        console.error(`[fastagent] ${inAgent(relative(target, file))} already exists — keeping it`);
-    }
-    else {
-        await assertChannelReady(target);
-        await scaffoldChannel(target, channelKind);
-        console.error(`[fastagent] created ${inAgent(relative(target, file))}`);
-    }
-    // Companion tools are the package's, not authored glue.
-    for (const tool of await scaffoldCompanionTools(target, channelKind)) {
-        console.error(`[fastagent] wrote ${inAgent(relative(target, tool))}`);
-    }
-    if (await appendChannelEnv(target, channelKind)) {
-        console.error(`[fastagent] added ${channelKind} env vars to ${inAgent(join(SECRETS_DIRNAME, ".env.example"))}`);
-    }
-    // Stateful app onboarding is re-runnable after the scaffold boundary.
-    let created;
-    if (channelKind === "slack" && opts.onboard !== false) {
-        const { onboardSlackInternalApp } = await import("../add-slack.js");
-        created = await onboardSlackInternalApp({
-            target,
-            stateRoot: resolveStateRoot(target),
-            replaceConfig: opts.replaceConfig,
-            ...(person === terminalPerson ? {} : { person }),
-        }).then(() => undefined);
-    }
-    else if ((channelKind === "feishu" || channelKind === "lark") && opts.onboard !== false) {
-        created = await onboardFeishuCloudApp(target, channelKind, ingress, rerun, person);
-    }
-    const setup = channelSetup(channelKind, ingress, pinned);
-    const env = setup.env;
-    const steps = channelKind === "slack" && opts.onboard !== false
-        ? [
-            // No line about the Request URL: the `dev --tunnel` line below is the whole instruction, and FastAgent sets
-            // that URL itself when the agent first runs.
-            "invite the app to each channel it should read",
-            // The tool lines are the scaffold's (one list), whichever path set the app up.
-            ...setup.steps.filter((step) => step.includes("{tools}/")),
-        ]
-        : setup.steps;
-    const generated = Object.fromEntries(env.filter((e) => e.generate).map((e) => [e.name, randomBytes(24).toString("hex")]));
-    // Kind-neutral: every channel's generated secrets get the same treatment.
-    const dotEnv = await appendChannelDotEnv(target, channelKind, { ...generated, ...created, ...setting }, [...Object.keys(created ?? {}), ...Object.keys(setting ?? {})], ingress);
-    if (dotEnv.unprotectedSecretsDir) {
-        console.error(`[fastagent] note: ${unprotectedSecretsNote(dotEnv.unprotectedSecretsDir)}`);
-    }
-    if (dotEnv.written.length > 0) {
-        console.error(`[fastagent] wrote ${dotEnv.written.join(", ")} to ${envLabel}`);
-    }
+    const file = join(target, "src", "channels", `${kind}.ts`);
+    const created = [];
+    await (async () => {
+        if (await channelExists(target, kind)) {
+            console.error(`[fastagent] ${inAgent(relative(target, file))} already exists — keeping it`);
+        }
+        else {
+            await assertChannelReady(target);
+            await scaffoldChannel(target, kind);
+            created.push(inAgent(relative(target, file)));
+            console.error(`[fastagent] created ${inAgent(relative(target, file))}`);
+        }
+        // Companion tools are the package's, not authored glue.
+        for (const tool of await scaffoldCompanionTools(target, kind)) {
+            created.push(inAgent(relative(target, tool)));
+            console.error(`[fastagent] wrote ${inAgent(relative(target, tool))}`);
+        }
+        if (await appendChannelEnv(target, kind)) {
+            console.error(`[fastagent] added ${kind} env vars to ${inAgent(join(SECRETS_DIRNAME, ".env.example"))}`);
+        }
+    })().catch(failStartup);
     const install = detectRuntime(target, await readPackageJson(target)).runtime === "bun" ? "bun install" : "npm install";
-    const next = [];
-    /** One next step: printed, and returned for a caller that reads them as data. */
-    const step = (line) => {
-        next.push(line.trim());
+    const next = [
+        `${agentFromCwd === undefined ? install : `(cd ${agentFromCwd} && ${install})`}   # if @fastagent-sh/fastagent is not installed yet`,
+        `fastagent channels setup ${kind}${agentFromCwd === undefined ? "" : ` ${shellArg(agentFromCwd)}`}   # creates the app and asks for its credentials`,
+        `edit ${inAgent(relative(target, file))} — customise routing with route() (optional; the defaults already work)`,
+        ...channelSetup(kind).steps.map((line) => line.replace("{tools}", inAgent(join("src", "tools")))),
+        "fastagent dev",
+    ];
+    console.error("  next steps:");
+    for (const line of next)
         console.error(`    ${line}`);
-    };
-    console.error(`  next steps:`);
-    step(`${agentFromCwd === undefined ? install : `(cd ${agentFromCwd} && ${install})`}                      # if @fastagent-sh/fastagent is not installed yet`);
-    // Onboarding writes some itself (an app's ID and secret, a bot token) before the write above: what this `add` wrote is
-    // what the file holds now and did not before.
-    const now = loadEnvValues(envPath);
-    const written = [...now.keys()].filter((name) => now.get(name) && now.get(name) !== before.get(name));
-    for (const e of env) {
-        if (!written.includes(e.name) && dotEnv.alreadySet.includes(e.name))
-            continue; // the user's already: nothing to do
-        if (written.includes(e.name)) {
-            // Written, but its hint may still carry an action — keep the variable visible instead of silently absorbing it.
-            step(`${e.name} — ${e.generate ? "generated and " : ""}written to ${envLabel}   # ${e.hint}`);
-            continue;
-        }
-        const value = e.generate ? `=${generated[e.name]}` : "";
-        const action = e.required ? "set" : "optionally set";
-        step(`${action} ${e.name}${value} in ${envLabel}   # ${e.hint}`);
-    }
-    const serveCommand = environment === "production" ? "fastagent start" : "fastagent dev";
-    for (const s of steps) {
-        step(s
-            .replace("{channel}", inAgent(relative(target, file)))
-            .replace("{tools}", inAgent(join("src", "tools")))
-            .replaceAll("{serve}", serveCommand));
-    }
-    if (environment === "production") {
-        step(`fastagent deploy <host> --run   # deploy with the production app and credentials`);
-    }
-    else if (ingress === "websocket") {
-        step(`fastagent dev            # no public URL or tunnel required`);
-    }
-    else if (channelKind === "slack") {
-        step(`fastagent dev --tunnel   # ${opts.onboard === false ? "serve locally + print the URL to paste into the Slack app's Event Subscriptions" : "start the agent — then message it in Slack"}`);
-    }
-    else if (channelKind !== "lark") {
-        step(`fastagent dev --tunnel   # serve locally + a public URL, auto-registering the webhook`);
-    }
-    return { written, next_steps: next };
-}
-/** The command that reads an app's setup ticket, as every such ticket records it. */
-const setupCheck = (kind) => `fastagent add ${kind} --check`;
-/** What the person does for each kind's app, to follow "so they can". */
-const SETUP_ACTIONS = {
-    slack: "set up the Slack app: paste a configuration token on the page, then click Allow in Slack",
-    feishu: "confirm the new Feishu app",
-    lark: "finish setting up the Lark app",
-};
-/**
- * `add slack|feishu|lark` with no one at a terminal to ask, for a coding agent: the app's setup runs in a process of its
- * own (ticket.ts), and the command returns once the person has a step to take, it is done, or it is still working at it.
- * What only the person has (Slack's tokens, Lark's App ID and Secret) is pasted on a page of the setup's own, never asked
- * for in the agent's conversation and never typed into a file.
- */
-async function setUpUnattended(kind, opts, at) {
-    const { target } = at;
-    const timeout = opts.timeout === undefined ? UNATTENDED_TIMEOUT_SECONDS : Number(opts.timeout);
-    if (!Number.isInteger(timeout) || timeout <= 0)
-        failUsage(`--timeout must be a whole number of seconds`);
-    const ticket = await startTicket({
-        // One setup per agent, channel and environment: another agent's is its own business.
-        subject: `add:${kind}:${at.environment}:${target}`,
-        action: SETUP_ACTIONS[kind],
-        check: setupCheck(kind),
-        restart: at.rerun,
-        timeoutSeconds: timeout,
-        waitsFirst: false,
-        whenRunning: "replace",
-        command: {
-            file: process.execPath,
-            args: [
-                ...process.execArgv,
-                process.argv[1],
-                "add",
-                kind,
-                target,
-                ...(at.environment === "production" ? ["--env", "production"] : []),
-                ...(opts.ingress === undefined ? [] : ["--ingress", opts.ingress]),
-                ...(opts.replaceConfig ? ["--replace-config"] : []),
-            ],
-            cwd: process.cwd(),
-        },
-    });
-    reportSetup(ticket, opts, "started");
-    process.exit(ticketExitCode(ticket));
-}
-/** `add <kind> --check <ticket>`. */
-async function checkSetup(kind, id, opts) {
-    const refused = refusedCheck(id, setupCheck(kind));
-    if (refused !== undefined)
-        failUsage(refused);
-    // There: refusedCheck read it, and a ticket is pruned only a day after it ends.
-    const ticket = (await checkTicket(id));
-    reportSetup(ticket, opts, "checked");
-    process.exit(ticketExitCode(ticket));
-}
-/** An app's setup ticket for whoever started or checked it: the shared report, and what a finished setup adds. */
-function reportSetup(ticket, opts, when) {
-    const { json, text } = ticketReport(ticket, when, (result) => {
-        const written = result.written ?? [];
-        const next = result.next_steps ?? [];
-        return {
-            fields: { written, next_steps: next },
-            text: [...(written.length > 0 ? [`wrote ${written.join(", ")}`] : []), ...next.map((line) => `next: ${line}`)],
-            next: `The app is set up. Its next steps are in next_steps.`,
-        };
-    });
-    printReport(opts.json, json, text);
-}
-/**
- * What `add` sets the app up for, and whether it writes the choice down. `--ingress` is the `<PREFIX>_INGRESS`
- * setting in the selected environment. The channel rule supplies its default: WebSocket in dev, webhook in production.
- */
-function resolveIngress(kind, raw) {
-    if (raw !== undefined && raw !== "webhook" && raw !== "websocket") {
-        failUsage(`--ingress must be "webhook" or "websocket", got "${raw}"`);
-    }
-    if (kind !== "feishu" && kind !== "lark")
-        return { ingress: "webhook", pinned: false };
-    const name = `${cloudFor(kind).envPrefix}_INGRESS`;
-    if (raw !== undefined)
-        return { ingress: raw, pinned: true, setting: { [name]: raw } };
-    try {
-        return {
-            ingress: feishuIngressFor(kind, process.env),
-            pinned: Boolean(process.env[name]?.trim()),
-        };
-    }
-    catch (error) {
-        // A malformed value in the environment: the author's to fix, said as the rule says it.
-        return failUsage(error.message);
-    }
-}
-/**
- * A setting only takes effect in a channel file that reads it: one that names its factory receives the same way
- * whatever the setting says, so writing the setting (and configuring the app for it) would change nothing but the app.
- * Asked of the channel as the agent builds it, under the value this command is about to write.
- */
-async function assertChannelReadsSetting(target, kind, setting, shown) {
-    Object.assign(process.env, setting); // the value this command writes anyway
-    const channel = await prepareDefinition(target)
-        .then((definition) => buildDefinitionShape(definition, process.env).channels.get(kind))
-        .catch((error) => failStartup(new Error(`the agent does not build (${error.message}) — fix it and re-run`)));
-    const [[name, value]] = Object.entries(setting);
-    const wanted = value === "webhook" ? "webhook" : "long-connection";
-    const shape = channel === undefined ? undefined : channelIngress(channel);
-    if (shape !== wanted) {
-        failStartup(new Error(`${shown} receives by ${shape === "webhook" ? "webhook" : "WebSocket"} whatever ${name} says — it names ` +
-            `its factory instead of reading the setting, so ${name}=${value} would change nothing but the app. Move ` +
-            `the file aside and re-run to scaffold one that reads it, or edit its factory yourself`));
-    }
+    if (opts.json)
+        console.log(JSON.stringify({ status: "done", created, next_steps: next }, null, 2));
+    process.exit(0);
 }
 /** `fastagent add skill <source> [dir]`: vendor an Agent Skills skill into <dir>/skills/<name>/. */
 export async function runAddSkill(source, dirArg, opts) {

package/dist/cli/commands/auth.js

@@ -1,3 +1,9 @@
+/**
+ * `fastagent auth check`: whether a provider is ready for the agent here, as pi's `auth check` answers it, for a script
+ * or a coding agent: `ready`, `not_ready` or `invalid` on stdout, exit 0, 1 or 2. The answer is the one the agent's
+ * messages would get (`ModelEnvironment.authStatus`, a due refresh included).
+ */
+import { definedValues } from "../../declared-secrets.js";
 import { enterAgentEnv } from "../../env.js";
 import { modelEnvironment } from "../../harnesses/models/environment.js";
 import { providerOf } from "../../harnesses/models/models.js";
@@ -13,12 +19,12 @@ export async function runAuthCheck(opts) {
     let providers = [];
     if (agentDir) {
         enterAgentEnv(agentDir);
-        providers = await definitionProviders(agentDir).catch(failStartup);
+        providers = await definitionProviders(agentDir, process.env).catch(failStartup);
     }
     else {
         installProxyFetch();
     }
-    const environment = await modelEnvironment(agentDir, {}, providers);
+    const environment = await modelEnvironment(agentDir, {}, providers, { environment: definedValues(process.env) });
     let provider = opts.provider;
     let modelId;
     if (opts.model !== undefined) {

package/dist/cli/commands/build.d.ts

@@ -0,0 +1,5 @@
+export interface BuildCommandOptions {
+    check: boolean;
+    json: boolean;
+}
+export declare function runBuild(dirArg: string, opts: BuildCommandOptions): Promise<void>;

package/dist/cli/commands/build.js

@@ -0,0 +1,16 @@
+/** `fastagent build [agent] [--no-check] [--json]`: the agent compiled into `dist/`. */
+import { relative, resolve } from "node:path";
+import { buildProject } from "../../harnesses/pi-durable/build.js";
+import { log } from "../../log.js";
+import { agentDirOrExit, failStartup } from "../fail.js";
+export async function runBuild(dirArg, opts) {
+    const dir = agentDirOrExit(resolve(dirArg));
+    const { dist, definition, warnings } = await buildProject(dir, { check: opts.check }).catch(failStartup);
+    for (const warning of warnings)
+        log.warn(`[fastagent] ${warning}`);
+    if (opts.json) {
+        console.log(JSON.stringify({ dist, name: definition.name, version: definition.version, warnings }));
+        return;
+    }
+    console.log(relative(process.cwd(), dist) || dist);
+}

package/dist/cli/commands/channels.d.ts

@@ -0,0 +1,19 @@
+export interface ChannelsSetupOptions {
+    recordUrl: boolean;
+    /** The instance configuration: what names how the channel receives, and where `--ingress` is written. */
+    config?: string;
+    /** The value file the credentials are kept in (created when missing). */
+    envFile?: string;
+    ingress?: string;
+    url?: string;
+    json: boolean;
+    /** false ⇔ `--no-input`. */
+    input?: boolean;
+    /** `--check <ticket>`: where a setup started without a terminal stands. */
+    check?: string;
+    /** `--timeout <seconds>`: how long a setup started without a terminal stays open. */
+    timeout?: string;
+    /** `--ticket <id>`: the process that runs a ticket's setup. */
+    ticket?: string;
+}
+export declare function runChannelsSetup(name: string, dirArg: string, opts: ChannelsSetupOptions): Promise<void>;