@cursor/july 0.1.95 → 0.1.97

package/dist/internal/cli-deploy.js

@@ -27,7 +27,7 @@ import { authorizeCursorAccountConnectors } from "./cursor-account-mcp-auth.js";
 import { readDeployTemplate } from "./cursor-agent-template.js";
 import { AgentServeDeployClient, DeployApiError, deploymentServiceAccountId, slugFromDirectoryName, TERMINAL_AGENTKIT_DEPLOY_STATUSES, TERMINAL_DEPLOY_STATUSES, validateDeploymentSlug, } from "./deploy-client.js";
 import { inferDeployGitSource } from "./deploy-source.js";
-import { isAgentProjectDir, listChildAgentDirs, loadAgentProject, } from "./discovery.js";
+import { formatDiagnostics, hasErrorDiagnostics, isAgentProjectDir, listChildAgentDirs, loadAgentProject, } from "./discovery.js";
 import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
 import { isReservedSecretName, isValidCursorEventRepo, validateSettableSecretName, } from "./hosting.js";
 import { deployProgressLabel, sanitizeCustomerError } from "./logs-client.js";
@@ -152,7 +152,9 @@ export function cmdDeploy(options) {
             manifests.push(yield readDeployManifest(target.dir));
         }
         if (manifests.every((manifest) => manifest.architecture === "v2")) {
-            return deployAgentsdkApplication(ctx, options, targets);
+            return deployAgentsdkApplication(ctx, options, targets, {
+                hasScmChannels: manifests.some((manifest) => manifest.hasScmChannels),
+            });
         }
         if (!ctx.json &&
             manifests.some((manifest) => manifest.architecture === "v2")) {
@@ -488,8 +490,14 @@ function deployOne(ctx, options, target, extras) {
                 gitRef,
                 agentPath,
                 repositories: options.cursorEventsRepos,
+                hasScmChannels: manifest.hasScmChannels,
+                multiTenant: options.multiTenant === true,
             });
         }
+        if (options.multiTenant === true) {
+            ctx.err("--multi-tenant is only valid for architecture: v2 deploys (Cursor-managed products).\n");
+            return 1;
+        }
         // Today's only source shape: the control plane builds from a git ref.
         // See DeploySource for the artifact seam.
         const source = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind: "git-ref", gitRepoUrl }, (gitRef === undefined ? {} : { gitRef })), (agentPath === undefined ? {} : { agentPath })), (options.cursorEventsRepos === undefined ||
@@ -546,10 +554,7 @@ function deployOne(ctx, options, target, extras) {
             return detail.status === "running" ? 0 : 1;
         }
         if (detail.status !== "running") {
-            const errorDetail = detail.lastError === null || detail.lastError === undefined
-                ? ""
-                : `: ${sanitizeCustomerError(detail.lastError)}`;
-            ctx.err(`Deployment ${slug} ended ${detail.status}${errorDetail}\n`);
+            ctx.err(`Deployment ${slug} ended ${detail.status}${deployFailureDetail(detail.lastError)}\n`);
             return 1;
         }
         const deployedPublicRoutes = (_h = detail.publicRoutePaths) !== null && _h !== void 0 ? _h : [];
@@ -580,7 +585,7 @@ function deployOne(ctx, options, target, extras) {
  * key is the child's slug and its path is the child directory relative to
  * the repo root (a shared --path names the parent's directory in the repo).
  */
-function deployAgentsdkApplication(ctx, options, targets) {
+function deployAgentsdkApplication(ctx, options, targets, declarations) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         const parentDir = resolve((_a = options.dir) !== null && _a !== void 0 ? _a : ".");
@@ -640,6 +645,8 @@ function deployAgentsdkApplication(ctx, options, targets) {
             agentPath: undefined,
             components,
             repositories: options.cursorEventsRepos,
+            hasScmChannels: declarations.hasScmChannels,
+            multiTenant: options.multiTenant === true,
         });
     });
 }
