cognetivy 1.0.3 → 2.0.0

package/dist/cli.js

@@ -2,17 +2,14 @@
 import { program } from "commander";
 import path from "node:path";
 import fs from "node:fs/promises";
-import { ensureMinimalWorkspace, ensureWorkspace, isWorkspaceMinimal, requireWorkspace, workspaceExists, readWorkflowIndex, readWorkflowIndexOptional, writeWorkflowIndex, listWorkflows, readWorkflowRecord, writeWorkflowRecord, listWorkflowVersionIds, readWorkflowVersionRecord, writeWorkflowVersionRecord, writeRunFile, readRunFile, updateRunFile, appendEventLine, runExists, readCollectionSchema, writeCollectionSchema, listCollectionKindsForRun, readCollections, writeCollections, appendCollection, listNodeResults, readNodeResult, writeNodeResult, deleteCollectionItemsByIds, } from "./workspace.js";
+import { ensureMinimalWorkspace, readWorkflowIndex, readWorkflowIndexOptional, writeWorkflowIndex, } from "./workspace.js";
 import { getMergedConfig } from "./config.js";
-import { validateWorkflowVersion } from "./validate.js";
-import { getNextStep, formatNextStepLine } from "./run-engine.js";
+import { formatNextStepLine } from "./run-engine.js";
 import { mergeKindTemplate } from "./kind-templates.js";
 import { listWorkflowTemplates, listWorkflowTemplatesForPicker, materializeWorkflowTemplate } from "./workflow-templates.js";
-import { applyWorkflowTemplateToWorkspace, applyWorkflowTemplateToCloud } from "./workflow-template-apply.js";
-import { NodeResultStatus } from "./models.js";
+import { applyWorkflowTemplateToCloud } from "./workflow-template-apply.js";
 import { runMcpServer } from "./mcp.js";
-import { startStudioServer, STUDIO_DEFAULT_PORT } from "./studio-server.js";
-import { cloudCreateRun, cloudGetRun, cloudGetNext, cloudStartNode, cloudCompleteNode, cloudAppendEvents, mapCloudActionToLocal, isCloudMode, isCloudAuthenticated, getCloudApiUrl, cloudGetCurrentUser, resolveCloudOrganizationId, cloudListWorkflows, cloudCreateWorkflow, cloudCreateWorkflowFull, cloudCreateWorkflowVersion, cloudGetWorkflow, cloudGetWorkflowVersions, cloudGetWorkflowVersion, cloudListCollectionKinds, cloudGetCollectionItems, cloudSetCollectionSchema, } from "./cloud-client.js";
+import { cloudCreateRun, cloudGetRun, cloudGetNext, cloudStartNode, cloudCompleteNode, cloudAppendEvents, mapCloudActionToCliAction, isCloudMode, isCloudAuthenticated, getCloudApiUrl, cloudGetCurrentUser, resolveCloudOrganizationId, cloudListWorkflows, cloudCreateWorkflow, cloudCreateWorkflowFull, cloudCreateWorkflowVersion, cloudGetWorkflow, cloudGetWorkflowVersions, cloudGetWorkflowVersion, cloudListCollectionKinds, cloudGetCollectionItems, cloudSetCollectionSchema, cloudGetCollectionSchema, } from "./cloud-client.js";
 import { writeStoredApiKey, removeStoredApiKey, getApiKeyPath } from "./credentials.js";
 import { runLoginFlow } from "./auth-login-server.js";
 import open from "open";
@@ -66,13 +63,11 @@ import updateNotifier from "update-notifier";
 import * as p from "@clack/prompts";
 import { openCliDocsInBrowser } from "./cli-docs.js";
 import { getCloudAppUrl, buildCloudOnboardingUrl } from "./onboarding-url.js";
+import { runLocalStudioForeground, resolveLocalStudioBrowserBase } from "./local-studio-entry.js";
+import { createLocalStudioServer } from "./local-server/local-studio-server.js";
+import { resolveLocalStudioStaticRoot, localStudioBundleHasCliAuth } from "./local-server/static-root.js";
 import { parsePayload, formatFromFilePath, stringifyPayload } from "./payload-parse.js";
 const DEFAULT_BY = "cli";
