run402 4.81.0 → 4.83.0

package/sdk/dist/node/actions-node.js

@@ -191,8 +191,17 @@ export class NodeActions {
         }
     }
     async #runUpFromWorkspace(input, run, source, startedAt) {
-        const workspaceDir = source.workspaceDir;
+        let workspaceDir = source.workspaceDir;
         const manifest = await this.#discoverAndValidateManifest(input, workspaceDir, source.metadata, run);
+        workspaceDir = dirname(manifest.manifestPath);
+        if (!input.verifyOnly) {
+            await resolveDeploymentTarget({
+                appRoot: workspaceDir, manifestPath: manifest.manifestPath, projectId: input.projectId,
+                manifestProjectId: manifest.manifestProjectId ?? manifest.appSpec?.project.id, name: input.name,
+                targetKind: this.#targetKind(), apiBase: this.sdk.apiBase,
+                allowUnresolved: run.executionMode === "check" || run.executionMode === "printSpec" || run.dryRun,
+            });
+        }
         if (manifest.manifestKind === "app") {
             if (input.verifyOnly) {
                 return this.#verifyAppManifestOnly(input, manifest, workspaceDir, run, startedAt);
@@ -272,7 +281,7 @@ export class NodeActions {
                 schema_version: "run402.workspace-project.v1",
                 project_id: resolved.projectId,
                 ...(input.name ? { name: input.name } : {}),
-                target: { kind: this.#targetKind() },
+                target: { kind: this.#targetKind(), api_base: this.sdk.apiBase },
                 created_at: resolved.link?.created_at ?? new Date().toISOString(),
                 updated_at: new Date().toISOString(),
             }, resolved.link, run);
@@ -588,14 +597,26 @@ export class NodeActions {
             // level down) usually is one `--dir` away from the manifest it meant.
             // Name what is one directory down so the hop is executable.
             const nearby = await findNearbyManifests(workspaceDir);
-            const nearbyActions = nearby.map((entry) => ({
+            const selectorArgs = [...(input.projectId ? ["--project", input.projectId] : []), ...(input.name ? ["--name", input.name] : [])];
+            const candidateActions = await Promise.all(nearby.map(async (entry) => ({
+                binding: await nearbyBinding(entry.path),
+                cwd: workspaceDir,
+                env: { RUN402_API_BASE: this.sdk.apiBase, ...(this.opts.profile ? { RUN402_WALLET: this.opts.profile } : {}) },
                 type: "run_in_directory",
-                command: `run402 up --check --dir ${shellArg(entry.relative_dir)}`,
-                argv: ["run402", "up", "--check", "--dir", entry.relative_dir],
+                command: ["run402", "up", "--check", "--dir", entry.relative_dir, ...selectorArgs].map(shellArg).join(" "),
+                argv: ["run402", "up", "--check", "--dir", entry.relative_dir, ...selectorArgs],
+                app_root: dirname(entry.path),
+                manifest_path: entry.path,
+                safe_to_auto_execute: true,
                 path: entry.path,
                 dir: entry.relative_dir,
                 why: "A manifest exists one directory down; up does not walk into subdirectories.",
-            }));
+            })));
+            const nearbyActions = nearby.length > 1 ? [{
+                    type: "select_application", safe_to_auto_execute: false,
+                    why: "Choose the intended application; directory order does not indicate a recommendation.",
+                    candidates: candidateActions.map((entry) => ({ ...entry, recommended: false })),
+                }] : candidateActions;
             throw run.error(nearby.length > 0
                 ? `No deploy manifest found in ${workspaceDir}, but ${nearby.length === 1 ? "one exists" : `${nearby.length} exist`} one directory down (${nearby.map((entry) => entry.relative_dir).join(", ")}). Re-run with --dir <that directory>, or add run402.json, run402.deploy.json or app.json here.`
                 : "No deploy manifest found. Add run402.json, run402.deploy.json or app.json, or pass --manifest for executable configs.", "UP_MANIFEST_REQUIRED", {
@@ -603,7 +624,7 @@ export class NodeActions {
                 candidates: MANIFEST_CANDIDATES,
                 executable_candidates: EXECUTABLE_MANIFEST_CANDIDATES,
                 nearby_manifests: nearby,
-                next_actions: [
+                next_actions: nearby.length > 1 ? nearbyActions : [
                     ...nearbyActions,
                     {
                         type: "create_manifest",
@@ -684,6 +705,7 @@ export class NodeActions {
                 });
                 return {
                     manifestKind: "app",
+                    manifestProjectId: appSpec.project.id,
                     manifestPath,
                     releaseSpec: null,
                     appGraph,
@@ -693,9 +715,7 @@ export class NodeActions {
             }
         }
         const loaded = await loadDeployManifest(manifestPath, {
-            ...(input.projectId
-                ? { project: input.projectId }
-                : { defaultProject: "prj_up_preflight_placeholder" }),
+            defaultProject: "prj_up_preflight_placeholder",
         });
         if (!hasDeployableContent(loaded.spec)) {
             throw run.error("Deploy manifest contains no deployable sections.", "MANIFEST_EMPTY", { manifest_path: manifestPath });
@@ -1060,7 +1080,7 @@ export class NodeActions {
                 schema_version: "run402.workspace-project.v1",
                 project_id: resolved.projectId,
                 ...(input.name ? { name: input.name } : {}),
-                target: { kind: this.#targetKind() },
+                target: { kind: this.#targetKind(), api_base: this.sdk.apiBase },
                 created_at: resolved.link?.created_at ?? new Date().toISOString(),
                 updated_at: new Date().toISOString(),
             }, resolved.link, run);
@@ -1793,7 +1813,7 @@ export class NodeActions {
         });
         run.setState(step, "running");
         const linkConflict = workspaceLinkConflict(link, input, this.#targetKind(), linkPath);
-        if (linkConflict && !input.projectId) {
+        if (linkConflict) {
             throw run.error(linkConflict.message, "RUN402_WORKSPACE_LINK_CONFLICT", linkConflict.details);
         }
         let projectId = null;
@@ -1898,34 +1918,7 @@ export class NodeActions {
                 shouldWriteLink: true,
             };
         }
-        const active = await this.sdk.projects.active();
-        if (active) {
-            const activeStep = run.addStep({
-                action: "project.resolve",
-                description: "Use active project for this workspace",
-                mutation: false,
-                auto: true,
-                details: { active_project_id: active },
-            });
-            await run.approve(activeStep, [], `Use active project ${active} and link this workspace to it.`);
-            run.setState(activeStep, run.dryRun ? "planned" : "succeeded", {
-                project_id: active,
-                source: "active",
-            });
-            run.setState(step, run.dryRun ? "planned" : "succeeded", {
-                project_id: active,
-                source: "active",
-                link_path: linkPath,
-            });
-            return {
-                projectId: active,
-                source: "active",
-                link,
-                linkPath,
-                shouldWriteLink: true,
-            };
-        }
-        throw run.error("No project is configured for this workspace. Pass --project, add project_id to the manifest, or pass --name to create one.", "RUN402_PROJECT_REQUIRED", { link_path: linkPath, manifest_path: manifest.manifestPath });
+        throw projectSelectionRequired(workspaceDir, manifest.manifestPath);
     }
     async #resolveProjectForVerify(input, manifest, workspaceDir, run) {
         const linkPath = join(workspaceDir, ".run402", "project.json");
@@ -2732,7 +2725,9 @@ async function readWorkspaceProjectLink(path) {
     try {
         raw = await readFile(path, "utf-8");
     }
-    catch {
+    catch (err) {
+        if (err.code !== "ENOENT")
+            throw err;
         return null;
     }
     let parsed;
@@ -2913,4 +2908,43 @@ function actionErrorDetails(err) {
 function assertNever(value) {
     throw new LocalError(`Unknown Run402 action ${value.type}`, "running Run402 action", { code: "RUN402_ACTION_UNKNOWN" });
 }
+/** Resolve only local destination intent. Approval and global active state are never selectors. */
+export async function resolveDeploymentTarget(input) {
+    const linkPath = join(input.appRoot, ".run402", "project.json");
+    const link = await readWorkspaceProjectLink(linkPath);
+    const conflict = workspaceLinkConflict(link, input, input.targetKind ?? "unknown", linkPath);
+    if (conflict)
+        throw new LocalError(conflict.message, "resolving deployment target", { code: "RUN402_WORKSPACE_LINK_CONFLICT", details: conflict.details });
+    if (link?.target?.api_base && input.apiBase && link.target.api_base.replace(/\/$/, "") !== input.apiBase.replace(/\/$/, "")) {
+        throw new LocalError("Workspace link belongs to a different API target.", "resolving deployment target", { code: "RUN402_WORKSPACE_LINK_CONFLICT", details: { reason: "api_base_mismatch", link_path: linkPath } });
+    }
+    const selectors = [input.projectId, input.environmentProjectId, link?.project_id, input.manifestProjectId].filter(Boolean);
+    if (new Set(selectors).size > 1) {
+        throw new LocalError("Deployment project selectors disagree.", "resolving deployment target", { code: "RUN402_PROJECT_CONFLICT", details: { explicit_project_id: input.projectId ?? null, linked_project_id: link?.project_id ?? null, manifest_project_id: input.manifestProjectId ?? null } });
+    }
+    const projectId = input.projectId ?? input.environmentProjectId ?? link?.project_id ?? input.manifestProjectId ?? null;
+    if (projectId && input.name && (!link || link.name !== input.name)) {
+        throw new LocalError("--name is creation intent and cannot select or rename an existing project. Pass --project alone.", "resolving deployment target", { code: "RUN402_PROJECT_CONFLICT", details: { project_id: projectId, name: input.name } });
+    }
+    if (!projectId && !input.name && !input.allowUnresolved)
+        throw projectSelectionRequired(input.appRoot, input.manifestPath);
+    return { project_id: projectId, project_name: input.name ?? link?.name ?? null,
+        source: input.projectId || input.environmentProjectId ? "explicit" : link ? "workspace_link" : input.manifestProjectId ? "manifest" : input.name ? "create" : "unresolved" };
+}
+function projectSelectionRequired(appRoot, manifestPath) {
+    return new LocalError("No deployment destination is selected. Pass --project for an existing project or --name to create one; -y never selects the global active project.", "resolving deployment target", {
+        code: "UP_PROJECT_REQUIRED", details: { app_root: appRoot, manifest_path: manifestPath ?? null, mutation_state: "not_started" },
+        next_actions: [{ type: "select_project", safe_to_auto_execute: false, why: "Select the intended project explicitly, or name a new project, then retry in this application directory.", app_root: appRoot }],
+    });
+}
+async function nearbyBinding(manifestPath) {
+    try {
+        const manifest = JSON.parse(await readFile(manifestPath, "utf-8"));
+        const link = await readWorkspaceProjectLink(join(dirname(manifestPath), ".run402", "project.json"));
+        return { app_name: manifest.app?.name ?? manifest.app?.id ?? null, manifest_project_id: typeof manifest.project === "string" ? manifest.project : manifest.project_id ?? manifest.project?.id ?? null, linked_project_id: link?.project_id ?? null, target: link?.target ?? null };
+    }
+    catch {
+        return { status: "unknown", reason: "Local binding could not be read; select the application and run its check." };
+    }
+}
 //# sourceMappingURL=actions-node.js.map