@@ -650,23 +657,19 @@ function deployAgentsdkApplication(ctx, options, targets) {
  */
 function deployOneAgentsdk(ctx, extras, args) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const { slug } = args;
         const componentsLine = args.components === undefined
             ? ""
             : `  components:  ${args.components
                 .map((component) => component.componentKey)
                 .join(", ")}\n`;
+        if (args.multiTenant && !ctx.json) {
+            ctx.err("  multi-tenant: existing product\n");
+        }
         let accepted;
         try {
-            accepted = yield ctx.client.deployAgentkit({
-                teamId: ctx.teamId,
-                slug,
-                gitRepoUrl: args.gitRepoUrl,
-                gitRef: args.gitRef,
-                agentPath: args.agentPath,
-                components: args.components,
-                repositories: args.repositories,
-            });
+            accepted = yield ctx.client.deployAgentkit(Object.assign({ teamId: ctx.teamId, slug, gitRepoUrl: args.gitRepoUrl, gitRef: args.gitRef, agentPath: args.agentPath, components: args.components, repositories: args.repositories }, (args.multiTenant ? { multiTenant: true } : {})));
         }
         catch (error) {
             return renderApiError(error, ctx.err);
@@ -702,7 +705,7 @@ function deployOneAgentsdk(ctx, extras, args) {
             return detail.status === "running" ? 0 : 1;
         }
         if (detail.status !== "running") {
-            ctx.err(`Deployment ${slug} ended ${detail.status}\n`);
+            ctx.err(`Deployment ${slug} ended ${detail.status}${deployFailureDetail(detail.lastError)}\n`);
             return 1;
         }
         ctx.out(`Deployed ${slug} (team ${ctx.teamId})\n` +
@@ -714,7 +717,16 @@ function deployOneAgentsdk(ctx, extras, args) {
                 ? ""
                 : `  components:   ${args.components
                     .map((component) => component.componentKey)
-                    .join(", ")}\n`));
+                    .join(", ")}\n`) +
+            (detail.repositories === undefined || !args.hasScmChannels
+                ? ""
+                : `  watching:     ${detail.repositories.length === 0 ? "(nothing)" : detail.repositories.join(", ")}\n`));
+        // An agent with GitHub/Origin channels bound to no repository scope gets
+        // no deliveries at all, which is otherwise invisible in this output.
+        if (args.hasScmChannels && ((_a = detail.repositories) === null || _a === void 0 ? void 0 : _a.length) === 0) {
+            ctx.err(`warning: ${slug} watches no repositories, so its GitHub/Origin channels receive no events.\n` +
+                `  Redeploy with --cursor-events-repo <owner>/<name> to set the scope.\n`);
+        }
         return 0;
     });
 }
@@ -790,6 +802,12 @@ function readDeployManifest(dir) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         const project = yield loadAgentProject(dir);
+        // Fail here, before anything is dispatched: a project with error
+        // diagnostics (e.g. agent/storage.ts on architecture v2) would only be
+        // refused later by `serve` inside the hosted build, wasting a bake.
+        if (hasErrorDiagnostics(project)) {
+            throw new Error(`Refusing to deploy ${project.name} — it has errors:\n${formatDiagnostics(project.diagnostics.filter((d) => d.severity === "error"))}`);
+        }
         return {
             hosting: project.agent.hosting,
             architecture: project.agent.architecture,
@@ -800,6 +818,11 @@ function readDeployManifest(dir) {
                 .filter((channel) => { var _a; return ((_a = channel.definition.auth) !== null && _a !== void 0 ? _a : []).some(isPublicEndpointPolicy); })
                 .map((channel) => channel.id),
             httpChannelPublicEndpoint: ((_a = project.httpChannel.auth) !== null && _a !== void 0 ? _a : []).some(isPublicEndpointPolicy),
+            hasScmChannels: project.channels.some((channel) => {
+                var _a;
+                const kind = (_a = channel.definition.meta) === null || _a === void 0 ? void 0 : _a.kind;
+                return kind === "github" || kind === "origin";
+            }),
         };
     });
 }
@@ -1456,9 +1479,25 @@ function aliasTokenBlock(aliasToken) {
         `  or paste it into the hosted playground (<alias>/playground) sign-in gate.\n` +
         `  Lost tokens: \`${CLI} rotate-token <slug>\` mints a replacement.\n\n`);
 }