-function generateId(prefix) {
-    const ts = new Date().toISOString().replace(/[:.]/g, "-");
-    const rand = Math.random().toString(36).slice(2, 8);
-    return `${prefix}_${ts}_${rand}`;
-}
 async function resolveBy(cwd) {
     const config = await getMergedConfig(cwd);
     return config.default_by ?? DEFAULT_BY;
@@ -86,16 +81,11 @@ async function resolveCloudWorkflowId(cwd, optsWorkflow) {
     const index = await readWorkflowIndexOptional(cwd);
     return index?.cloud_current_workflow_id ?? null;
 }
-/** Resolve whether to use cloud API: --local → false, --cloud → true, else preferred_mode or isCloudMode(). */
-async function resolveUseCloud(cwd, opts) {
-    if (opts.local)
-        return false;
-    if (opts.cloud !== undefined && opts.cloud !== null)
-        return opts.cloud;
-    const index = await readWorkflowIndexOptional(cwd);
-    if (index?.preferred_mode === "local")
-        return false;
-    return isCloudMode();
+async function requireCloudApiKey() {
+    if (!isCloudMode()) {
+        console.error("Error: Cloud API key required. Run `cognetivy auth login` or set COGNETIVY_API_KEY.");
+        process.exit(1);
+    }
 }
 /** Extract all unique collection names from nodes (input_collections + output_collections). */
 function getCollectionNamesFromNodes(nodes) {
@@ -135,42 +125,59 @@ async function readPayloadFromFileOrStdin(filePath, cwd) {
     }
     return raw;
 }
-/** Launch local Studio server and open in browser (for local .cognetivy workspace). Optionally deep-link to a workflow. */
-async function launchLocalStudio(workspacePath, port = STUDIO_DEFAULT_PORT, workflowId) {
-    await requireWorkspace(workspacePath);
-    const { port: actualPort } = await startStudioServer(workspacePath, port, { apiOnly: false });
-    const base = `http://127.0.0.1:${actualPort}`;
-    const url = workflowId ? `${base}/workflows/${encodeURIComponent(workflowId)}` : base;
-    await openUrl(url);
-    console.log(`Local Studio at ${base} (workspace: ${workspacePath}). Press Ctrl+C to stop.`);
-}
 const DEV_API_URL = "http://localhost:3000";
 /** Local cloud-studio dev server; used for auth/login when --dev. */
 const DEV_APP_URL = "http://localhost:5174";
 program
     .name("cognetivy")
-    .description("Cognetivy – workflows, runs, and collections. Default: open the app in your browser. Use `cognetivy auth status` to check API key; `cognetivy auth login` to sign in and get an API key.")
+    .description("Cognetivy – workflows, runs, and collections. Default: start the local studio backend (browser + executor). Use `cognetivy auth status` to check API key; `cognetivy auth login` to sign in and get an API key.")
     .version(getCurrentVersionSync())
     .option("--interface", "Open CLI reference in browser (same as `cognetivy docs`)")
-    .option("--dev", "Use local backend (API http://localhost:3000, app http://localhost:5174). Run backend and cloud-studio locally first.")
+    .option("--dev", "Point at local backend: API http://localhost:3000 and app http://localhost:5174. Opens the Vite dev studio (same port) with ?session=…; run `npm run dev` in cloud-studio first. Proxy /ws and /api/local to the CLI (see cloud-studio vite.config). Set COGNETIVY_USE_BUNDLED_STUDIO=1 to open the bundled UI on port 3848 instead.")
+    .option("--api-url <url>", "Backend API base for this run only (overrides COGNETIVY_API_URL). Local studio CLI auth uses this URL. Example: --api-url http://localhost:3000")
     .addHelpText("after", `
 Environment (cloud):
   COGNETIVY_API_KEY    API key for cloud run/event (create at app → Settings). When set, run/event use cloud by default.
   COGNETIVY_APP_URL    URL opened by default command (default: https://alpha.cognetivy.com).
-  COGNETIVY_API_URL    Cloud API base URL (default: http://localhost:3000 in dev, https://bm.cognetivy.com otherwise). Use for local backend or custom deployment.
+  COGNETIVY_API_URL    Backend API base (default: https://bm.cognetivy.com, or http://localhost:3000 when NODE_ENV=development / COGNETIVY_DEV=1). Local studio injects this into the page so /auth/cli/authorize matches the CLI token exchange.
+
+Local studio (default command):
+  COGNETIVY_LOCAL_PORT   Bind port for local HTTP + WebSocket (default: 3848).
+  COGNETIVY_LOCAL_STUDIO_URL  Open this origin with ?session=… (e.g. http://localhost:5174 for Vite HMR). Vite proxies /ws and /api/local to the CLI. With cognetivy --dev, defaults to http://localhost:5174 unless set; COGNETIVY_USE_BUNDLED_STUDIO=1 opens the bundled UI on COGNETIVY_LOCAL_PORT instead.
+  COGNETIVY_OPEN_APP     Set to 0 or false to skip opening the browser.
+  COGNETIVY_EXECUTOR_LOG       Set to 0 or false to hide executor status lines on stderr (run phases, nodes, HITL; not agent tool output).
+  COGNETIVY_WORKFLOW_GENERATE_DEBUG  Set to 1 — stderr diagnostics for “Generate workflow” (marker counts, combinedLog, parse/validation, cloud create timing).
+  COGNETIVY_WORKFLOW_GENERATE_HEARTBEAT_SEC  Interval (seconds) for “agent still running …” lines while Generate workflow waits on the child (default 20; min 5).
+  COGNETIVY_CLAUDE_STREAM_JSON_IDLE_END_MS  Claude stream-json: ms of stdout silence after a COGNETIVY_* payload marker before closing stdin (default 6000) if the CLI never sends a terminal result line.
+  COGNETIVY_AGENT_COMBINED_LOG_MAX_CHARS  Max characters of merged agent stdout kept for marker parsing (default 1500000); when trimming, prefers retaining text from the last COGNETIVY_COLLECTION_JSON= / COGNETIVY_WORKFLOW_FILE_JSON=.
+  COGNETIVY_PARALLEL_ISOLATION copy (default) or none — per parallel PROMPT node, copy workspace into .cognetivy/exec-islands/<run>/<node>/ (skips node_modules, .git, dist, …) or share the parent cwd.
 
-Use \`cognetivy auth status\` to see current auth and URLs. Use \`--local\` on run/event to force local workspace when API key is set. Use \`--dev\` to point cloud at http://localhost:3000.
+Examples: \`cognetivy --dev\` (local API), \`cognetivy --api-url http://127.0.0.1:3000\`. Use \`cognetivy auth status\` to see resolved URLs.
 `);
 program.hook("preAction", () => {
     const opts = program.opts();
-    if (opts.dev) {
+    const trimmedApi = typeof opts.apiUrl === "string" ? opts.apiUrl.trim() : "";
+    if (trimmedApi) {
+        process.env.COGNETIVY_API_URL = trimmedApi.replace(/\/$/, "");
+    }
+    else if (opts.dev) {
         process.env.COGNETIVY_API_URL = DEV_API_URL;
         process.env.COGNETIVY_APP_URL = DEV_APP_URL;
+        const useBundledStudio = process.env.COGNETIVY_USE_BUNDLED_STUDIO === "1" ||
+            process.env.COGNETIVY_USE_BUNDLED_STUDIO === "true";
+        const existingStudioUrl = (process.env.COGNETIVY_LOCAL_STUDIO_URL ?? "").trim();
+        if (!useBundledStudio && !existingStudioUrl) {
+            process.env.COGNETIVY_LOCAL_STUDIO_URL = DEV_APP_URL;
+        }
     }
 });
 const authCmd = program
     .command("auth")
-    .description("Authentication and API key. Run with no subcommand to see: status, login, logout, whoami.");
+    .description("Authentication and API key. Run with no subcommand to see: status, login, logout, whoami.")
+    .addHelpText("after", `
+For a local Nest API, put global options first:  cognetivy --dev auth login
+or:  cognetivy --api-url http://localhost:3000 auth login
+`);
 authCmd
     .command("status")
     .description("Show whether cloud API key is set and which app/API URLs are used. Run with no options for human-readable output; use --json for machine-readable.")
@@ -203,7 +210,7 @@ authCmd
 });
 authCmd
     .command("login")
-    .description("Open the app in browser to sign in and authorize the CLI. Saves API key locally; no other options required.")
+    .description("Open the app (or local studio) to sign in and authorize the CLI. Saves API key locally. Use cognetivy --dev auth login to use http://localhost:3000.")
     .action(async () => {
     const appUrl = getCloudAppUrl();
     console.log("Opening browser to sign in and authorize the CLI…");
@@ -322,131 +329,21 @@ program
     .command("init")
     .description("Initialize .cognetivy workspace and run interactive skill installer (same as cognetivy install). Use --workspace-only to only create the workspace.")
     .option("--no-gitignore", "Do not add .gitignore snippet for runs/events/collections")
-    .option("--force", "Re-init: overwrite workflow pointer and default version if present")
+    .option("--force", "Passed to skill install when using the interactive installer (overwrite existing skills)")
     .option("--workspace-only", "Only create .cognetivy workspace; do not prompt for skill installation")
     .action(async (opts) => {
     const cwd = process.cwd();
     const noGitignore = opts.gitignore === false;
     if (opts.workspaceOnly) {
-        await ensureWorkspace(cwd, { force: opts.force, noGitignore });
+        await ensureMinimalWorkspace(cwd, { noGitignore });
         console.log("Initialized cognetivy workspace at .cognetivy/");
         return;
     }
     const { runInstallTUI } = await import("./install-tui.js");
     await runInstallTUI({ cwd, force: opts.force, init: true, noGitignore });
-    await launchLocalStudio(cwd);
-});
-program
-    .command("mode")
-    .description("Set or show default mode: Cloud (app + API) or Local (this machine only). Use with no options to switch interactively; --show for current state; --select for non-interactive.")
-    .option("--show", "Show current mode and workspace type (no prompt)")
-    .option("--json", "Output machine-readable JSON")
-    .option("--select <mode>", "Set mode without prompt (cloud | local). For scripts and tests.")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const showOnly = opts.show === true || opts.json === true;
-    const selectMode = opts.select === "cloud" || opts.select === "local" ? opts.select : null;
-    const hadWorkspace = await workspaceExists(cwd);
-    if (!hadWorkspace) {
-        if (showOnly) {
-            if (opts.json) {
-                console.log(JSON.stringify({ preferred_mode: null, workspace: "none", cloud_authenticated: await isCloudAuthenticated() }));
-            }
-            else {
-                console.log("No workspace. Run `cognetivy init` or `cognetivy mode` to create one and set mode.");
-            }
-            return;
-        }
-        if (selectMode) {
-            if (selectMode === "cloud") {
-                await ensureMinimalWorkspace(cwd);
-            }
-            else {
-                await ensureWorkspace(cwd, { force: false });
-            }
-            const indexAfter = await readWorkflowIndexOptional(cwd);
-            await writeWorkflowIndex({ ...(indexAfter ?? { current_workflow_id: "", workflows: [] }), preferred_mode: selectMode }, cwd);
-            console.log(`Default mode set to ${selectMode === "cloud" ? "Cloud" : "Local"}.`);
-            return;
-        }
-        // Interactive with no workspace: do not create yet; create only after user chooses below
-    }
-    const index = await readWorkflowIndexOptional(cwd);
-    const preferredMode = index?.preferred_mode ?? null;
-    const cloudAuthenticated = await isCloudAuthenticated();
-    const minimal = await isWorkspaceMinimal(cwd);
-    if (showOnly) {
-        if (opts.json) {
-            console.log(JSON.stringify({
-                preferred_mode: preferredMode,
-                workspace: minimal ? "minimal" : "full",
-                cloud_authenticated: cloudAuthenticated,
-            }));
-        }
-        else {
-            const modeLabel = preferredMode === "local" ? "Local" : preferredMode === "cloud" ? "Cloud" : isCloudMode() ? "Cloud (API key set)" : "Local (no API key)";
-            console.log(`Preferred mode: ${preferredMode ?? "not set"}`);
-            console.log(`Workspace: ${minimal ? "minimal (cloud-only)" : "full"}`);
-            console.log(`Cloud authenticated: ${cloudAuthenticated ? "yes" : "no"}`);
-            console.log(`Effective default: ${modeLabel}`);
-        }
-        return;
-    }
-    if (selectMode) {
-        const base = index ?? { current_workflow_id: "wf_default", workflows: [] };
-        await writeWorkflowIndex({ ...base, preferred_mode: selectMode }, cwd);
-        if (selectMode === "local" && minimal) {
-            await ensureWorkspace(cwd, { force: false });
-        }
-        console.log(`Default mode set to ${selectMode === "cloud" ? "Cloud" : "Local"}.`);
-        return;
-    }
-    if (!process.stdin.isTTY) {
-        console.error("Interactive terminal required. Use `cognetivy mode --show`, `cognetivy mode --json`, or `cognetivy mode --select <local|cloud>`.");
-        process.exit(1);
-    }
-    const currentLabel = preferredMode === "local"
-        ? "Local"
-        : preferredMode === "cloud"
-            ? cloudAuthenticated
-                ? "Cloud (signed in)"
-                : "Cloud (preferred, not signed in)"
-            : isCloudMode()
-                ? "Cloud (API key set)"
-                : "Local";
-    p.intro("cognetivy mode");
-    p.note(hadWorkspace ? `Current: ${currentLabel}. Workspace: ${minimal ? "minimal" : "full"}.` : "No workspace yet. Choose mode to create one.", "Current state");
-    p.note("Local: data stays in .cognetivy/ on this machine—you own it, view in Studio here.\nCloud: sign in once; view run status from anywhere (web or mobile browser) and work from anywhere.", "Local vs Cloud");
-    const choice = await p.select({
-        message: "Local or Cloud?",
-        options: [
-            { value: "cloud", label: "Cloud", hint: "View run status from anywhere (web or mobile browser)" },
-            { value: "local", label: "Local", hint: "Data in .cognetivy/ here; view in Studio on this machine" },
-        ],
-    });
-    if (p.isCancel(choice)) {
-        p.cancel("Cancelled.");
-        process.exit(0);
-    }
-    const selected = choice;
-    if (!hadWorkspace) {
-        if (selected === "cloud") {
-            await ensureMinimalWorkspace(cwd);
-        }
-        else {
-            await ensureWorkspace(cwd, { force: false });
-        }
-    }
-    const indexToWrite = await readWorkflowIndexOptional(cwd);
-    await writeWorkflowIndex({ ...(indexToWrite ?? { current_workflow_id: "", workflows: [] }), preferred_mode: selected }, cwd);
-    if (selected === "local" && (await isWorkspaceMinimal(cwd))) {
-        await ensureWorkspace(cwd, { force: false });
-        p.note("Full local workspace created (default workflow added).", "Local mode");
-    }
-    if (selected === "cloud" && !cloudAuthenticated) {
-        p.note("Run `cognetivy auth login` to sign in to the cloud.", "Tip");
-    }
-    p.outro(`Default mode set to ${selected === "cloud" ? "Cloud" : "Local"}.`);
+    const appUrl = getCloudAppUrl();
+    await openUrl(appUrl);
+    printOpenedUrlMessage(appUrl, { workflow: false });
 });
 const workflowCmd = program
     .command("workflow")
@@ -463,61 +360,34 @@ function filterWorkflowsByQuery(items, q) {
 }
 workflowCmd
     .command("list")
-    .description("List workflows (id, name, description only). From cloud when authenticated, else local .cognetivy. Add --q to filter by name/description.")
+    .description("List workflows (id, name, description only) from cloud. Add --q to filter by name/description.")
     .option("--q <query>", "Filter by name or description (search)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const orgId = await resolveCloudOrganizationId();
-        const list = await cloudListWorkflows(orgId, opts.q);
-        const out = list.map((w) => ({ id: w.id, name: w.name, description: w.description ?? undefined }));
-        console.log(JSON.stringify(out, null, 2));
-        return;
-    }
-    const cwd = process.cwd();
-    await requireWorkspace(cwd);
-    const workflows = await listWorkflows(cwd);
-    let out = workflows.map((w) => ({ id: w.workflow_id, name: w.name, description: w.description }));
-    if (opts.q)
-        out = filterWorkflowsByQuery(out, opts.q);
+    await requireCloudApiKey();
+    const orgId = await resolveCloudOrganizationId();
+    const list = await cloudListWorkflows(orgId, opts.q);
+    const out = list.map((w) => ({ id: w.id, name: w.name, description: w.description ?? undefined }));
     console.log(JSON.stringify(out, null, 2));
 });
 workflowCmd
     .command("search")
     .description("Search workflows by name or description (id, name, description only). Use only when the user asks to list or search workflows.")
     .option("--q <query>", "Search term (optional; omit to list all)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const orgId = await resolveCloudOrganizationId();
-        const list = await cloudListWorkflows(orgId, opts.q);
-        const out = list.map((w) => ({ id: w.id, name: w.name, description: w.description ?? undefined }));
-        console.log(JSON.stringify(out, null, 2));
-        return;
-    }
-    const cwd = process.cwd();
-    await requireWorkspace(cwd);
-    const workflows = await listWorkflows(cwd);
-    let out = workflows.map((w) => ({ id: w.workflow_id, name: w.name, description: w.description }));
-    if (opts.q)
-        out = filterWorkflowsByQuery(out, opts.q);
+    await requireCloudApiKey();
+    const orgId = await resolveCloudOrganizationId();
+    const list = await cloudListWorkflows(orgId, opts.q);
+    const out = list.map((w) => ({ id: w.id, name: w.name, description: w.description ?? undefined }));
     console.log(JSON.stringify(out, null, 2));
 });
 workflowCmd
     .command("create")
-    .description("Create a new workflow. Use --name for an empty workflow; --file <path> or stdin (omit both --name and --file, pipe payload) for one-call create with name/description/nodes/kinds.")
+    .description("Create a new workflow in cloud. Use --name for an empty workflow; --file <path> or stdin for one-call create with name/description/nodes/kinds.")
     .option("--name <string>", "Workflow name (required if no --file and not reading from stdin; overrides file/stdin name if both)")
     .option("--file <path>", "Path to JSON with name, description?, nodes?, kinds?; omit to read from stdin when --name not set)")
-    .option("--id <string>", "Workflow id (local only; default: generated)")
     .option("--description <string>", "Workflow description (overrides file/stdin if both)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
+    await requireCloudApiKey();
     const cwd = process.cwd();
     let raw;
     if (opts.file) {
@@ -545,60 +415,21 @@ workflowCmd
                 process.exit(1);
             }
         }
-        if (useCloud) {
-            const orgId = await resolveCloudOrganizationId();
-            const result = await cloudCreateWorkflowFull({
-                organizationId: orgId,
-                name,
-                description,
-                nodes: nodes.length > 0 ? nodes : undefined,
-                kinds,
-            });
-            console.log(result.id);
-            if (result.versionId) {
-                console.error(`Version: ${result.versionId}`);
-            }
-            await ensureWorkspace(cwd);
-            const index = await readWorkflowIndex(cwd);
-            await writeWorkflowIndex({ ...index, cloud_current_workflow_id: result.id }, cwd);
-            return;
-        }
-        await requireWorkspace(cwd);
-        const id = opts.id ?? generateId("wf");
-        const now = new Date().toISOString();
-        const wf = {
-            workflow_id: id,
+        const orgId = await resolveCloudOrganizationId();
+        const result = await cloudCreateWorkflowFull({
+            organizationId: orgId,
             name,
             description,
-            current_version_id: "v1",
-            created_at: now,
-        };
-        await writeWorkflowRecord(wf, cwd);
-        await writeWorkflowVersionRecord({
-            workflow_id: id,
-            version_id: "v1",
-            name: "v1",
-            created_at: now,
-            nodes: nodes,
-        }, cwd);
-        if (kinds && Object.keys(kinds).length > 0) {
-            const merged = { workflow_id: id, kinds: {} };
-            for (const [k, v] of Object.entries(kinds)) {
-                merged.kinds[k] = mergeKindTemplate(k, v);
-            }
-            await writeCollectionSchema(id, merged, cwd);
-        }
-        else {
-            const { createDefaultCollectionSchema } = await import("./default-collection-schema.js");
-            await writeCollectionSchema(id, createDefaultCollectionSchema(id), cwd);
+            nodes: nodes.length > 0 ? nodes : undefined,
+            kinds,
+        });
+        console.log(result.id);
+        if (result.versionId) {
+            console.error(`Version: ${result.versionId}`);
         }
+        await ensureMinimalWorkspace(cwd);
         const index = await readWorkflowIndex(cwd);
-        const next = {
-            ...index,
-            workflows: [...(index.workflows ?? []), { workflow_id: id, name: wf.name, description: wf.description, current_version_id: wf.current_version_id }],
-        };
-        await writeWorkflowIndex(next, cwd);
-        console.log(id);
+        await writeWorkflowIndex({ ...index, cloud_current_workflow_id: result.id }, cwd);
         return;
     }
     const name = opts.name;
@@ -606,153 +437,88 @@ workflowCmd
         console.error("Error: --name <string> is required when not using --file or stdin.");
         process.exit(1);
     }