+/**
+ * `: <reason>` suffix for a deploy that ended in a non-running state, or
+ * empty when the control plane recorded no reason.
+ */
+function deployFailureDetail(lastError) {
+    if (lastError === null ||
+        lastError === undefined ||
+        lastError.trim() === "") {
+        return "";
+    }
+    return `: ${sanitizeCustomerError(lastError.trim())}`;
+}
 function renderApiError(error, err) {
     if (error instanceof DeployApiError) {
         err(`${error.message}\n`);
+        if (error.status === 409 &&
+            error.message.includes("application multiTenant does not match")) {
+            err("This slug is a Cursor-managed (multi-tenant) product. Redeploy it with --multi-tenant.\n");
+        }
         return 1;
     }
     throw error;

package/dist/internal/cli-mcp-oauth.js

@@ -27,7 +27,8 @@ import { authorizeCursorAccountConnectors } from "./cursor-account-mcp-auth.js";
 import { deploymentServiceAccountId } from "./deploy-client.js";
 import { loadAgentProject } from "./discovery.js";
 import { CLI_COMMAND_NAME as CLI, LOG_PREFIX } from "./distribution.js";
-import { createHostMcpOAuthProvider, MCP_OAUTH_CALLBACK_URL, mcpOauthSecretNames, openBrowser, waitForMcpOAuthCallback, } from "./mcp-oauth.js";
+import { createHostMcpOAuthProvider, MCP_OAUTH_CALLBACK_URL, openBrowser, waitForMcpOAuthCallback, } from "./mcp-oauth.js";
+import { upsertHostMcpOauthSecrets } from "./mcp-oauth-persist.js";
 import { resolveProdSlug } from "./resolve-prod-target.js";
 function describe(error) {
     if (!(error instanceof Error)) {
@@ -287,25 +288,14 @@ function storeOauthSecrets(args) {
         if (typeof auth === "number") {
             return auth;
         }
-        const names = mcpOauthSecretNames(args.connection);
-        const secrets = [
-            { name: names.accessToken, value: tokens.access_token },
-        ];
-        if (tokens.refresh_token !== undefined &&
-            tokens.refresh_token.trim() !== "") {
-            secrets.push({ name: names.refreshToken, value: tokens.refresh_token });
-        }
-        if (args.clientId !== undefined && args.clientId.trim() !== "") {
-            secrets.push({ name: names.clientId, value: args.clientId });
-        }
         try {
-            const secretNames = yield auth.client.setSecrets({
-                teamId: auth.teamId,
-                slug,
-                secrets,
+            const secretNames = yield upsertHostMcpOauthSecrets({
+                connection: args.connection,
+                tokens,
+                clientId: args.clientId,
+                target: { client: auth.client, teamId: auth.teamId, slug },
             });
-            args.out(`${LOG_PREFIX} Stored on ${slug}: ${secrets.map((s) => s.name).join(", ")}.\n` +
-                `${LOG_PREFIX} Secrets now: ${secretNames.join(", ")}. Next deploy picks them up.\n`);
+            args.out(`${LOG_PREFIX} Stored on ${slug}. Secrets now: ${secretNames.join(", ")}. Next deploy picks them up.\n`);
             return 0;
         }
         catch (error) {

package/dist/internal/cli-slack-manual.d.ts

@@ -1,6 +1,8 @@
 /**
- * `slack init --manual` and `slack manifest` — DIY paste-at-api.slack.com.
- * Create/destroy/icon stay in `cli-slack.ts`.
+ * `slack init --manual` and `slack manifest` — unmanaged Slack app.
+ * Slack CLI create+install when `~/.slack/bin/slack` is present;
+ * paste-at-api.slack.com is the fallback. Create/destroy/icon stay
+ * in `cli-slack.ts`.
  */
 export interface SlackManualCliOptions {
     dir: string;
@@ -12,9 +14,29 @@ export interface SlackManualCliOptions {
     channelPosts?: boolean;
     /** Gate for `slack init`; ignored by `slack manifest`. */
     manual?: boolean;
+    /** Require Slack CLI install (fail if missing or install fails). */
+    install?: boolean;
+    /** Skip Slack CLI install even when the CLI is present. */
+    noInstall?: boolean;
+    slackTeam?: string;
+    prod?: boolean;
+    detectSlackCli?: () => string | undefined;
+    runSlackCli?: SlackCliExec;
     out?: (text: string) => void;
     err?: (text: string) => void;
 }
+export interface SlackCliExecRequest {
+    bin: string;
+    argv: string[];
+    cwd: string;
+    env?: NodeJS.ProcessEnv;
+}
+export interface SlackCliExecResult {
+    code: number;
+    stdout: string;
+    stderr: string;
+}
+export type SlackCliExec = (request: SlackCliExecRequest) => Promise<SlackCliExecResult>;
 export declare function cmdSlackInit(options: SlackManualCliOptions): Promise<number>;
 export declare function runSlackManifest(options: SlackManualCliOptions): Promise<number>;
 //# sourceMappingURL=cli-slack-manual.d.ts.map

package/dist/internal/cli-slack-manual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-slack-manual.d.ts","sourceRoot":"","sources":["../../src/internal/cli-slack-manual.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAMD,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAgCjB"}
+{"version":3,"file":"cli-slack-manual.d.ts","sourceRoot":"","sources":["../../src/internal/cli-slack-manual.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAwBH,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC1C,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,OAAO,EAAE,mBAAmB,KACzB,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAoGjC,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAoFjB;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAgCjB"}

package/dist/internal/cli-slack-manual.js

@@ -1,6 +1,8 @@
 /**
- * `slack init --manual` and `slack manifest` — DIY paste-at-api.slack.com.
- * Create/destroy/icon stay in `cli-slack.ts`.
+ * `slack init --manual` and `slack manifest` — unmanaged Slack app.
+ * Slack CLI create+install when `~/.slack/bin/slack` is present;
+ * paste-at-api.slack.com is the fallback. Create/destroy/icon stay
+ * in `cli-slack.ts`.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -11,18 +13,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mkdir, writeFile } from "node:fs/promises";
+import { execFile } from "node:child_process";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { basename, join, resolve as resolvePath } from "node:path";
+import { promisify } from "node:util";
+import { detectSlackCli, parseSlackAuthTeams, readSlackCliAppId, SLACK_CLI_HOME_BIN, } from "../channels/slack/cli-project.js";
 import { buildSlackManifestPair, initSlackManual, slackManifestFileEntries, } from "../channels/slack/index.js";
 import { describeError } from "./describe-error.js";
 import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
+import { ensureEnvLocalGitignored, upsertEnvFile } from "./env-file.js";
+const execFileAsync = promisify(execFile);
 function errStream(options) {
     var _a;
     return (_a = options.err) !== null && _a !== void 0 ? _a : ((text) => void process.stderr.write(text));
 }
+function afterDoctor(prefix) {
+    return [
+        prefix === undefined
+            ? `${CLI} slack doctor`
+            : `${CLI} slack doctor --prefix ${prefix}`,
+        `${CLI} serve --dir . --dev`,
+        `${CLI} slack setup`,
+    ];
+}
+function slackCliEnvironment(prod) {
+    return prod === true ? "deployed" : "local";
+}
+function slackAppSettingsUrl(appId) {
+    return appId === undefined
+        ? "https://api.slack.com/apps"
+        : `https://api.slack.com/apps/${appId}`;
+}
+function pasteNext(envKeys, options) {
+    return [
+        "Ask the user to install this Slack app on their workspace",
+        `Open ${slackAppSettingsUrl()} → Create from manifest`,
+        "Import .slack/manifest.dev.json (then prod)",
+        `Install apps; set ${envKeys.bot} + ${envKeys.app}`,
+        `Or install Slack CLI to ~/${SLACK_CLI_HOME_BIN}, then slack app install --environment ${options.environment} --team <T> --force`,
+        ...afterDoctor(options.prefix),
+    ];
+}
+function cliNext(cli, envKeys, options) {
+    var _a;
+    const workspace = (_a = options.team) !== null && _a !== void 0 ? _a : "<T>";
+    return [
+        "Ask the user to install this Slack app on their workspace",
+        `${cli} login --no-prompt`,
+        `In Slack send /slackauthticket <ticket>; then ${cli} login --ticket <ticket> --challenge <code>`,
+        `${cli} app install --environment ${options.environment} --team ${workspace} --force`,
+        `Copy xoxb + xapp (connections:write) from ${slackAppSettingsUrl()} into .env.local as ${envKeys.bot} + ${envKeys.app}`,
+        `Fallback: paste .slack/manifest.dev.json at ${slackAppSettingsUrl()}`,
+        ...afterDoctor(options.prefix),
+    ];
+}
+function installedNext(install, envKeys, prefix) {
+    const settings = slackAppSettingsUrl(install.appId);
+    const next = [];
+    if (!install.tokens.bot) {
+        next.push(`Copy the bot token (xoxb-...) from ${settings} into ${envKeys.bot}`);
+    }
+    if (!install.tokens.app) {
+        next.push(`Mint an app-level token with connections:write at ${settings}; set ${envKeys.app}`);
+    }
+    next.push(...afterDoctor(prefix));
+    return next;
+}
 export function cmdSlackInit(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if (options.manual !== true) {
             errStream(options)(`\`slack init\` without --manual is not the first-run path. Socket Mode apps are created with:
 
@@ -30,7 +89,7 @@ export function cmdSlackInit(options) {
 
 That opens the Cursor dashboard wizard.
 
-To install a custom Slack app from a manifest (api.slack.com):
+To install a custom Slack app from a manifest (Slack CLI or api.slack.com):
 
   ${CLI} slack init --manual --dir .
 `);
@@ -38,6 +97,7 @@ To install a custom Slack app from a manifest (api.slack.com):
         }
         const dir = resolvePath(options.dir);
         const out = (_a = options.out) !== null && _a !== void 0 ? _a : ((text) => void process.stdout.write(text));
+        const err = errStream(options);
         try {
             const result = yield initSlackManual({
                 dir,
@@ -45,27 +105,53 @@ To install a custom Slack app from a manifest (api.slack.com):
                 envPrefix: options.noPrefix === true ? "" : options.prefix,
                 channelPosts: options.channelPosts,
             });
+            const cli = ((_b = options.detectSlackCli) !== null && _b !== void 0 ? _b : detectSlackCli)();
+            const skipInstall = options.noInstall === true;
+            const requireInstall = options.install === true && !skipInstall;
+            let install;
+            if (!skipInstall && cli !== undefined) {
+                install = yield installSlackApp({
+                    dir: result.rootDir,
+                    bin: cli,
+                    envKeys: result.envKeys,
+                    environment: slackCliEnvironment(options.prod),
+                    team: options.slackTeam,
+                    exec: options.runSlackCli,
+                });
+                if (!install.ok && requireInstall) {
+                    err(`${(_c = install.error) !== null && _c !== void 0 ? _c : "slack app install failed"}\n`);
+                }
+            }
+            else if (requireInstall) {
+                err(`Slack CLI not found (~/${SLACK_CLI_HOME_BIN}). Install it or omit --install and paste at api.slack.com.\n`);
+            }
+            const ok = !requireInstall || (install === null || install === void 0 ? void 0 : install.ok) === true;
+            const next = (install === null || install === void 0 ? void 0 : install.ok) === true
+                ? installedNext(install, result.envKeys, result.envPrefix)
+                : cli !== undefined
+                    ? cliNext(cli, result.envKeys, {
+                        team: (_d = install === null || install === void 0 ? void 0 : install.team) !== null && _d !== void 0 ? _d : options.slackTeam,
+                        environment: slackCliEnvironment(options.prod),
+                        prefix: result.envPrefix,
+                    })
+                    : pasteNext(result.envKeys, {
+                        environment: slackCliEnvironment(options.prod),
+                        prefix: result.envPrefix,
+                    });
             out(`${JSON.stringify({
-                ok: true,
+                ok,
                 directory: result.rootDir,
                 created: result.files,
-                envPrefix: (_b = result.envPrefix) !== null && _b !== void 0 ? _b : null,
+                envPrefix: (_e = result.envPrefix) !== null && _e !== void 0 ? _e : null,
                 envKeys: result.envKeys,
-                next: [
-                    "Open https://api.slack.com/apps → Create from manifest",
-                    "Import .agent-serve/slack/manifest.dev.json (then prod)",
-                    `Install apps; set ${result.envKeys.bot} + ${result.envKeys.app}`,
-                    result.envPrefix === undefined
-                        ? `${CLI} slack doctor`
-                        : `${CLI} slack doctor --prefix ${result.envPrefix}`,
-                    `${CLI} serve --dir . --dev`,
-                    `${CLI} slack setup`,
-                ],
+                cli: cli !== null && cli !== void 0 ? cli : null,
+                install: install !== null && install !== void 0 ? install : null,
+                next,
             }, null, 2)}\n`);
-            return 0;
+            return ok ? 0 : 1;
         }
         catch (error) {
-            errStream(options)(`${describeError(error)}\n`);
+            err(`${describeError(error)}\n`);
             return 1;
         }
     });
@@ -92,7 +178,7 @@ export function runSlackManifest(options) {
             }
             return 0;
         }
-        const outDir = join(dir, ".agent-serve/slack");
+        const outDir = join(dir, ".slack");
         yield mkdir(outDir, { recursive: true });
         const written = [];
         for (const file of slackManifestFileEntries(pair, env)) {
@@ -104,3 +190,148 @@ export function runSlackManifest(options) {
         return 0;
     });
 }
+function parseEnvAssignments(text) {
+    const out = {};
+    for (const line of text.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (trimmed === "" || trimmed.startsWith("#")) {
+            continue;
+        }
+        const raw = trimmed.startsWith("export ") ? trimmed.slice(7) : trimmed;
+        const eq = raw.indexOf("=");
+        if (eq <= 0) {
+            continue;
+        }
+        out[raw.slice(0, eq)] = raw.slice(eq + 1);
+    }
+    return out;
+}
+function readDotenv(dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return parseEnvAssignments(yield readFile(join(dir, ".env"), "utf8").catch(() => ""));
+    });
+}
+function newToken(before, after, prefix) {
+    if (after === undefined || !after.startsWith(prefix) || after === before) {
+        return undefined;
+    }
+    return after;
+}
+function copySlackCliTokensToLocalEnv(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const after = yield readDotenv(options.dir);
+        const bot = newToken(options.before.SLACK_BOT_TOKEN, after.SLACK_BOT_TOKEN, "xoxb-");
+        const app = newToken(options.before.SLACK_APP_TOKEN, after.SLACK_APP_TOKEN, "xapp-");
+        const entries = [];
+        const wrote = { bot: false, app: false };
+        if (bot !== undefined) {
+            entries.push({ key: options.envKeys.bot, value: bot });
+            wrote.bot = true;
+        }
+        if (app !== undefined) {
+            entries.push({ key: options.envKeys.app, value: app });
+            wrote.app = true;
+        }
+        if (entries.length === 0) {
+            return wrote;
+        }
+        yield upsertEnvFile(join(options.dir, ".env.local"), entries);
+        yield ensureEnvLocalGitignored(options.dir);
+        return wrote;
+    });
+}
+function installSlackApp(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const exec = (_a = options.exec) !== null && _a !== void 0 ? _a : defaultSlackCliExec;
+        const auth = yield exec({
+            bin: options.bin,
+            argv: ["auth", "list"],
+            cwd: options.dir,
+        });
+        const teams = parseSlackAuthTeams(`${auth.stdout}\n${auth.stderr}`);
+        if (teams.length === 0) {
+            return {
+                ok: false,
+                environment: options.environment,
+                error: "Slack CLI is not logged in. Run slack login --no-prompt.",
+                tokens: { bot: false, app: false },
+            };
+        }
+        let team = options.team;
+        if (team === undefined) {
+            if (teams.length > 1) {
+                return {
+                    ok: false,
+                    environment: options.environment,
+                    error: `Multiple Slack CLI teams (${teams.join(", ")}). Pass --slack-team.`,
+                    tokens: { bot: false, app: false },
+                };
+            }
+            team = teams[0];
+        }
+        const before = yield readDotenv(options.dir);
+        const installed = yield exec({
+            bin: options.bin,
+            argv: [
+                "app",
+                "install",
+                "--environment",
+                options.environment,
+                "--force",
+                "--team",
+                team,
+            ],
+            cwd: options.dir,
+            env: Object.assign(Object.assign({}, process.env), { SLACK_ENV: options.environment }),
+        });
+        if (installed.code !== 0) {
+            const detail = installed.stderr.trim() || installed.stdout.trim();
+            return {
+                ok: false,
+                environment: options.environment,
+                team,
+                error: detail === "" ? `slack app install exited ${installed.code}` : detail,
+                tokens: { bot: false, app: false },
+            };
+        }
+        yield writeFile(join(options.dir, ".slack/cli-environment"), `${options.environment}\n`);
+        const appId = yield readSlackCliAppId(options.dir, options.environment, team);
+        const tokens = yield copySlackCliTokensToLocalEnv({
+            dir: options.dir,
+            envKeys: options.envKeys,
+            before,
+        });
+        return {
+            ok: true,
+            environment: options.environment,
+            team,
+            appId,
+            tokens,
+        };
+    });
+}
+function defaultSlackCliExec(request) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const { stdout, stderr } = yield execFileAsync(request.bin, request.argv, {
+                cwd: request.cwd,
+                env: request.env,
+                timeout: 120000,
+            });
+            return { code: 0, stdout, stderr };
+        }
+        catch (error) {
+            if (!(error instanceof Error)) {
+                throw error;
+            }
+            const execError = error;
+            return {
+                code: typeof execError.code === "number" ? execError.code : 1,
+                stdout: (_a = execError.stdout) !== null && _a !== void 0 ? _a : "",
+                stderr: (_b = execError.stderr) !== null && _b !== void 0 ? _b : execError.message,
+            };
+        }
+    });
+}

package/dist/internal/cli-slack.d.ts

@@ -1,9 +1,10 @@
 /**
  * `agent-serve slack …` CLI — doctor, destroy/icon, `create` as a
  * dashboard-wizard launcher (`slack-provision-client.ts`), and
- * `init --manual` for hand-imported manifests.
+ * `init --manual` for Slack CLI / paste-at-api.slack.com manifests.
  */
 import { runSlackDoctor } from "../channels/slack/index.js";
+import { type SlackCliExec } from "./cli-slack-manual.js";
 import { type TerminalPalette } from "./terminal-style.js";
 export interface SlackCliOptions {
     dir: string;
@@ -29,8 +30,14 @@ export interface SlackCliOptions {
     icon?: string;
     /** create: accepted for compatibility; live-app updates always overwrite. */
     force?: boolean;
-    /** `slack init --manual`: manifests for paste at api.slack.com. */
+    /** `slack init --manual`: Slack CLI project + paste fallback. */
     manual?: boolean;
+    /** `slack init --manual`: require Slack CLI install. */
+    install?: boolean;
+    /** `slack init --manual`: skip Slack CLI install. */
+    noInstall?: boolean;
+    detectSlackCli?: () => string | undefined;
+    runSlackCli?: SlackCliExec;
     /** `slack icon <source>` positional (same URL-or-file forms as --icon). */
     iconSource?: string;
     /** doctor: watched channel ids (`C…`) to verify visibility/membership. */

package/dist/internal/cli-slack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-slack.d.ts","sourceRoot":"","sources":["../../src/internal/cli-slack.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAIL,cAAc,EAGf,MAAM,4BAA4B,CAAC;AAqBpC,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yEAAyE;IACzE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,kBAAkB;IAClB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,cAAc,CAAC;IACnC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,OAAO,CAAC,EAAE,eAAe,CAAC;CAC3B;AA4CD,wBAAsB,QAAQ,CAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CA4BjB;AA6RD,wBAAsB,cAAc,CAClC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CAoLjB;AAiDD,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CA4CjB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAsD5E"}
+{"version":3,"file":"cli-slack.d.ts","sourceRoot":"","sources":["../../src/internal/cli-slack.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAIL,cAAc,EAGf,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAoB/B,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yEAAyE;IACzE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,iEAAiE;IACjE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,wDAAwD;IACxD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,qDAAqD;IACrD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAC1C,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,kBAAkB;IAClB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,cAAc,CAAC;IACnC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,OAAO,CAAC,EAAE,eAAe,CAAC;CAC3B;AAmDD,wBAAsB,QAAQ,CAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CA2CjB;AA6RD,wBAAsB,cAAc,CAClC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CAoLjB;AAiDD,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CA4CjB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAsD5E"}