-    if (useCloud) {
-        const orgId = await resolveCloudOrganizationId();
-        const workflow = await cloudCreateWorkflow({
-            organizationId: orgId,
-            name,
-            description: opts.description,
-        });
-        await cloudCreateWorkflowVersion(workflow.id, []);
-        console.log(workflow.id);
-        return;
-    }
-    await requireWorkspace(cwd);
-    const id = opts.id ?? generateId("wf");
-    const now = new Date().toISOString();
-    const wf = {
-        workflow_id: id,
+    const orgId = await resolveCloudOrganizationId();
+    const workflow = await cloudCreateWorkflow({
+        organizationId: orgId,
         name,
         description: opts.description,
-        current_version_id: "v1",
-        created_at: now,
-    };
-    await writeWorkflowRecord(wf, cwd);
-    await writeWorkflowVersionRecord({
-        workflow_id: id,
-        version_id: "v1",
-        name: "v1",
-        created_at: now,
-        nodes: [],
-    }, cwd);
-    const { createDefaultCollectionSchema } = await import("./default-collection-schema.js");
-    await writeCollectionSchema(id, createDefaultCollectionSchema(id), cwd);
-    const index = await readWorkflowIndex(cwd);
-    const next = {
-        ...index,
-        workflows: [...(index.workflows ?? []), { workflow_id: id, name: wf.name, description: wf.description, current_version_id: wf.current_version_id }],
-    };
-    await writeWorkflowIndex(next, cwd);
-    console.log(id);
+    });
+    await cloudCreateWorkflowVersion(workflow.id, []);
+    console.log(workflow.id);
 });
 workflowCmd
     .command("select")
-    .description("Select current workflow (updates workflows/index.json). Use --workflow <id>; add --cloud to set default for cloud. For agents, prefer passing --workflow explicitly on each command.")
+    .description("Set default cloud workflow id in .cognetivy/workflows/index.json. Workflow must exist on the server.")
     .requiredOption("--workflow <workflow_id>", "Workflow ID")
-    .option("--cloud", "Set as default workflow for cloud (persisted in index; workflow must exist on server)")
-    .option("--local", "Select from local workspace only (default if neither --cloud nor --local)")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    const useCloud = opts.cloud === true;
-    if (useCloud) {
-        try {
-            await cloudGetWorkflow(opts.workflow);
-        }
-        catch {
-            console.error(`Error: workflow "${opts.workflow}" not found on server.`);
-            process.exit(1);
-        }
-        await ensureWorkspace(cwd);
-        const index = await readWorkflowIndex(cwd);
-        await writeWorkflowIndex({ ...index, cloud_current_workflow_id: opts.workflow }, cwd);
-        console.log(opts.workflow);
-        return;
+    try {
+        await cloudGetWorkflow(opts.workflow);
     }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    if (!(index.workflows ?? []).some((w) => w.workflow_id === opts.workflow)) {
-        console.error(`Error: workflow "${opts.workflow}" not found.`);
+    catch {
+        console.error(`Error: workflow "${opts.workflow}" not found on server.`);
         process.exit(1);
     }
-    await writeWorkflowIndex({ ...index, current_workflow_id: opts.workflow }, cwd);
+    await ensureMinimalWorkspace(cwd);
+    const index = await readWorkflowIndex(cwd);
+    await writeWorkflowIndex({ ...index, cloud_current_workflow_id: opts.workflow }, cwd);
     console.log(opts.workflow);
 });
 workflowCmd
     .command("get")
     .description("Print a workflow version (nodes, etc.). Default: --workflow/--version omitted uses current workflow and latest version. Use --output-format yaml for fewer tokens.")
-    .option("--workflow <workflow_id>", "Workflow ID (default: current from workflows/index.json)")
-    .option("--version <version_id>", "Version ID (default: latest; cloud uses version uuid)")
+    .option("--workflow <workflow_id>", "Workflow ID (default: cloud_current_workflow_id or COGNETIVY_WORKFLOW_ID)")
+    .option("--version <version_id>", "Version ID (default: latest)")
     .option("--output-format <format>", "Output format: json or yaml", "json")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
-        if (!workflowId) {
-            console.error("Error: In cloud mode --workflow <id>, COGNETIVY_WORKFLOW_ID, or run `cognetivy workflow select --workflow <id> --cloud` is required.");
-            process.exit(1);
-        }
-        let versionId = opts.version;
+    const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
+    if (!workflowId) {
+        console.error("Error: --workflow <id>, COGNETIVY_WORKFLOW_ID, or `cognetivy workflow select --workflow <id>` is required.");
+        process.exit(1);
+    }
+    let versionId = opts.version;
+    if (!versionId) {
+        const versions = await cloudGetWorkflowVersions(workflowId);
+        versionId = versions[0]?.id;
         if (!versionId) {
-            const versions = await cloudGetWorkflowVersions(workflowId);
-            versionId = versions[0]?.id;
-            if (!versionId) {
-                console.error("No versions found for workflow.");
-                process.exit(1);
-            }
+            console.error("No versions found for workflow.");
+            process.exit(1);
         }
-        const version = await cloudGetWorkflowVersion(workflowId, versionId);
-        const outFormat = opts.outputFormat === "yaml" ? "yaml" : "json";
-        console.log(stringifyPayload(version, outFormat));
-        return;
     }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    const workflowId = opts.workflow ?? index.current_workflow_id;
-    const wf = await readWorkflowRecord(workflowId, cwd);
-    const versionId = opts.version ?? wf.current_version_id;
-    const version = await readWorkflowVersionRecord(workflowId, versionId, cwd);
+    const version = await cloudGetWorkflowVersion(workflowId, versionId);
     const outFormat = opts.outputFormat === "yaml" ? "yaml" : "json";
     console.log(stringifyPayload(version, outFormat));
 });
 workflowCmd
     .command("versions")
-    .description("List versions for a workflow. Default: --workflow omitted uses current workflow (index or COGNETIVY_WORKFLOW_ID). Output: version ids (and metadata in cloud).")
+    .description("List versions for a workflow. Default: --workflow omitted uses current workflow (index or COGNETIVY_WORKFLOW_ID).")
     .option("--workflow <workflow_id>", "Workflow ID (default: current or COGNETIVY_WORKFLOW_ID)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
-        if (!workflowId) {
-            console.error("Error: In cloud mode --workflow <id>, COGNETIVY_WORKFLOW_ID, or run `cognetivy workflow select --workflow <id> --cloud` is required.");
-            process.exit(1);
-        }
-        const versions = await cloudGetWorkflowVersions(workflowId);
-        console.log(JSON.stringify(versions, null, 2));
-        return;
+    const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
+    if (!workflowId) {
+        console.error("Error: --workflow <id>, COGNETIVY_WORKFLOW_ID, or `cognetivy workflow select --workflow <id>` is required.");
+        process.exit(1);
     }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    const workflowId = opts.workflow ?? index.current_workflow_id;
-    const ids = await listWorkflowVersionIds(workflowId, cwd);
-    console.log(JSON.stringify(ids, null, 2));
+    const versions = await cloudGetWorkflowVersions(workflowId);
+    console.log(JSON.stringify(versions, null, 2));
 });
 workflowCmd
     .command("templates")
-    .description("List or pick workflow templates. With TTY: interactive picker then apply. Use --list to print templates as JSON (no picker).")
+    .description("List or pick workflow templates. With TTY: interactive picker then create workflow in cloud. Use --list to print templates as JSON (no picker).")
     .option("--list", "Print templates JSON instead of interactive picker")
     .action(async (opts) => {
     const cwd = process.cwd();
-    await requireWorkspace(cwd);
+    await ensureMinimalWorkspace(cwd);
     if (opts.list || !process.stdin.isTTY) {
         console.log(JSON.stringify(listWorkflowTemplates(), null, 2));
         return;
     }
+    await requireCloudApiKey();
     const templates = listWorkflowTemplatesForPicker();
     const picked = await p.select({
         message: "Pick a workflow template",
@@ -767,16 +533,18 @@ workflowCmd
         process.exit(0);
     }
     const templateId = picked;
-    const result = await applyWorkflowTemplateToWorkspace({ cwd, templateId });
-    p.note(`Applied template \"${result.template.name}\"\nWorkflow: ${result.workflow.workflow_id}\nNow current: ${result.workflow.workflow_id}`, "Template applied");
+    const orgId = await resolveCloudOrganizationId();
+    const result = await applyWorkflowTemplateToCloud({ organizationId: orgId, templateId, cwd });
+    p.note(`Created workflow "${result.template.name}" (${result.workflowId}) in cloud.`, "Template applied");
     console.log(JSON.stringify({
         template_id: result.template.id,
-        workflow_id: result.workflow.workflow_id,
-        current_workflow_id: result.workflow.workflow_id,
-        version_id: result.version.version_id,
+        workflow_id: result.workflowId,
+        cloud_current_workflow_id: result.workflowId,
+        version_id: result.versionId,
     }, null, 2));
-    const studioUrl = `http://127.0.0.1:${STUDIO_DEFAULT_PORT}`;
-    openUrl(studioUrl).catch(() => { });
+    const appUrl = getCloudAppUrl();
+    await openUrl(appUrl);
+    printOpenedUrlMessage(appUrl, { workflow: true });
 });
 workflowCmd
     .command("template")
@@ -792,14 +560,14 @@ workflowCmd
 });
 workflowCmd
     .command("apply-template")
-    .description("Apply a built-in template: creates a new workflow and sets it current. Use --id to skip picker; omit for interactive template choice.")
+    .description("Create a workflow in cloud from a built-in template. Use --id to skip picker; omit for interactive template choice.")
     .option("--id <template_id>", "Template ID (omit for interactive picker)")
-    .option("--workflow <workflow_id>", "Workflow ID to create (default: wf_<template_id>)")
     .option("--name <string>", "Optional workflow name override")
     .option("--description <string>", "Optional workflow description override")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    await requireWorkspace(cwd);
+    await ensureMinimalWorkspace(cwd);
     let templateId = opts.id;
     if (!templateId) {
         if (!process.stdin.isTTY) {
@@ -822,18 +590,19 @@ workflowCmd
         templateId = picked;
     }
     try {
-        const result = await applyWorkflowTemplateToWorkspace({
-            cwd,
+        const orgId = await resolveCloudOrganizationId();
+        const result = await applyWorkflowTemplateToCloud({
+            organizationId: orgId,
             templateId,
-            workflowId: opts.workflow,
+            cwd,
             workflowName: opts.name,
             workflowDescription: opts.description,
         });
         console.log(JSON.stringify({
             template_id: result.template.id,
-            workflow_id: result.workflow.workflow_id,
-            current_workflow_id: result.workflow.workflow_id,
-            version_id: result.version.version_id,
+            workflow_id: result.workflowId,
+            cloud_current_workflow_id: result.workflowId,
+            version_id: result.versionId,
         }, null, 2));
     }
     catch (err) {
@@ -843,80 +612,40 @@ workflowCmd
 });
 workflowCmd
     .command("set")
-    .description("Set workflow version from file or stdin (creates new version). Use --file <path> or omit to read from stdin. Default --workflow uses current. Cloud when authenticated.")
+    .description("Set workflow version from file or stdin (creates new version in cloud). Use --file <path> or omit to read from stdin.")
     .option("--file <path>", "Path to workflow JSON file (must contain 'nodes' array); omit to read from stdin")
     .option("--workflow <workflow_id>", "Workflow ID (default: current or COGNETIVY_WORKFLOW_ID)")
-    .option("--name <string>", "Optional version name (local only)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
     const raw = opts.file
         ? await fs.readFile(path.resolve(cwd, opts.file), "utf-8")
         : await readPayloadFromFileOrStdin(undefined, cwd);
     const format = opts.file ? formatFromFilePath(opts.file) : "auto";
     const data = parsePayload(raw, format);
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
-        if (!workflowId) {
-            console.error("Error: In cloud mode --workflow <id>, COGNETIVY_WORKFLOW_ID, or run `cognetivy workflow select --workflow <id> --cloud` is required.");
-            process.exit(1);
-        }
-        const nodes = Array.isArray(data?.nodes) ? data.nodes : [];
-        const version = await cloudCreateWorkflowVersion(workflowId, nodes);
-        console.log(version.id);
-        return;
-    }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    const workflowId = opts.workflow ?? index.current_workflow_id;
-    const wf = await readWorkflowRecord(workflowId, cwd);
-    const existing = await listWorkflowVersionIds(workflowId, cwd);
-    const nums = existing.map((v) => parseInt(v.replace(/^v/, ""), 10)).filter((n) => !Number.isNaN(n));
-    const nextNum = Math.max(0, ...nums) + 1;
-    const newVersionId = `v${nextNum}`;
-    const dataRecord = data;
-    const version = {
-        ...dataRecord,
-        workflow_id: workflowId,
-        version_id: newVersionId,
-        name: opts.name,
-        created_at: new Date().toISOString(),
-        nodes: Array.isArray(dataRecord.nodes) ? dataRecord.nodes : [],
-    };
-    validateWorkflowVersion(version);
-    // Measure change remaining-1: require collection schema presence when setting a version with nodes.
-    const referencedKinds = getCollectionNamesFromNodes(version.nodes ?? []);
-    if (referencedKinds.length > 0) {
-        const schema = await readCollectionSchema(workflowId, cwd);
-        const missing = referencedKinds.filter((k) => k !== "run_input" && (schema.kinds?.[k]?.item_schema == null));
-        if (missing.length > 0) {
-            console.error(`Error: Collection schema (kinds) is required for all collections referenced in nodes. Missing kinds for: ${missing.join(", ")}. Add a "kinds" entry for each kind before setting this workflow version.`);
-            process.exit(1);
-        }
+    const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
+    if (!workflowId) {
+        console.error("Error: --workflow <id>, COGNETIVY_WORKFLOW_ID, or `cognetivy workflow select --workflow <id>` is required.");
+        process.exit(1);
     }
-    await writeWorkflowVersionRecord(version, cwd);
-    await writeWorkflowRecord({ ...wf, current_version_id: newVersionId }, cwd);
-    const workflows = (index.workflows ?? []).map((w) => w.workflow_id === workflowId ? { ...w, current_version_id: newVersionId } : w);
-    await writeWorkflowIndex({ ...index, workflows }, cwd);
-    console.log(newVersionId);
+    const nodes = Array.isArray(data?.nodes) ? data.nodes : [];
+    const version = await cloudCreateWorkflowVersion(workflowId, nodes);
+    console.log(version.id);
 });
 const runCmd = program
     .command("run")
     .description("Run lifecycle: start, status, step, complete. Run with no subcommand to see all. Every response includes COGNETIVY_NEXT_STEP when a node is in progress.");
 runCmd
     .command("start")
-    .description("Start a new run. Requires --input <path>, --input -, or --input-inline <json>; and --name. Prints run_id and COGNETIVY_NEXT_STEP. Default --workflow/--version use current.")
+    .description("Start a new run (cloud). Requires --input <path>, --input -, or --input-inline <json>; and --name. Prints run_id and COGNETIVY_NEXT_STEP.")
     .option("--input <path>", "Path to JSON file with run input, or '-' to read from stdin")
     .option("--input-inline <json>", "Run input as JSON string (alternative to --input; no file or stdin needed)")
     .option("--name <string>", "Human-readable name for the run (e.g. 'Q1 ideas exploration')")
     .option("--by <string>", "Actor (e.g. agent:cursor); defaults to config or 'cli'")
-    .option("--workflow <workflow_id>", "Workflow ID (default: current from workflows/index.json)")
-    .option("--version <version_id>", "Workflow version ID (default: workflow.current_version_id)")
-    .option("--cloud", "Use Cognetivy cloud API (default when COGNETIVY_API_KEY is set; see `cognetivy auth status`)")
-    .option("--local", "Use local .cognetivy workspace (overrides API key)")
+    .option("--workflow <workflow_id>", "Workflow ID (default: cloud_current_workflow_id or COGNETIVY_WORKFLOW_ID)")
+    .option("--version <version_id>", "Workflow version ID (default: latest on server)")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
     if (!opts.input && !opts.inputInline) {
         console.error("Error: Provide --input <path>, --input -, or --input-inline <json> for run input.");
@@ -943,488 +672,145 @@ runCmd
         }
     }
     const input = parsePayload(inputRaw, "auto");
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
-        if (!workflowId) {
-            console.error("Error: In cloud mode --workflow <id>, COGNETIVY_WORKFLOW_ID, or run `cognetivy workflow select --workflow <id> --cloud` is required.");
-            process.exit(1);
-        }
-        try {
-            const result = await cloudCreateRun({
-                workflowId,
-                workflowVersionId: opts.version,
-                name: opts.name,
-                input,
-            });
-            console.log(result.run_id);
-            console.log(`COGNETIVY_RUN_ID=${result.run_id}`);
-            const next = result.next_step;
-            const action = mapCloudActionToLocal(next.action);
-            console.log(formatNextStepLine(result.run_id, "RUNNING", { ...next, action }, result.current_node_id, result.current_node_ids));
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
+    const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
+    if (!workflowId) {
+        console.error("Error: --workflow <id>, COGNETIVY_WORKFLOW_ID, or `cognetivy workflow select --workflow <id>` is required.");
+        process.exit(1);
+    }
+    try {
+        const result = await cloudCreateRun({
+            workflowId,
+            workflowVersionId: opts.version,
+            name: opts.name,
+            input,
+        });
+        console.log(result.run_id);
+        console.log(`COGNETIVY_RUN_ID=${result.run_id}`);
+        const next = result.next_step;
+        const action = mapCloudActionToCliAction(next.action);
+        console.log(formatNextStepLine(result.run_id, "RUNNING", { ...next, action }, result.current_node_id, result.current_node_ids));
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
     }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    const workflowId = opts.workflow ?? index.current_workflow_id;
-    const wf = await readWorkflowRecord(workflowId, cwd);
-    const versionId = opts.version ?? wf.current_version_id;
-    const runId = generateId("run");
-    const by = opts.by ?? (await resolveBy(cwd));
-    const now = new Date().toISOString();
-    const runRecord = {
-        run_id: runId,
-        ...(opts.name && { name: opts.name }),
-        workflow_id: workflowId,
-        workflow_version_id: versionId,
-        status: "running",
-        input,
-        created_at: now,
-    };
-    await writeRunFile(runRecord, cwd);
-    const event = {
-        ts: now,
-        type: "run_started",
-        by,
-        data: { workflow_id: workflowId, workflow_version_id: versionId, input },
-    };
-    await appendEventLine(runId, event, cwd);
-    // Seed run_input collection item for collection→node flow.
-    const systemNodeId = "__system__";
-    const systemNodeResultId = generateId("node_result");
-    const nodeResult = {
-        node_result_id: systemNodeResultId,
-        run_id: runId,
-        workflow_id: workflowId,
-        workflow_version_id: versionId,
-        node_id: systemNodeId,
-        status: NodeResultStatus.Completed,
-        started_at: now,
-        completed_at: now,
-        output: JSON.stringify(input, null, 2),
-        writes: [{ kind: "run_input", item_ids: ["run_input"] }],
-    };
-    await writeNodeResult(runId, systemNodeId, nodeResult, cwd);
-    const runInputPayload = typeof input.name === "string" && input.name !== ""
-        ? input
-        : { name: "Run input", ...input };
-    await appendCollection(runId, "run_input", runInputPayload, { id: "run_input", created_by_node_id: systemNodeId, created_by_node_result_id: systemNodeResultId }, cwd);
-    console.log(runId);
-    console.log(`COGNETIVY_RUN_ID=${runId}`);
-    let { next_step, current_node_id, current_node_ids } = await getNextStep(runId, cwd);
-    if (next_step.action === "run_node" && next_step.node_id) {
-        await appendEventLine(runId, { ts: now, type: "step_started", by, data: { step: next_step.node_id, step_id: next_step.node_id } }, cwd);
-        await writeNodeResult(runId, next_step.node_id, {
-            node_result_id: generateId("node_result"),
-            run_id: runId,
-            workflow_id: workflowId,
-            workflow_version_id: versionId,
-            node_id: next_step.node_id,
-            status: NodeResultStatus.Started,
-            started_at: now,
-        }, cwd);
-        const after = await getNextStep(runId, cwd);
-        next_step = after.next_step;
-        current_node_id = after.current_node_id;
-        current_node_ids = after.current_node_ids;
-    }
-    console.log(formatNextStepLine(runId, "running", next_step, current_node_id, current_node_ids));
 });
 runCmd
     .command("complete")
     .description("Mark a run as completed (appends run_completed and persists status). Requires --run <id>. Run this after all nodes are done.")
     .requiredOption("--run <run_id>", "Run ID to mark complete")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    const useCloud = isCloudMode();
-    if (useCloud) {
-        try {
-            await cloudAppendEvents(opts.run, {
-                events: [{ type: "run_completed", by: await resolveBy(cwd), data: {} }],
-            });
-            const run = await cloudGetRun(opts.run);
-            console.log(`Run "${opts.run}" marked as completed.`);
-            console.log(formatNextStepLine(opts.run, run.status, { action: "done", hint: "Run finished." }));
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
+    try {
+        await cloudAppendEvents(opts.run, {
+            events: [{ type: "run_completed", by: await resolveBy(cwd), data: {} }],
+        });
+        const run = await cloudGetRun(opts.run);
+        console.log(`Run "${opts.run}" marked as completed.`);
+        console.log(formatNextStepLine(opts.run, run.status, { action: "done", hint: "Run finished." }));
     }
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
-    const by = await resolveBy(cwd);
-    const now = new Date().toISOString();
-    await appendEventLine(opts.run, { ts: now, type: "run_completed", by, data: {} }, cwd);
-    await updateRunFile(opts.run, { status: "completed" }, cwd);
-    console.log(`Run "${opts.run}" marked as completed.`);
-    console.log(formatNextStepLine(opts.run, "completed", { action: "done", hint: "Run finished." }));
 });
 runCmd
     .command("status")
-    .description("Show run metadata, node completion status, and collection counts. Requires --run <id>. Use --json for machine-readable output including next_step.")
+    .description("Show run metadata and next_step from cloud. Requires --run <id>. Use --json for machine-readable output.")
     .requiredOption("--run <run_id>", "Run ID")
     .option("--json", "Output as JSON")
-    .option("--cloud", "Use Cognetivy cloud API (default when COGNETIVY_API_KEY is set; see `cognetivy auth status`)")
-    .option("--local", "Use local .cognetivy workspace (overrides API key)")
     .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            const [run, nextData] = await Promise.all([cloudGetRun(opts.run), cloudGetNext(opts.run)]);
-            const next = nextData.next_step;
-            const action = mapCloudActionToLocal(next.action);
-            const next_step = { ...next, action };
-            if (opts.json) {
-                console.log(JSON.stringify({ run: { id: run.id, status: run.status, workflowId: run.workflowId }, next_step, current_node_id: nextData.current_node_id, current_node_ids: nextData.current_node_ids }, null, 2));
-                return;
-            }
-            console.log("Run:", run.id, run.status, `(${run.workflowId})`);
-            if (nextData.current_node_ids?.length)
-                console.log("Current nodes (in progress):", nextData.current_node_ids.join(", "));
-            else if (nextData.current_node_id)
-                console.log("Current node (in progress):", nextData.current_node_id);
-            console.log(formatNextStepLine(run.id, run.status, next_step, nextData.current_node_id, nextData.current_node_ids));
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
-    }
-    const cwd = process.cwd();
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
-        process.exit(1);
-    }
-    const run = await readRunFile(opts.run, cwd);
-    let version = null;
+    await requireCloudApiKey();
     try {
-        version = await readWorkflowVersionRecord(run.workflow_id, run.workflow_version_id, cwd);
-    }
-    catch {
-        // workflow version missing
-    }
-    const nodeResults = await listNodeResults(opts.run, cwd);
-    const nodeResultByNodeId = new Map(nodeResults.map((r) => [r.node_id, r]));
-    const kinds = await listCollectionKindsForRun(opts.run, cwd);
-    const collections = [];
-    for (const kind of kinds) {
-        const store = await readCollections(opts.run, kind, cwd);
-        collections.push({ kind, item_count: store.items.length });
-    }
-    const nodesList = [];
-    if (version?.nodes) {
-        for (const node of version.nodes) {
-            const nr = nodeResultByNodeId.get(node.id);
-            nodesList.push({
-                node_id: node.id,
-                status: nr?.status ?? "-",
-                completed_at: nr?.completed_at,
-            });
+        const [run, nextData] = await Promise.all([cloudGetRun(opts.run), cloudGetNext(opts.run)]);
+        const next = nextData.next_step;
+        const action = mapCloudActionToCliAction(next.action);
+        const next_step = { ...next, action };
+        if (opts.json) {
+            console.log(JSON.stringify({
+                run: { id: run.id, status: run.status, workflowId: run.workflowId },
+                next_step,
+                current_node_id: nextData.current_node_id,
+                current_node_ids: nextData.current_node_ids,
+            }, null, 2));
+            return;
         }
-    }
-    // Include __system__ if we have a result for it but it's not in workflow nodes
-    if (nodeResultByNodeId.has("__system__") && version?.nodes && !version.nodes.some((n) => n.id === "__system__")) {
-        const nr = nodeResultByNodeId.get("__system__");
-        nodesList.unshift({ node_id: "__system__", status: nr.status, completed_at: nr.completed_at });
-    }
-    const { next_step, current_node_id, current_node_ids } = await getNextStep(opts.run, cwd);
-    const runSummary = {
-        run_id: run.run_id,
-        status: run.status,
-        name: run.name,
-        workflow_id: run.workflow_id,
-        workflow_version_id: run.workflow_version_id,
-        ...(current_node_id !== undefined && { current_node_id, current_node_status: "in_progress" }),
-        ...(current_node_ids !== undefined && current_node_ids.length > 0 && { current_node_ids }),
-    };
-    if (opts.json) {
-        console.log(JSON.stringify({ run: runSummary, nodes: nodesList, collections, next_step, ...(current_node_id !== undefined && { current_node_id }), ...(current_node_ids !== undefined && current_node_ids.length > 0 && { current_node_ids }) }, null, 2));
-        return;
-    }
-    console.log("Run:", run.run_id, run.status, run.name ? `"${run.name}"` : "", `(${run.workflow_id} @ ${run.workflow_version_id})`);
-    if (current_node_ids !== undefined && current_node_ids.length > 0) {
-        console.log("Current nodes (in progress):", current_node_ids.join(", "));
-    }
-    else if (current_node_id !== undefined) {
-        console.log("Current node (in progress):", current_node_id);
-    }
-    if (nodesList.length > 0) {
-        console.log("Nodes:");
-        for (const n of nodesList) {
-            const at = n.completed_at ? ` @ ${n.completed_at}` : "";
-            console.log(`  ${n.node_id}: ${n.status}${at}`);
+        console.log("Run:", run.id, run.status, `(${run.workflowId})`);
+        if (nextData.current_node_ids?.length) {
+            console.log("Current nodes (in progress):", nextData.current_node_ids.join(", "));
         }
-    }
-    else if (!version) {
-        console.log("Nodes: (workflow version unavailable)");
-    }
-    if (collections.length > 0) {
-        console.log("Collections:");
-        for (const c of collections) {
-            console.log(`  ${c.kind}: ${c.item_count} item(s)`);
+        else if (nextData.current_node_id) {
+            console.log("Current node (in progress):", nextData.current_node_id);
         }
+        console.log(formatNextStepLine(run.id, run.status, next_step, nextData.current_node_id, nextData.current_node_ids));
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
     }
-    console.log(formatNextStepLine(run.run_id, run.status, next_step, current_node_id, current_node_ids));
 });
 runCmd
     .command("step")
-    .description("Advance run: run with only --run <id> to start the next node; add --node <id> and --collection-kind with --collection-file <path> (or stdin) to complete a node. Prefer --collection-file to avoid shell prompts in agents. Prints COGNETIVY_NEXT_STEP.")
+    .description("Advance run (cloud): run with only --run <id> to start the next node; add --node <id> and --collection-kind with --collection-file <path> (or stdin) to complete a node.")
     .requiredOption("--run <run_id>", "Run ID")
     .option("--node <node_id>", "Node ID (required when completing a node with payload)")
     .option("--collection-kind <kind>", "Collection kind when completing node (payload from --collection-file or stdin)")
-    .option("--collection-file <path>", "Path to JSON/YAML payload file (omit to read from stdin; prefer this in agents to avoid heredocs)")
-    .option("--collection-mode <mode>", "set (array) or append (single object); default: infer", "infer")
-    .option("--by <string>", "Actor; defaults to config or 'cli'")
-    .option("--cloud", "Use Cognetivy cloud API (default when COGNETIVY_API_KEY is set; see `cognetivy auth status`)")
-    .option("--local", "Use local .cognetivy workspace (overrides API key)")
+    .option("--collection-file <path>", "Path to JSON/YAML payload file (omit to read from stdin)")
     .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            if (opts.node !== undefined) {
-                const body = {};
-                if (opts.collectionKind) {
-                    const raw = await readPayloadFromFileOrStdin(opts.collectionFile, process.cwd());
-                    body.collectionKind = opts.collectionKind;
-                    body.collectionPayload = parsePayload(raw, "auto");
-                }
-                const result = await cloudCompleteNode(opts.run, opts.node, body);
-                const next = result.next_step;
-                const action = mapCloudActionToLocal(next.action);
-                console.log(formatNextStepLine(opts.run, "running", { ...next, action }, result.current_node_id, result.current_node_ids));
-            }
-            else {
-                const nextData = await cloudGetNext(opts.run);
-                const next = nextData.next_step;
-                const action = mapCloudActionToLocal(next.action);
-                if (action === "run_node" && next.node_id) {
-                    const result = await cloudStartNode(opts.run, next.node_id);
-                    const rNext = result.next_step;
-                    const rAction = mapCloudActionToLocal(rNext.action);
-                    console.log(formatNextStepLine(opts.run, "running", { ...rNext, action: rAction }, result.current_node_id, result.current_node_ids));
-                }
-                else if (action === "run_nodes_parallel" && next.runnable_node_ids?.length) {
-                    for (const nodeId of next.runnable_node_ids) {
-                        await cloudStartNode(opts.run, nodeId);
-                    }
-                    const after = await cloudGetNext(opts.run);
-                    const afterAction = mapCloudActionToLocal(after.next_step.action);
-                    console.log(formatNextStepLine(opts.run, "running", { ...after.next_step, action: afterAction }, after.current_node_id, after.current_node_ids));
-                }
-                else {
-                    console.log(formatNextStepLine(opts.run, "running", { ...next, action }, nextData.current_node_id, nextData.current_node_ids));
-                }
-            }
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
-    }
-    const cwd = process.cwd();
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
-        process.exit(1);
-    }
-    const run = await readRunFile(opts.run, cwd);
-    if (run.status !== "running") {
-        console.error(`Error: Run is not running (status: ${run.status}).`);
-        process.exit(1);
-    }
-    const by = opts.by ?? (await resolveBy(cwd));
-    const now = new Date().toISOString();
-    if (opts.node !== undefined) {
-        const nodeId = opts.node;
-        const existingResult = await readNodeResult(opts.run, nodeId, cwd);
-        // Replace semantics (B2): if this node was completed before and we are completing it again
-        // with new collection output, delete the previous output items created by that node result.
-        let priorItemIds = [];
-        if (existingResult?.writes != null && Array.isArray(existingResult.writes)) {
-            for (const w of existingResult.writes) {
-                const itemIdsMaybe = w && typeof w === "object" ? w.item_ids : undefined;
-                if (Array.isArray(itemIdsMaybe)) {
-                    for (const id of itemIdsMaybe) {
-                        if (typeof id === "string" && id.trim() !== "")
-                            priorItemIds.push(id);
-                    }
-                }
+    await requireCloudApiKey();
+    try {
+        if (opts.node !== undefined) {
+            const body = {};
+            if (opts.collectionKind) {
+                const raw = await readPayloadFromFileOrStdin(opts.collectionFile, process.cwd());
+                body.collectionKind = opts.collectionKind;
+                body.collectionPayload = parsePayload(raw, "auto");
             }
+            const result = await cloudCompleteNode(opts.run, opts.node, body);
+            const next = result.next_step;
+            const action = mapCloudActionToCliAction(next.action);
+            console.log(formatNextStepLine(opts.run, "running", { ...next, action }, result.current_node_id, result.current_node_ids));
         }
-        if (!opts.collectionKind && !existingResult) {
-            await appendEventLine(opts.run, { ts: now, type: "step_started", by, data: { step: nodeId, step_id: nodeId } }, cwd);
-            await writeNodeResult(opts.run, nodeId, {
-                node_result_id: generateId("node_result"),
-                run_id: opts.run,
-                workflow_id: run.workflow_id,
-                workflow_version_id: run.workflow_version_id,
-                node_id: nodeId,
-                status: NodeResultStatus.Started,
-                started_at: now,
-            }, cwd);
-            const { next_step: afterStep, current_node_id: afterCurrent, current_node_ids: afterIds } = await getNextStep(opts.run, cwd);
-            const runAfter = await readRunFile(opts.run, cwd);
-            console.log(formatNextStepLine(runAfter.run_id, runAfter.status, afterStep, afterCurrent, afterIds));
-            return;
-        }
-        if (!existingResult || existingResult.status !== "started") {
-            const startedAt = new Date().toISOString();
-            await appendEventLine(opts.run, { ts: startedAt, type: "step_started", by, data: { step: nodeId, step_id: nodeId } }, cwd);
-            await writeNodeResult(opts.run, nodeId, {
-                node_result_id: generateId("node_result"),
-                run_id: opts.run,
-                workflow_id: run.workflow_id,
-                workflow_version_id: run.workflow_version_id,
-                node_id: nodeId,
-                status: NodeResultStatus.Started,
-                started_at: startedAt,
-            }, cwd);
-        }
-        const nodeResultId = generateId("node_result");
-        if (opts.collectionKind) {
-            if (priorItemIds.length > 0) {
-                await deleteCollectionItemsByIds(opts.run, priorItemIds, cwd);
+        else {
+            const nextData = await cloudGetNext(opts.run);
+            const next = nextData.next_step;
+            const action = mapCloudActionToCliAction(next.action);
+            if (action === "run_node" && next.node_id) {
+                const result = await cloudStartNode(opts.run, next.node_id);
+                const rNext = result.next_step;
+                const rAction = mapCloudActionToCliAction(rNext.action);
+                console.log(formatNextStepLine(opts.run, "running", { ...rNext, action: rAction }, result.current_node_id, result.current_node_ids));
             }
-            const raw = await readPayloadFromFileOrStdin(opts.collectionFile, cwd);
-            const payload = parsePayload(raw, "auto");
-            const mode = opts.collectionMode === "set" || opts.collectionMode === "append" ? opts.collectionMode : Array.isArray(payload) ? "set" : "append";
-            const writes = [];
-            if (mode === "set") {
-                const payloads = payload.map((p, i) => ({
-                    ...p,
-                    id: p.id ?? `${opts.collectionKind}_${i}`,
-                }));
-                await writeCollections(opts.run, opts.collectionKind, payloads, { created_by_node_id: nodeId, created_by_node_result_id: nodeResultId }, cwd);
-                writes.push({ kind: opts.collectionKind, item_ids: payloads.map((p) => p.id) });
+            else if (action === "run_nodes_parallel" && next.runnable_node_ids?.length) {
+                for (const nodeId of next.runnable_node_ids) {
+                    await cloudStartNode(opts.run, nodeId);
+                }
+                const after = await cloudGetNext(opts.run);
+                const afterAction = mapCloudActionToCliAction(after.next_step.action);
+                console.log(formatNextStepLine(opts.run, "running", { ...after.next_step, action: afterAction }, after.current_node_id, after.current_node_ids));
             }
             else {
-                const item = await appendCollection(opts.run, opts.collectionKind, payload, { created_by_node_id: nodeId, created_by_node_result_id: nodeResultId }, cwd);
-                writes.push({ kind: opts.collectionKind, item_ids: [item.id] });
+                console.log(formatNextStepLine(opts.run, "running", { ...next, action }, nextData.current_node_id, nextData.current_node_ids));
             }
-            const result = {
-                node_result_id: nodeResultId,
-                run_id: opts.run,
-                workflow_id: run.workflow_id,
-                workflow_version_id: run.workflow_version_id,
-                node_id: nodeId,
-                status: NodeResultStatus.Completed,
-                started_at: now,
-                completed_at: now,
-                writes,
-            };
-            await writeNodeResult(opts.run, nodeId, result, cwd);
-            await appendEventLine(opts.run, { ts: now, type: "step_completed", by, data: { step: nodeId, step_id: nodeId } }, cwd);
-        }
-        else {
-            await writeNodeResult(opts.run, nodeId, {
-                node_result_id: nodeResultId,
-                run_id: opts.run,
-                workflow_id: run.workflow_id,
-                workflow_version_id: run.workflow_version_id,
-                node_id: nodeId,
-                status: NodeResultStatus.Completed,
-                started_at: now,
-                completed_at: now,
-            }, cwd);
-            await appendEventLine(opts.run, { ts: now, type: "step_completed", by, data: { step: nodeId, step_id: nodeId } }, cwd);
         }
     }
-    else {
-        const { next_step: ns } = await getNextStep(opts.run, cwd);
-        if (ns.action === "run_nodes_parallel" && ns.runnable_node_ids?.length) {
-            for (const nodeId of ns.runnable_node_ids) {
-                const existing = await readNodeResult(opts.run, nodeId, cwd);
-                if (!existing || existing.status !== NodeResultStatus.Started) {
-                    await appendEventLine(opts.run, { ts: now, type: "step_started", by, data: { step: nodeId, step_id: nodeId } }, cwd);
-                    await writeNodeResult(opts.run, nodeId, {
-                        node_result_id: generateId("node_result"),
-                        run_id: opts.run,
-                        workflow_id: run.workflow_id,
-                        workflow_version_id: run.workflow_version_id,
-                        node_id: nodeId,
-                        status: NodeResultStatus.Started,
-                        started_at: now,
-                    }, cwd);
-                }
-            }
-            const runAfter = await readRunFile(opts.run, cwd);
-            console.log(formatNextStepLine(runAfter.run_id, runAfter.status, ns, undefined, ns.runnable_node_ids));
-            return;
-        }
-        if (ns.action === "run_node" && ns.node_id) {
-            const nodeResultId = generateId("node_result");
-            await appendEventLine(opts.run, { ts: now, type: "step_started", by, data: { step: ns.node_id, step_id: ns.node_id } }, cwd);
-            await writeNodeResult(opts.run, ns.node_id, {
-                node_result_id: nodeResultId,
-                run_id: opts.run,
-                workflow_id: run.workflow_id,
-                workflow_version_id: run.workflow_version_id,
-                node_id: ns.node_id,
-                status: NodeResultStatus.Started,
-                started_at: now,
-            }, cwd);
-        }
-    }
-    let { next_step, current_node_id, current_node_ids } = await getNextStep(opts.run, cwd);
-    if (next_step.action === "run_node" && next_step.node_id) {
-        await appendEventLine(opts.run, { ts: now, type: "step_started", by, data: { step: next_step.node_id, step_id: next_step.node_id } }, cwd);
-        await writeNodeResult(opts.run, next_step.node_id, {
-            node_result_id: generateId("node_result"),
-            run_id: opts.run,
-            workflow_id: run.workflow_id,
-            workflow_version_id: run.workflow_version_id,
-            node_id: next_step.node_id,
-            status: NodeResultStatus.Started,
-            started_at: now,
-        }, cwd);
-        const after = await getNextStep(opts.run, cwd);
-        next_step = after.next_step;
-        current_node_id = after.current_node_id;
-        current_node_ids = after.current_node_ids;
-    }
-    const runAfter = await readRunFile(opts.run, cwd);
-    console.log(formatNextStepLine(runAfter.run_id, runAfter.status, next_step, current_node_id, current_node_ids));
-});
-runCmd
-    .command("set-name")
-    .description("Set or update the human-readable name for an existing run. Requires --run <id> and --name <string>.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .requiredOption("--name <string>", "Name for the run")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
-    await updateRunFile(opts.run, { name: opts.name }, cwd);
-    console.log(`Run "${opts.run}" named "${opts.name}".`);
 });
 const eventCmd = program
     .command("event")
     .description("Event log operations (low-level). Run with no subcommand to see: append. Prefer run complete for ending runs.");
 eventCmd
     .command("append")
-    .description("Append one event to run's log. Omit --file to read JSON from stdin. For run_completed, prefer 'cognetivy run complete --run <id>' which does both.")
+    .description("Append one event to run's log (cloud). Omit --file to read JSON from stdin. For run_completed, prefer 'cognetivy run complete --run <id>'.")
     .requiredOption("--run <run_id>", "Run ID")
     .option("--file <path>", "Path to JSON file (omit to read event from stdin)")
     .option("--by <string>", "Actor; defaults to config or 'cli'")
-    .option("--cloud", "Use Cognetivy cloud API (default when COGNETIVY_API_KEY is set; see `cognetivy auth status`)")
-    .option("--local", "Use local .cognetivy workspace (overrides API key)")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
     const raw = await readPayloadFromFileOrStdin(opts.file, cwd);
     const format = opts.file ? formatFromFilePath(opts.file) : "auto";
@@ -1437,57 +823,43 @@ eventCmd
         by: data.by ?? by,
         data: data.data ?? data,
     };
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            const result = await cloudAppendEvents(opts.run, {
-                events: [{ type: event.type, by: event.by, data: event.data }],
-            });
-            console.log(`Appended ${result.appended} event(s).`);
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
+    try {
+        const result = await cloudAppendEvents(opts.run, {
+            events: [{ type: event.type, by: event.by, data: event.data }],
+        });
+        console.log(`Appended ${result.appended} event(s).`);
     }
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found. Run \`cognetivy run start\` first.`);
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
-    await appendEventLine(opts.run, event, cwd);
-    if (event.type === "run_completed") {
-        await updateRunFile(opts.run, { status: "completed" }, cwd);
-    }
-    console.log("Appended event.");
 });
 const collectionSchemaCmd = program
     .command("collection-schema")
     .description("Collection schema (workflow-scoped; kinds and item_schema). Used when creating/editing workflows; run get/set with --workflow.");
 collectionSchemaCmd
     .command("get")
-    .description("Print collection schema JSON for a workflow. Use --run to resolve workflow from a run; --kind to print only one kind.")
-    .option("--workflow <workflow_id>", "Workflow ID (default: current from workflows/index.json)")
+    .description("Print collection schema JSON for a workflow (cloud). Use --run to resolve workflow from a run; --kind to print only one kind.")
+    .option("--workflow <workflow_id>", "Workflow ID (default: cloud_current_workflow_id or COGNETIVY_WORKFLOW_ID)")
     .option("--run <run_id>", "Run ID (resolve workflow from this run; overrides --workflow)")
     .option("--kind <kind>", "Print only this collection kind's schema")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
-    await requireWorkspace(cwd);
     let workflowId;
     if (opts.run) {
-        const run = await readRunFile(opts.run, cwd);
-        workflowId = run.workflow_id;
+        const run = await cloudGetRun(opts.run);
+        workflowId = run.workflowId;
     }
     else {
-        const index = await readWorkflowIndex(cwd);
-        workflowId = opts.workflow ?? index.current_workflow_id ?? "";
+        const resolved = await resolveCloudWorkflowId(cwd, opts.workflow);
+        workflowId = resolved ?? "";
     }
     if (!workflowId) {
-        console.error("Error: specify --workflow <id>, --run <run_id>, or set current workflow (workflows/index.json).");
+        console.error("Error: specify --workflow <id>, --run <run_id>, or set default with workflow select.");
         process.exit(1);
     }
-    const schema = await readCollectionSchema(workflowId, cwd);
+    const schema = await cloudGetCollectionSchema(workflowId);
     if (opts.kind) {
         const kindSchema = schema.kinds?.[opts.kind];
         if (kindSchema == null) {
@@ -1502,12 +874,11 @@ collectionSchemaCmd
 });
 collectionSchemaCmd
     .command("set")
-    .description("Set collection schema from JSON file. Requires --file <path>. Default --workflow uses current. Cloud when authenticated.")
+    .description("Set collection schema from JSON file (cloud). Requires --file <path>.")
     .requiredOption("--file <path>", "Path to collection-schema JSON file")
-    .option("--workflow <workflow_id>", "Workflow ID (default: current from workflows/index.json)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
+    .option("--workflow <workflow_id>", "Workflow ID (default: current cloud workflow)")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const cwd = process.cwd();
     const raw = await fs.readFile(path.resolve(cwd, opts.file), "utf-8");
     const schema = parsePayload(raw, formatFromFilePath(opts.file));
@@ -1515,340 +886,160 @@ collectionSchemaCmd
         console.error("Error: schema must have a 'kinds' object.");
         process.exit(1);
     }
-    const useCloud = await resolveUseCloud(cwd, opts);
-    if (useCloud) {
-        const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
-        if (!workflowId) {
-            console.error("Error: In cloud mode --workflow <id>, COGNETIVY_WORKFLOW_ID, or run `cognetivy workflow select --workflow <id> --cloud` is required.");
-            process.exit(1);
-        }
-        const kinds = {};
-        for (const [k, v] of Object.entries(schema.kinds)) {
-            const merged = mergeKindTemplate(k, v);
-            kinds[k] = { name: merged.name, description: merged.description, item_schema: merged.item_schema };
-        }
-        await cloudSetCollectionSchema(workflowId, kinds);
-        console.log("Collection schema updated.");
-        return;
+    const workflowId = await resolveCloudWorkflowId(cwd, opts.workflow);
+    if (!workflowId) {
+        console.error("Error: --workflow <id>, COGNETIVY_WORKFLOW_ID, or `cognetivy workflow select --workflow <id>` is required.");
+        process.exit(1);
     }
-    await requireWorkspace(cwd);
-    const index = await readWorkflowIndex(cwd);
-    const workflowId = opts.workflow ?? index.current_workflow_id;
-    const merged = { workflow_id: workflowId, kinds: {} };
+    const kinds = {};
     for (const [k, v] of Object.entries(schema.kinds)) {
-        merged.kinds[k] = mergeKindTemplate(k, v);
+        const merged = mergeKindTemplate(k, v);
+        kinds[k] = { name: merged.name, description: merged.description, item_schema: merged.item_schema };
     }
-    await writeCollectionSchema(workflowId, merged, cwd);
+    await cloudSetCollectionSchema(workflowId, kinds);
     console.log("Collection schema updated.");
 });
 const collectionCmd = program
     .command("collection")
-    .description("Structured collections per run (schema-backed). Run with no subcommand to see: list, get, set, append. Used by run step when completing nodes.");
+    .description("Structured collections per run (cloud). Subcommands: list, get.");
 collectionCmd
     .command("list")
-    .description("List collection kinds that have data for a run. Requires --run <id>. Cloud when authenticated.")
+    .description("List collection kinds that have data for a run. Requires --run <id>.")
     .requiredOption("--run <run_id>", "Run ID")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
-    const cwd = process.cwd();
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            const result = await cloudListCollectionKinds(opts.run);
-            console.log(JSON.stringify(result.kinds, null, 2));
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
+    await requireCloudApiKey();
+    try {
+        const result = await cloudListCollectionKinds(opts.run);
+        console.log(JSON.stringify(result.kinds, null, 2));
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
     }
-    const kinds = await listCollectionKindsForRun(opts.run, cwd);
-    console.log(JSON.stringify(kinds, null, 2));
 });
 collectionCmd
     .command("get")
-    .description("Get all items of a collection kind for a run. Requires --run <id> and --kind or --collection (e.g. run_input, sources).")
+    .description("Get all items of a collection kind for a run. Requires --run <id> and --kind or --collection.")
     .requiredOption("--run <run_id>", "Run ID")
-    .option("--kind <kind>", "Collection kind (e.g. sources, ideas, run_input)")
+    .option("--kind <kind>", "Collection kind (e.g. sources, run_input)")
     .option("--collection <kind>", "Collection kind (alias for --kind)")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
     .action(async (opts) => {
+    await requireCloudApiKey();
     const kind = opts.kind ?? opts.collection;
     if (!kind) {
         console.error("Error: required option --kind <kind> or --collection <kind> not specified.");
         process.exit(1);
     }
-    const cwd = process.cwd();
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            const result = await cloudGetCollectionItems(opts.run, kind);
-            console.log(JSON.stringify(result, null, 2));
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
-    }
-    const store = await readCollections(opts.run, kind, cwd);
-    console.log(JSON.stringify(store, null, 2));
-});
-collectionCmd
-    .command("set")
-    .description("Replace all items of a kind for a run. Requires --run, --kind, --node, --node-result. Omit --file to read from stdin.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .requiredOption("--kind <kind>", "Collection kind")
-    .option("--file <path>", "Path to JSON file (omit to read array from stdin)")
-    .requiredOption("--node <node_id>", "Node id that created these items")
-    .requiredOption("--node-result <node_result_id>", "Node result id that created these items")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const raw = await readPayloadFromFileOrStdin(opts.file, cwd);
-    const format = opts.file ? formatFromFilePath(opts.file) : "auto";
-    const payloads = parsePayload(raw, format);
-    if (!Array.isArray(payloads)) {
-        console.error("Error: file must contain a JSON or YAML array of collection items.");
-        process.exit(1);
-    }
-    await writeCollections(opts.run, opts.kind, payloads, { created_by_node_id: opts.node, created_by_node_result_id: opts.nodeResult }, cwd);
-    console.log(`Set ${payloads.length} collection(s) for kind "${opts.kind}".`);
-});
-collectionCmd
-    .command("append")
-    .description("Append one collection item to a run's kind. Requires --run, --kind, --node, --node-result. Omit --file to read from stdin.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .requiredOption("--kind <kind>", "Collection kind")
-    .option("--file <path>", "Path to JSON file (omit to read payload from stdin)")
-    .requiredOption("--node <node_id>", "Node id that created this item")
-    .requiredOption("--node-result <node_result_id>", "Node result id that created this item")
-    .option("--id <string>", "Optional collection id")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const raw = await readPayloadFromFileOrStdin(opts.file, cwd);
-    const format = opts.file ? formatFromFilePath(opts.file) : "auto";
-    const payload = parsePayload(raw, format);
-    const item = await appendCollection(opts.run, opts.kind, payload, { id: opts.id, created_by_node_id: opts.node, created_by_node_result_id: opts.nodeResult }, cwd);
-    console.log(JSON.stringify(item, null, 2));
-});
-const nodeResultCmd = program
-    .command("node-result")
-    .description("Node results per run (stored snapshots of node outputs). Low-level; prefer run step / node complete for agent flow.");
-nodeResultCmd
-    .command("list")
-    .description("List node results for a run. Requires --run <id>.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const results = await listNodeResults(opts.run, cwd);
-    console.log(JSON.stringify(results, null, 2));
-});
-nodeResultCmd
-    .command("get")
-    .description("Get node result for a node in a run. Requires --run <id> and --node <node_id>.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .requiredOption("--node <node_id>", "Node ID")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const result = await readNodeResult(opts.run, opts.node, cwd);
-    if (!result) {
-        console.error("Not found.");
-        process.exit(1);
+    try {
+        const result = await cloudGetCollectionItems(opts.run, kind);
+        console.log(JSON.stringify(result, null, 2));
     }
-    console.log(JSON.stringify(result, null, 2));
-});
-nodeResultCmd
-    .command("set")
-    .description("Create or replace a node result for a node in a run. Requires --run, --node, --status; optional --output/--output-file.")
-    .requiredOption("--run <run_id>", "Run ID")
-    .requiredOption("--node <node_id>", "Node ID")
-    .requiredOption("--status <status>", "Status: started|completed|failed|needs_human")
-    .option("--id <node_result_id>", "Node result id (default: generated)")
-    .option("--output-file <path>", "Path to a text/markdown file for output")
-    .option("--output <string>", "Inline output text")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const run = await readRunFile(opts.run, cwd);
-    const now = new Date().toISOString();
-    const status = opts.status;
-    const validStatuses = Object.values(NodeResultStatus);
-    if (!validStatuses.includes(status)) {
-        console.error(`Error: status must be one of: ${validStatuses.join(", ")}`);
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
-    let output = opts.output;
-    if (opts.outputFile) {
-        output = await fs.readFile(path.resolve(cwd, opts.outputFile), "utf-8");
-    }
-    const id = opts.id ?? generateId("node_result");
-    const completed_at = status === NodeResultStatus.Completed || status === NodeResultStatus.Failed || status === NodeResultStatus.NeedsHuman
-        ? now
-        : undefined;
-    const result = {
-        node_result_id: id,
-        run_id: opts.run,
-        workflow_id: run.workflow_id,
-        workflow_version_id: run.workflow_version_id,
-        node_id: opts.node,
-        status,
-        started_at: now,
-        completed_at,
-        ...(output ? { output } : {}),
-    };
-    await writeNodeResult(opts.run, opts.node, result, cwd);
-    console.log(`COGNETIVY_NODE_RESULT_ID=${id}`);
-    console.log(JSON.stringify(result, null, 2));
 });
 const nodeCmd = program
     .command("node")
-    .description("Node lifecycle: start (step_started + node result id) and complete (result + optional collection + step_completed). Prefer run step for advancing runs.");
+    .description("Node lifecycle (cloud): start a node or complete it with optional collection payload. Prefer `cognetivy run step` when available.");
 nodeCmd
     .command("start")
-    .description("Mark a node as started (append step_started, create node result). Requires --run and --node. Cloud: use when COGNETIVY_API_KEY is set.")
+    .description("Mark a node as started on the server. Requires COGNETIVY_API_KEY, --run, and --node.")
     .requiredOption("--run <run_id>", "Run ID")
     .requiredOption("--node <node_id>", "Workflow node ID")
-    .option("--by <string>", "Actor; defaults to config or 'cli'")
-    .option("--cloud", "Use Cognetivy cloud API (default when API key is set)")
-    .option("--local", "Use local .cognetivy workspace only")
-    .action(async (opts) => {
-    const useCloud = await resolveUseCloud(process.cwd(), opts);
-    if (useCloud) {
-        try {
-            await cloudStartNode(opts.run, opts.node);
-            console.log(`Node "${opts.node}" started.`);
-        }
-        catch (err) {
-            console.error(err instanceof Error ? err.message : String(err));
-            process.exit(1);
-        }
-        return;
+    .action(async function nodeStartAction(opts) {
+    await requireCloudApiKey();
+    try {
+        await cloudStartNode(opts.run, opts.node);
+        console.log(`Node "${opts.node}" started.`);
     }
-    const cwd = process.cwd();
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
         process.exit(1);
     }
-    const run = await readRunFile(opts.run, cwd);
-    const by = opts.by ?? (await resolveBy(cwd));
-    const now = new Date().toISOString();
-    const nodeResultId = generateId("node_result");
-    const event = {
-        ts: now,
-        type: "step_started",
-        by,
-        data: { step: opts.node, step_id: opts.node },
-    };
-    await appendEventLine(opts.run, event, cwd);
-    const result = {
-        node_result_id: nodeResultId,
-        run_id: opts.run,
-        workflow_id: run.workflow_id,
-        workflow_version_id: run.workflow_version_id,
-        node_id: opts.node,
-        status: NodeResultStatus.Started,
-        started_at: now,
-    };
-    await writeNodeResult(opts.run, opts.node, result, cwd);
-    console.log(`COGNETIVY_NODE_RESULT_ID=${nodeResultId}`);
 });
 nodeCmd
     .command("complete")
-    .description("Complete a node: create result, optionally write collection (--collection-kind; omit --collection-file to read from stdin), append step_completed. Requires --run, --node, --status.")
+    .description("Complete a node via the cloud API (--status completed only). Optional --output/--output-file, --collection-kind + payload (file or stdin), or --writes-file for multi-output nodes.")
     .requiredOption("--run <run_id>", "Run ID")
     .requiredOption("--node <node_id>", "Workflow node ID")
-    .requiredOption("--status <status>", "Status: completed|failed|needs_human")
+    .requiredOption("--status <status>", "Must be: completed (cloud API completes successfully)")
     .option("--output <string>", "Inline output text for the node result")
     .option("--output-file <path>", "Path to file for node result output")
-    .option("--collection-kind <kind>", "Collection kind to set or append (payload from --collection-file or stdin)")
+    .option("--collection-kind <kind>", "Collection kind (payload from --collection-file or stdin)")
     .option("--collection-file <path>", "Path to JSON payload (omit to read from stdin when --collection-kind is set)")
     .option("--collection-mode <mode>", "set (array) or append (single object); default: infer from payload", "infer")
-    .option("--by <string>", "Actor; defaults to config or 'cli'")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const exists = await runExists(opts.run, cwd);
-    if (!exists) {
-        console.error(`Error: Run "${opts.run}" not found.`);
+    .option("--writes-file <path>", "JSON file: writes [{ kind, item_ids }] for nodes with multiple output kinds")
+    .action(async function nodeCompleteAction(opts) {
+    await requireCloudApiKey();
+    if (opts.status !== "completed") {
+        console.error('Error: cloud `node complete` only supports --status completed. For failed or needs_human, use the Cognetivy app or API.');
         process.exit(1);
     }
-    const run = await readRunFile(opts.run, cwd);
-    const validStatuses = ["completed", "failed", "needs_human"];
-    if (!validStatuses.includes(opts.status)) {
-        console.error(`Error: status must be one of: ${validStatuses.join(", ")}`);
+    const cwd = process.cwd();
+    if (opts.writesFile && opts.collectionKind) {
+        console.error("Error: use either --writes-file or --collection-kind, not both.");
         process.exit(1);
     }
-    const status = opts.status;
-    const by = opts.by ?? (await resolveBy(cwd));
-    const now = new Date().toISOString();
     let output = opts.output;
     if (opts.outputFile) {
         output = await fs.readFile(path.resolve(cwd, opts.outputFile), "utf-8");
     }
-    const nodeResultId = generateId("node_result");
-    const writes = [];
-    if (opts.collectionKind) {
+    const body = {};
+    if (output !== undefined) {
+        body.output = output;
+    }
+    if (opts.writesFile) {
+        const raw = await fs.readFile(path.resolve(cwd, opts.writesFile), "utf-8");
+        body.writes = parsePayload(raw, formatFromFilePath(opts.writesFile));
+    }
+    else if (opts.collectionKind) {
         const raw = await readPayloadFromFileOrStdin(opts.collectionFile, cwd);
         const payload = parsePayload(raw, opts.collectionFile ? formatFromFilePath(opts.collectionFile) : "auto");
-        const mode = opts.collectionMode === "set" || opts.collectionMode === "append" ? opts.collectionMode : Array.isArray(payload) ? "set" : "append";
+        const mode = opts.collectionMode === "set" || opts.collectionMode === "append"
+            ? opts.collectionMode
+            : Array.isArray(payload)
+                ? "set"
+                : "append";
+        body.collectionKind = opts.collectionKind;
         if (mode === "set") {
-            const payloads = payload;
-            if (!Array.isArray(payloads)) {
+            if (!Array.isArray(payload)) {
                 console.error("Error: collection payload must be a JSON array when using set.");
                 process.exit(1);
             }
-            const payloadsWithIds = payloads.map((p, i) => ({
-                ...p,
-                id: p.id ?? `${opts.collectionKind}_${i}`,
-            }));
-            const itemIds = payloadsWithIds.map((p) => p.id);
-            await writeCollections(opts.run, opts.collectionKind, payloadsWithIds, { created_by_node_id: opts.node, created_by_node_result_id: nodeResultId }, cwd);
-            writes.push({ kind: opts.collectionKind, item_ids: itemIds });
+            body.collectionPayload = payload;
         }
         else {
-            const single = payload;
-            const item = await appendCollection(opts.run, opts.collectionKind, single, { created_by_node_id: opts.node, created_by_node_result_id: nodeResultId }, cwd);
-            writes.push({ kind: opts.collectionKind, item_ids: [item.id] });
+            if (Array.isArray(payload)) {
+                console.error("Error: collection payload must be a single JSON object when using append.");
+                process.exit(1);
+            }
+            body.collectionPayload = payload;
         }
     }
-    const result = {
-        node_result_id: nodeResultId,
-        run_id: opts.run,
-        workflow_id: run.workflow_id,
-        workflow_version_id: run.workflow_version_id,
-        node_id: opts.node,
-        status,
-        started_at: now,
-        completed_at: now,
-        ...(output ? { output } : {}),
-        ...(writes.length > 0 ? { writes } : {}),
-    };
-    await writeNodeResult(opts.run, opts.node, result, cwd);
-    const stepCompletedEvent = {
-        ts: now,
-        type: "step_completed",
-        by,
-        data: { step: opts.node, step_id: opts.node },
-    };
-    await appendEventLine(opts.run, stepCompletedEvent, cwd);
-    console.log(`COGNETIVY_NODE_RESULT_ID=${nodeResultId}`);
+    try {
+        await cloudCompleteNode(opts.run, opts.node, body);
+        console.log(`Node "${opts.node}" completed.`);
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
 });
 program
     .command("templates")
-    .description("List workflow templates (--list for JSON) or interactively pick one to install and set as current workflow. Run with no options in TTY for picker.")
+    .description("List workflow templates (--list for JSON) or interactively pick one to create in cloud and set as current (requires COGNETIVY_API_KEY).")
     .option("--list", "Print templates as JSON (no picker)")
-    .action(async (opts) => {
+    .action(async function templatesCommandAction(opts) {
     const cwd = process.cwd();
     if (opts.list || !process.stdin.isTTY) {
         console.log(JSON.stringify(listWorkflowTemplates(), null, 2));
         return;
     }
-    await requireWorkspace(cwd);
+    await requireCloudApiKey();
     const templates = listWorkflowTemplatesForPicker();
     const picked = await p.select({
-        message: "Pick a workflow template to install and set as current",
+        message: "Pick a workflow template to create in your cloud org",
         options: templates.map((t) => ({
             value: t.id,
             label: t.name,
@@ -1861,16 +1052,19 @@ program
     }
     const templateId = picked;
     try {
-        const result = await applyWorkflowTemplateToWorkspace({ cwd, templateId });
-        p.note(`Applied template \"${result.template.name}\"\nWorkflow: ${result.workflow.workflow_id}\nNow current: ${result.workflow.workflow_id}`, "Template applied");
+        const orgId = await resolveCloudOrganizationId();
+        const result = await applyWorkflowTemplateToCloud({ organizationId: orgId, templateId, cwd });
+        p.note(`Created workflow "${result.template.name}" (${result.workflowId}) in cloud.`, "Template applied");
         console.log(JSON.stringify({
             template_id: result.template.id,
-            workflow_id: result.workflow.workflow_id,
-            current_workflow_id: result.workflow.workflow_id,
-            version_id: result.version.version_id,
+            workflow_id: result.workflowId,
+            cloud_current_workflow_id: result.workflowId,
+            version_id: result.versionId,
         }, null, 2));
-        const studioUrl = `http://127.0.0.1:${STUDIO_DEFAULT_PORT}`;
-        openUrl(studioUrl).catch(() => { });
+        const appUrl = getCloudAppUrl();
+        const url = buildCloudOnboardingUrl(appUrl, result.workflowId);
+        await openUrl(url);
+        printOpenedUrlMessage(url, { workflow: true });
     }
     catch (err) {
         console.error(err instanceof Error ? `Error: ${err.message}` : String(err));
@@ -1883,7 +1077,6 @@ program
     .option("--force", "Overwrite if skill already exists")
     .option("--no-init", "Skip cognetivy workspace init; only install skills")
     .option("--interactive", "Show interactive prompt to choose tool(s) and install accordingly")
-    .option("--cloud", "Install cloud-mode skill (no .cognetivy/ workspace; use --cloud on commands)")
     .action(async (target, opts) => {
     const cwd = process.cwd();
     const useTUI = opts.interactive === true || target === undefined;
@@ -1892,9 +1085,8 @@ program
         await runInstallTUI({ cwd, force: opts.force, init: opts.init !== false });
         return;
     }
-    const skillMode = opts.cloud ? "cloud" : "local";
-    if (opts.init !== false && skillMode === "local") {
-        await ensureWorkspace(cwd);
+    if (opts.init !== false) {
+        await ensureMinimalWorkspace(cwd);
     }
     const normalized = target.toLowerCase();
     const targetMap = {
@@ -1919,9 +1111,6 @@ program
     let targetsToInstall = resolved === "all"
         ? ["agent", "agents", "cursor", "factory", "gemini", "openclaw", "opencode", "qwen", "workspace"]
         : [resolved];
-    if (skillMode === "cloud") {
-        targetsToInstall = targetsToInstall.filter((t) => t !== "workspace");
-    }
     const optsCommon = { force: opts.force, cwd, config: skillsConfig };
     try {
         for (const internalTarget of targetsToInstall) {
@@ -1932,7 +1121,7 @@ program
             }
         }
         for (const internalTarget of targetsToInstall) {
-            const cognetivyPath = await installCognetivySkill(internalTarget, cwd, skillsConfig, skillMode);
+            const cognetivyPath = await installCognetivySkill(internalTarget, cwd, skillsConfig);
             const label = targetToLabel(internalTarget);
             console.log(`[${label}] Cognetivy skill at ${cognetivyPath}`);
         }
@@ -2207,30 +1396,7 @@ program
     const workspacePath = opts.workspace ? path.resolve(process.cwd(), opts.workspace) : process.cwd();
     await runMcpServer(workspacePath);
 });
-program
-    .command("studio")
-    .description("Open read-only Studio (workflow, runs, events, collections) in browser. Optional --workspace, --port, --api-only.")
-    .option("--workspace <path>", "Workspace directory (default: cwd)")
-    .option("--port <number>", "Port for Studio server", (v) => parseInt(v, 10), STUDIO_DEFAULT_PORT)
-    .option("--api-only", "Only serve API (for use with Vite dev server; see studio/README)")
-    .action(async (opts) => {
-    const cwd = process.cwd();
-    const workspacePath = opts.workspace ? path.resolve(cwd, opts.workspace) : cwd;
-    await requireWorkspace(workspacePath);
-    const requestedPort = opts.port ?? STUDIO_DEFAULT_PORT;
-    const { port: actualPort } = await startStudioServer(workspacePath, requestedPort, { apiOnly: opts.apiOnly });
-    if (!opts.apiOnly) {
-        const url = `http://127.0.0.1:${actualPort}`;
-        await openUrl(url);
-        console.log(`Studio at ${url} (workspace: ${workspacePath}). Press Ctrl+C to stop.`);
-    }
-    else {
-        console.log(`Studio API at http://127.0.0.1:${actualPort} (workspace: ${workspacePath}).`);
-        console.log(`Run the app in dev: cd studio && npm run dev, then open http://localhost:5173`);
-        console.log("Press Ctrl+C to stop.");
-    }
-});
-const DEFAULT_BEHAVIOR_DESCRIPTION = "Guided onboarding: choose cloud or local, sign in if cloud, install or update platform skills (Cursor, Claude Code, etc.), ensure at least one workflow (template picker if needed), then opens the Cognetivy app in your browser.";
+const DEFAULT_BEHAVIOR_DESCRIPTION = "Guided onboarding: sign in if needed, install or update platform skills (Cursor, Claude Code, etc.), ensure at least one cloud workflow (template picker if needed), then start the local studio (browser + WebSocket executor).";
 program
     .command("docs")
     .description("Open CLI reference (all commands and options) in browser. No arguments.")
@@ -2262,71 +1428,75 @@ function runUpdateNotifier() {
         // ignore
     }
 }
-/** Guided onboarding when user runs `cognetivy` with no args: cloud/local choice, auth, skills, workflow, then open app. */
+/** Guided onboarding when user runs `cognetivy` with no args: auth, skills, cloud workflow, then open app. */
 async function runDefaultOnboardingFlow(cwd) {
     runUpdateNotifier();
     const authenticated = await isCloudAuthenticated();
-    let mode;
+    let loginServerHandle;
     if (!authenticated) {
-        p.note("Local: data stays in .cognetivy/ on this machine—you own it, view in Studio here.\nCloud: sign in once; view run status from anywhere (web or mobile browser) and work from anywhere.", "Local vs Cloud");
-        const choice = await p.select({
-            message: "Local or Cloud?",
-            options: [
-                { value: "cloud", label: "Cloud", hint: "View run status from anywhere (web or mobile browser)" },
-                { value: "local", label: "Local", hint: "Data in .cognetivy/ here; view in Studio on this machine" },
-            ],
-        });
-        if (p.isCancel(choice)) {
-            p.cancel("Cancelled.");
-            process.exit(0);
+        const signInApiBase = getCloudApiUrl();
+        const apiLooksLocal = /^https?:\/\/(localhost|127\.0\.0\.1)(:\d+)?$/i.test(signInApiBase);
+        p.note(`Sign in once; your API key is stored locally.\nBackend API for this run: ${signInApiBase}${apiLooksLocal ? "" : "\nTip: for a local Nest server use --dev or --api-url http://localhost:3000."}`, "Cognetivy");
+        const staticRoot = resolveLocalStudioStaticRoot();
+        const canAuthViaLocalStudio = localStudioBundleHasCliAuth(staticRoot);
+        if (canAuthViaLocalStudio) {
+            loginServerHandle = await createLocalStudioServer({ workspaceCwd: cwd });
         }
-        mode = choice;
-        if (mode === "cloud") {
-            const appUrl = getCloudAppUrl();
-            console.log("Opening browser to sign in…");
-            const result = await runLoginFlow({ appUrl });
-            if (result.error) {
-                console.error(result.error);
-                process.exit(1);
+        else {
+            console.log("Tip: Run `npm run build:local-studio` in this package so sign-in opens local studio instead of the hosted app.");
+        }
+        const authAppUrl = loginServerHandle ? resolveLocalStudioBrowserBase(loginServerHandle) : getCloudAppUrl();
+        console.log(loginServerHandle ? "Opening browser to sign in (local studio)…" : "Opening browser to sign in…");
+        const result = await runLoginFlow({ appUrl: authAppUrl });
+        if (result.error) {
+            if (loginServerHandle) {
+                await loginServerHandle.close();
             }
-            if (!result.code) {
-                console.error("No authorization code received.");
-                process.exit(1);
+            console.error(result.error);
+            process.exit(1);
+        }
+        if (!result.code) {
+            if (loginServerHandle) {
+                await loginServerHandle.close();
             }
-            const apiUrl = getCloudApiUrl();
-            const res = await fetch(`${apiUrl}/auth/cli/token`, {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ code: result.code }),
-            });
-            if (!res.ok) {
-                const text = await res.text();
-                console.error(text || res.statusText);
-                process.exit(1);
+            console.error("No authorization code received.");
+            process.exit(1);
+        }
+        const apiUrl = getCloudApiUrl();
+        const res = await fetch(`${apiUrl}/auth/cli/token`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ code: result.code }),
+        });
+        if (!res.ok) {
+            const text = await res.text();
+            if (loginServerHandle) {
+                await loginServerHandle.close();
             }
-            const data = (await res.json());
-            const apiKey = data?.api_key ?? "";
-            if (!apiKey) {
-                console.error("No API key in response.");
-                process.exit(1);
+            console.error(text || res.statusText);
+            process.exit(1);
+        }
+        const data = (await res.json());
+        const apiKey = data?.api_key ?? "";
+        if (!apiKey) {
+            if (loginServerHandle) {
+                await loginServerHandle.close();
             }
-            writeStoredApiKey(apiKey);
-            console.log("Logged in. API key saved.");
+            console.error("No API key in response.");
+            process.exit(1);
         }
-    }
-    else {
-        const index = await readWorkflowIndexOptional(cwd);
-        mode = index?.preferred_mode === "local" ? "local" : "cloud";
+        writeStoredApiKey(apiKey);
+        console.log("Logged in. API key saved.");
     }
     const { runInstallTUI } = await import("./install-tui.js");
     const installedVersion = await readInstalledSkillsVersion(cwd);
     const currentVersion = getCurrentVersionSync();
     if (installedVersion == null) {
-        await runInstallTUI({ cwd, init: true, onboardingMode: mode });
+        await runInstallTUI({ cwd, init: true, skipTemplate: true });
     }
     else if (isNewerVersion(currentVersion, installedVersion)) {
         const shouldUpdate = await p.confirm({
-            message: `Skills were installed with v${installedVersion}; you're on v${currentVersion}. Update skill files? (Your workflows and runs in .cognetivy are not touched.)`,
+            message: `Skills were installed with v${installedVersion}; you're on v${currentVersion}. Update skill files? (Your .cognetivy skills folder is not removed.)`,
             initialValue: true,
         });
         if (p.isCancel(shouldUpdate)) {
@@ -2336,30 +1506,19 @@ async function runDefaultOnboardingFlow(cwd) {
             await runInstallTUI({ cwd, force: true, init: false });
         }
     }
-    if (mode === "local") {
-        await ensureWorkspace(cwd, { force: false });
-    }
+    await ensureMinimalWorkspace(cwd);
     const index = await readWorkflowIndexOptional(cwd);
-    if (index && index.preferred_mode !== mode) {
-        await writeWorkflowIndex({ ...index, preferred_mode: mode }, cwd);
-    }
     let hasWorkflow = false;
     let cloudWorkflowList = [];
-    if (mode === "cloud") {
-        try {
-            const orgId = await resolveCloudOrganizationId();
-            const list = await cloudListWorkflows(orgId);
-            cloudWorkflowList = list;
-            hasWorkflow = list.length >= 1 || (index?.cloud_current_workflow_id != null);
-        }
-        catch {
-            hasWorkflow = false;
-        }
+    try {
+        const orgId = await resolveCloudOrganizationId();
+        const list = await cloudListWorkflows(orgId);
+        cloudWorkflowList = list;
+        hasWorkflow = list.length >= 1 || (index?.cloud_current_workflow_id != null);
     }
-    else {
-        hasWorkflow = (index?.workflows?.length ?? 0) >= 1;
+    catch {
+        hasWorkflow = false;
     }
-    let localCurrentWorkflowId = null;
     let cloudCurrentWorkflowId = null;
     if (!hasWorkflow) {
         const templates = listWorkflowTemplatesForPicker();
@@ -2373,17 +1532,10 @@ async function runDefaultOnboardingFlow(cwd) {
         else {
             const templateId = templateSelection;
             try {
-                if (mode === "cloud") {
-                    const orgId = await resolveCloudOrganizationId();
-                    const result = await applyWorkflowTemplateToCloud({ organizationId: orgId, templateId, cwd });
-                    cloudCurrentWorkflowId = result.workflowId;
-                    p.note(`Created workflow "${result.template.name}" (${result.workflowId}) in cloud.`, "Template applied");
-                }
-                else {
-                    const result = await applyWorkflowTemplateToWorkspace({ cwd, templateId });
-                    localCurrentWorkflowId = result.workflow.workflow_id;
-                    p.note(`Applied template "${result.template.name}". Workflow: ${result.workflow.workflow_id}`, "Template applied");
-                }
+                const orgId = await resolveCloudOrganizationId();
+                const result = await applyWorkflowTemplateToCloud({ organizationId: orgId, templateId, cwd });
+                cloudCurrentWorkflowId = result.workflowId;
+                p.note(`Created workflow "${result.template.name}" (${result.workflowId}) in cloud.`, "Template applied");
             }
             catch (err) {
                 console.error(err instanceof Error ? err.message : String(err));
@@ -2391,21 +1543,10 @@ async function runDefaultOnboardingFlow(cwd) {
             }
         }
     }
-    else if (mode === "cloud" && cloudCurrentWorkflowId == null) {
-        cloudCurrentWorkflowId =
-            index?.cloud_current_workflow_id ?? cloudWorkflowList[0]?.id ?? null;
-    }
-    if (mode === "local") {
-        const workflowIdToOpen = localCurrentWorkflowId ??
-            (await readWorkflowIndexOptional(cwd).then((idx) => idx?.current_workflow_id ?? null));
-        await launchLocalStudio(cwd, undefined, workflowIdToOpen);
-    }
-    else {
-        const appUrl = getCloudAppUrl();
-        const url = buildCloudOnboardingUrl(appUrl, cloudCurrentWorkflowId);
-        await openUrl(url);
-        printOpenedUrlMessage(url, { workflow: Boolean(cloudCurrentWorkflowId) });
+    else if (cloudCurrentWorkflowId == null) {
+        cloudCurrentWorkflowId = index?.cloud_current_workflow_id ?? cloudWorkflowList[0]?.id ?? null;
     }
+    await runLocalStudioForeground(cwd, { existingHandle: loginServerHandle });
 }
 program.action(async () => {
     const opts = program.opts();
@@ -2415,9 +1556,7 @@ program.action(async () => {
     }
     const cwd = process.cwd();
     if (!process.stdin.isTTY) {
-        const appUrl = getCloudAppUrl();
-        await openUrl(appUrl);
-        printOpenedUrlMessage(appUrl, { workflow: false });
+        await runLocalStudioForeground(cwd);
         return;
     }
     await runDefaultOnboardingFlow(cwd);