@tapi-dev/sdk 0.1.40 → 0.1.45

package/dist/cli.js

@@ -3,7 +3,7 @@ import { spawn } from "node:child_process";
 import { createServer } from "node:http";
 import { createServer as createNetServer } from "node:net";
 import { createHash, randomUUID } from "node:crypto";
-import { createReadStream, createWriteStream, existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
+import { createReadStream, createWriteStream, existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { mkdir, readFile, readdir, rename, rm, stat, statfs, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
@@ -16,7 +16,9 @@ import { select } from "@inquirer/prompts";
 import { Presets, SingleBar } from "cli-progress";
 import pc from "yoctocolors";
 import { TapiClient } from "./index.js";
-import { loadWorkspace, normalizeProjectValue, writeWorkspaceConfig, } from "./workspace.js";
+import { normalizeProjectValue, writeWorkspaceConfig, } from "./workspace.js";
+import { openStudioDev } from "./studio-dev.js";
+import { openRunnerDev } from "./runner-dev.js";
 const DEFAULT_DOWNLOADS_BASE_URL = "https://d4xaf52nfwiok.cloudfront.net";
 const DEFAULT_STUDIO_API_BASE_URL = "https://determined-motivation-production.up.railway.app";
 const DEFAULT_STUDIO_AUTH_HTML_URL = "https://rsarlong-1f92fd.gitlab.io/auth.html";
@@ -166,6 +168,10 @@ async function authenticateSdkUser() {
 }
 export async function runCli(argv = process.argv.slice(2)) {
     const [command, subcommand, ...rest] = argv;
+    if (command === "runner" && subcommand === "dev") {
+        await openRunnerDev(rest);
+        return 0;
+    }
     if (!command || command === "help" || command === "--help" || command === "-h") {
         printHelp();
         return 0;
@@ -240,12 +246,6 @@ export async function runCli(argv = process.argv.slice(2)) {
                 return addTappService(rest.slice(1));
             }
         }
-        if (subcommand === "queue") {
-            const queueCommand = rest[0] || "";
-            if (queueCommand === "add") {
-                return addTappQueue(rest.slice(1));
-            }
-        }
         console.error(`Unknown Tapp command: ${[subcommand, ...rest].filter(Boolean).join(" ")}`);
         printTappHelp();
         return 1;
@@ -270,6 +270,9 @@ export async function runCli(argv = process.argv.slice(2)) {
         if (subcommand === "setup") {
             return runRunnerSetup(rest);
         }
+        if (subcommand === "gui") {
+            return openRunnerGui(rest);
+        }
         if (subcommand === "slot") {
             const slotCommand = rest[0] || "";
             if (slotCommand === "set") {
@@ -328,6 +331,9 @@ export async function runCli(argv = process.argv.slice(2)) {
         printStudioHelp();
         return 0;
     }
+    if (subcommand === "dev") {
+        return openStudioDev(rest);
+    }
     const options = parseStudioOptions(rest);
     if (subcommand === "install") {
         return installStudio(options);
@@ -344,8 +350,6 @@ export async function runCli(argv = process.argv.slice(2)) {
 }
 export function parseStudioOptions(args) {
     const raw = {};
-    let workspaceSearchRoot;
-    let skipWorkspace = false;
     let projectIdSource;
     let tappSelectionMode = "auto";
     for (let index = 0; index < args.length; index += 1) {
@@ -382,16 +386,13 @@ export function parseStudioOptions(args) {
             continue;
         }
         if (arg === "--workspace") {
-            workspaceSearchRoot = requireOptionValue(args, ++index, "--workspace");
-            continue;
+            throw new Error("--workspace is retired. Use `tapi studio <tapp>` or `--tapp <id>`.");
         }
         if (arg.startsWith("--workspace=")) {
-            workspaceSearchRoot = arg.slice("--workspace=".length);
-            continue;
+            throw new Error("--workspace is retired. Use `tapi studio <tapp>` or `--tapp <id>`.");
         }
         if (arg === "--no-workspace") {
-            skipWorkspace = true;
-            continue;
+            throw new Error("--no-workspace is retired. Studio no longer reads local workspace configs.");
         }
         if (arg === "--tapp") {
             raw.projectId = normalizeProjectValue(requireOptionValue(args, ++index, "--tapp"), "tapp");
@@ -482,13 +483,11 @@ export function parseStudioOptions(args) {
         }
         throw new Error(`Unknown option: ${arg}`);
     }
-    const workspace = skipWorkspace ? undefined : loadWorkspace(workspaceSearchRoot ?? process.cwd());
     const channel = raw.channel ?? parseChannel(envString("TAPI_STUDIO_CHANNEL") ?? DEFAULT_CHANNEL);
     const apiBaseUrl = normalizeHttpUrl(raw.apiBaseUrl
         ?? envString("TAPI_STUDIO_API_BASE_URL")
         ?? envString("TAPI_BASE_URL")
         ?? envString("TAPI_STUDIO_SERVER_URL")
-        ?? workspace?.apiBaseUrl
         ?? DEFAULT_STUDIO_API_BASE_URL, "Studio API base URL");
     const downloadsBaseUrl = normalizeHttpUrl(envString("TAPI_DOWNLOADS_BASE_URL") ?? DEFAULT_DOWNLOADS_BASE_URL, "TAPI_DOWNLOADS_BASE_URL");
     const explicitManifestUrl = raw.manifestUrlOverride ?? envString("TAPI_STUDIO_MANIFEST_URL");
@@ -496,11 +495,11 @@ export function parseStudioOptions(args) {
         ? normalizeHttpUrl(explicitManifestUrl, "Studio manifest URL")
         : `${downloadsBaseUrl.replace(/\/+$/, "")}/studio/channels/${channel}/latest.json`;
     const envProjectId = envString("TAPI_PROJECT_ID");
-    const projectId = raw.projectId ?? envProjectId ?? workspace?.projectId;
+    const projectId = raw.projectId ?? envProjectId;
     if (!projectIdSource && projectId) {
-        projectIdSource = raw.projectId ? "option" : envProjectId ? "env" : "workspace";
+        projectIdSource = raw.projectId ? "option" : "env";
     }
-    const projectSlug = raw.projectSlug ?? envString("TAPI_PROJECT_SLUG") ?? workspace?.projectSlug;
+    const projectSlug = raw.projectSlug ?? envString("TAPI_PROJECT_SLUG");
     const envInstallToken = envString("TAPI_STUDIO_INSTALL_TOKEN");
     const installToken = raw.installToken ?? envInstallToken;
     return {
@@ -515,20 +514,17 @@ export function parseStudioOptions(args) {
         exePath: raw.exePath ?? envString("TAPI_STUDIO_EXE"),
         installToken,
         installTokenSource: raw.installToken ? "option" : installToken ? "env" : undefined,
-        workspace,
-        workspaceRoot: workspace?.root,
         projectId,
         projectSlug,
         projectIdSource,
-        workspaceMode: Boolean(projectId || workspace),
+        workspaceMode: Boolean(projectId),
         tappSelectionMode,
     };
 }
 function parseServiceOptions(args) {
     let operation = "";
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
+    let projectId = envString("TAPI_PROJECT_ID") || "";
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
         if (!arg)
@@ -566,7 +562,7 @@ function parseServiceOptions(args) {
         throw new Error("services describe requires a service run like schwab.place_order.");
     }
     if (!projectId) {
-        throw new Error("services describe requires --project, TAPI_PROJECT_ID, or .tapi/project.json.");
+        throw new Error("services describe requires --project or TAPI_PROJECT_ID.");
     }
     return {
         operation,
@@ -596,10 +592,9 @@ async function describeServiceOperation(args) {
     }
 }
 function parseApiWorkspaceOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
-    let catalogPath = workspace?.config.services?.catalog || ".tapi/services/catalog.json";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
+    let projectId = envString("TAPI_PROJECT_ID") || "";
+    let catalogPath = "tapi-services.catalog.json";
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
         if (!arg)
@@ -635,22 +630,18 @@ function parseApiWorkspaceOptions(args) {
         throw new Error(`Unknown services option: ${arg}`);
     }
     if (!projectId) {
-        throw new Error("services command requires --project, TAPI_PROJECT_ID, or .tapi/project.json.");
+        throw new Error("services command requires --project or TAPI_PROJECT_ID.");
     }
-    const root = workspace?.root || process.cwd();
     return {
         apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
         projectId,
-        catalogPath: resolve(root, catalogPath),
+        catalogPath: resolve(process.cwd(), catalogPath),
     };
 }
 async function syncServiceCatalog(args) {
     try {
-        const options = await withSdkAuth(parseApiWorkspaceOptions(args));
-        const catalog = await withCliSpinner("Fetching Tapi service-run catalog", () => fetchApiCatalog(options));
-        await writeJsonFile(options.catalogPath, catalog);
-        console.log(`Synced Tapi service-run catalog: ${options.catalogPath}`);
-        return 0;
+        void args;
+        throw new Error("services sync is retired. Service-run contracts are server-backed; use `tapi services describe <service.call>`.");
     }
     catch (error) {
         console.error(formatError(error));
@@ -658,8 +649,7 @@ async function syncServiceCatalog(args) {
     }
 }
 function parseTappServiceAddOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
     let tappId = "";
     let serviceCall = "";
     let serviceMapId = "";
@@ -740,9 +730,8 @@ function parseTappServiceAddOptions(args) {
     };
 }
 function parseTappCreateOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let tappId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
+    let tappId = envString("TAPI_PROJECT_ID") || "";
     let name = "";
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
@@ -862,9 +851,7 @@ async function postTappServiceAdd(options) {
     return body ?? {};
 }
 function parseQueueCreateOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
     let displayName = "";
     let maxSlots = 8;
     for (let index = 0; index < args.length; index += 1) {
@@ -883,14 +870,6 @@ function parseQueueCreateOptions(args) {
             apiBaseUrl = arg.slice("--server=".length);
             continue;
         }
-        if (arg === "--project") {
-            projectId = normalizeProjectValue(requireOptionValue(args, ++index, "--project"), "project");
-            continue;
-        }
-        if (arg.startsWith("--project=")) {
-            projectId = normalizeProjectValue(arg.slice("--project=".length), "project");
-            continue;
-        }
         if (arg === "--max-slots") {
             maxSlots = parsePositiveInteger(requireOptionValue(args, ++index, "--max-slots"), "--max-slots");
             continue;
@@ -910,61 +889,12 @@ function parseQueueCreateOptions(args) {
     }
     return {
         apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
-        projectId,
         displayName,
         maxSlots,
     };
 }
-function parseTappQueueAddOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let tappId = "";
-    let queueId = "";
-    for (let index = 0; index < args.length; index += 1) {
-        const arg = args[index];
-        if (!arg)
-            continue;
-        if (arg === "--api-base-url" || arg === "--server") {
-            apiBaseUrl = requireOptionValue(args, ++index, arg);
-            continue;
-        }
-        if (arg.startsWith("--api-base-url=")) {
-            apiBaseUrl = arg.slice("--api-base-url=".length);
-            continue;
-        }
-        if (arg.startsWith("--server=")) {
-            apiBaseUrl = arg.slice("--server=".length);
-            continue;
-        }
-        if (arg.startsWith("--")) {
-            throw new Error(`Unknown tapp queue add option: ${arg}`);
-        }
-        if (!tappId) {
-            tappId = normalizeProjectValue(arg, "tapp");
-            continue;
-        }
-        if (!queueId) {
-            queueId = arg.trim();
-            continue;
-        }
-        throw new Error(`Unexpected tapp queue add argument: ${arg}`);
-    }
-    if (!tappId) {
-        throw new Error("tapp queue add requires a Tapp id.");
-    }
-    if (!queueId) {
-        throw new Error("tapp queue add requires a queue id.");
-    }
-    return {
-        apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
-        tappId,
-        queueId,
-    };
-}
 function parseRunnerSlotSetOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
     let runnerId = "";
     let slotIndex = 0;
     let queueId = "";
@@ -984,14 +914,6 @@ function parseRunnerSlotSetOptions(args) {
             apiBaseUrl = arg.slice("--server=".length);
             continue;
         }
-        if (arg === "--project") {
-            projectId = normalizeProjectValue(requireOptionValue(args, ++index, "--project"), "project");
-            continue;
-        }
-        if (arg.startsWith("--project=")) {
-            projectId = normalizeProjectValue(arg.slice("--project=".length), "project");
-            continue;
-        }
         if (arg.startsWith("--")) {
             throw new Error(`Unknown runner slot set option: ${arg}`);
         }
@@ -1009,9 +931,6 @@ function parseRunnerSlotSetOptions(args) {
         }
         throw new Error(`Unexpected runner slot set argument: ${arg}`);
     }
-    if (!projectId) {
-        throw new Error("runner slot set requires --project or TAPI_PROJECT_ID.");
-    }
     if (!runnerId) {
         throw new Error("runner slot set requires a runner id.");
     }
@@ -1023,7 +942,6 @@ function parseRunnerSlotSetOptions(args) {
     }
     return {
         apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
-        projectId,
         runnerId,
         slotIndex,
         queueId,
@@ -1041,18 +959,6 @@ async function createQueue(args) {
         return 1;
     }
 }
-async function addTappQueue(args) {
-    try {
-        const options = await withSdkAuth(parseTappQueueAddOptions(args));
-        const result = await withCliSpinner(`Attaching Tapi queue ${options.queueId} to ${options.tappId}`, () => postTappQueueAdd(options));
-        console.log(JSON.stringify(result, null, 2));
-        return 0;
-    }
-    catch (error) {
-        console.error(formatError(error));
-        return 1;
-    }
-}
 async function setRunnerSlot(args) {
     try {
         const options = await withSdkAuth(parseRunnerSlotSetOptions(args));
@@ -1066,7 +972,7 @@ async function setRunnerSlot(args) {
     }
 }
 async function postQueueCreate(options) {
-    const headers = sdkJsonHeaders(options.authToken, options.projectId);
+    const headers = sdkJsonHeaders(options.authToken);
     const response = await fetch(`${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/queues`, {
         method: "POST",
         headers,
@@ -1082,23 +988,10 @@ async function postQueueCreate(options) {
     }
     return body ?? {};
 }
-async function postTappQueueAdd(options) {
-    const response = await fetch(`${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/tapps/${encodeURIComponent(options.tappId)}/queues`, {
-        method: "POST",
-        headers: sdkJsonHeaders(options.authToken, options.tappId),
-        body: JSON.stringify({ queueId: options.queueId }),
-    });
-    const body = await readJsonBody(response);
-    if (!response.ok) {
-        const detail = body?.detail ?? body?.error ?? body ?? `HTTP ${response.status}`;
-        throw new Error(typeof detail === "string" ? detail : JSON.stringify(detail));
-    }
-    return body ?? {};
-}
 async function putRunnerSlot(options) {
     const response = await fetch(`${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/runners/${encodeURIComponent(options.runnerId)}/slots/${encodeURIComponent(String(options.slotIndex))}`, {
         method: "PUT",
-        headers: sdkJsonHeaders(options.authToken, options.projectId),
+        headers: sdkJsonHeaders(options.authToken),
         body: JSON.stringify({ queueId: options.queueId }),
     });
     const body = await readJsonBody(response);
@@ -1109,9 +1002,7 @@ async function putRunnerSlot(options) {
     return body ?? {};
 }
 export function parseRunnerSetupOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
     let runnerId = envString("TAPI_RUNNER_ID") || "";
     let port = Number(envString("TAPI_RUNNER_SETUP_PORT") || "17687");
     let openBrowser = true;
@@ -1131,14 +1022,6 @@ export function parseRunnerSetupOptions(args) {
             apiBaseUrl = arg.slice("--server=".length);
             continue;
         }
-        if (arg === "--project") {
-            projectId = normalizeProjectValue(requireOptionValue(args, ++index, "--project"), "project");
-            continue;
-        }
-        if (arg.startsWith("--project=")) {
-            projectId = normalizeProjectValue(arg.slice("--project=".length), "project");
-            continue;
-        }
         if (arg === "--runner-id") {
             runnerId = requireOptionValue(args, ++index, "--runner-id").trim();
             continue;
@@ -1168,9 +1051,6 @@ export function parseRunnerSetupOptions(args) {
         }
         throw new Error(`Unexpected runner setup argument: ${arg}`);
     }
-    if (!projectId) {
-        throw new Error("runner setup requires --project or TAPI_PROJECT_ID.");
-    }
     if (!runnerId) {
         throw new Error("runner setup requires --runner-id or TAPI_RUNNER_ID.");
     }
@@ -1179,7 +1059,6 @@ export function parseRunnerSetupOptions(args) {
     }
     return {
         apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
-        projectId,
         runnerId,
         port,
         openBrowser,
@@ -1203,6 +1082,78 @@ async function runRunnerSetup(args) {
         return 1;
     }
 }
+async function openRunnerGui(args) {
+    try {
+        if (hasHelpFlag(args)) {
+            printRunnerHelp();
+            return 0;
+        }
+        if (args.some((arg) => arg && arg.startsWith("-"))) {
+            throw new Error(`Unknown runner gui option: ${args.find((arg) => arg.startsWith("-"))}`);
+        }
+        const executable = findInstalledRunnerGui();
+        if (!executable) {
+            throw new Error("Tapi Runner GUI is not installed. Run `tapi service install --channel pilot`, then retry.");
+        }
+        const child = spawn(executable, [], {
+            detached: true,
+            stdio: "ignore",
+            windowsHide: false,
+        });
+        child.unref();
+        console.log(`Opened Tapi Runner: ${executable}`);
+        return 0;
+    }
+    catch (error) {
+        console.error(formatError(error));
+        return 1;
+    }
+}
+function findInstalledRunnerGui() {
+    const explicit = envString("TAPI_RUNNER_GUI_PATH");
+    if (explicit && existsSync(explicit)) {
+        return explicit;
+    }
+    const candidates = [];
+    const localCandidate = join(getDefaultTapiDataDir(), "Service", "releases");
+    const programData = envString("ProgramData") || "C:\\ProgramData";
+    const roots = [
+        join(programData, "Tapi", "Service", "releases"),
+        localCandidate,
+        resolve(process.cwd(), "build", "v2-processes", "runtime"),
+    ];
+    for (const root of roots) {
+        if (!existsSync(root))
+            continue;
+        const direct = join(root, "tapi-runner-gui.exe");
+        if (existsSync(direct)) {
+            candidates.push(direct);
+        }
+        let entries = [];
+        try {
+            entries = readdirSync(root);
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            const nested = join(root, String(entry), "tapi-runner-gui.exe");
+            if (existsSync(nested)) {
+                candidates.push(nested);
+            }
+        }
+    }
+    const unique = Array.from(new Set(candidates));
+    unique.sort((left, right) => {
+        try {
+            return statSync(right).mtimeMs - statSync(left).mtimeMs;
+        }
+        catch {
+            return 0;
+        }
+    });
+    return unique[0] || "";
+}
 export async function startRunnerSetupServer(options, fetchImpl = fetch) {
     const server = createServer((request, response) => {
         void handleRunnerSetupRequest(request, response, options, fetchImpl);
@@ -1225,9 +1176,9 @@ export async function executeRunnerSetupAction(options, action, fetchImpl = fetc
     if (!queueId) {
         queue = await sdkJsonRequest(fetchImpl, `${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/queues`, {
             method: "POST",
-            headers: sdkJsonHeaders(options.authToken, options.projectId),
+            headers: sdkJsonHeaders(options.authToken),
             body: JSON.stringify({
-                displayName: String(action.displayName || `${options.projectId} queue`).trim(),
+                displayName: String(action.displayName || `${options.runnerId} queue`).trim(),
                 maxSlots,
             }),
         });
@@ -1236,24 +1187,18 @@ export async function executeRunnerSetupAction(options, action, fetchImpl = fetc
     if (!queueId) {
         throw new Error("Runner setup needs an existing queue id or a created queue response with queueId.");
     }
-    const attachment = await sdkJsonRequest(fetchImpl, `${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/tapps/${encodeURIComponent(options.projectId)}/queues`, {
-        method: "POST",
-        headers: sdkJsonHeaders(options.authToken, options.projectId),
-        body: JSON.stringify({ queueId }),
-    });
     const slots = [];
     for (let offset = 0; offset < slotCount; offset += 1) {
         const slotIndex = slotStart + offset;
         slots.push(await sdkJsonRequest(fetchImpl, `${options.apiBaseUrl.replace(/\/+$/, "")}/api/sdk/v1/runners/${encodeURIComponent(options.runnerId)}/slots/${encodeURIComponent(String(slotIndex))}`, {
             method: "PUT",
-            headers: sdkJsonHeaders(options.authToken, options.projectId),
+            headers: sdkJsonHeaders(options.authToken),
             body: JSON.stringify({ queueId }),
         }));
     }
     return {
         queueId,
         queue: queueId && !Object.keys(queue).length ? { queueId } : queue,
-        attachment,
         slots,
     };
 }
@@ -1267,7 +1212,6 @@ async function handleRunnerSetupRequest(request, response, options, fetchImpl) {
         if (request.method === "GET" && url.pathname === "/api/status") {
             sendJson(response, 200, {
                 apiBaseUrl: options.apiBaseUrl,
-                projectId: options.projectId,
                 runnerId: options.runnerId,
             });
             return;
@@ -1285,7 +1229,7 @@ async function handleRunnerSetupRequest(request, response, options, fetchImpl) {
     }
 }
 function runnerSetupHtml(options) {
-    const displayName = `${options.projectId} queue`;
+    const displayName = `${options.runnerId} queue`;
     return `<!doctype html>
 <html lang="en">
 <head>
@@ -1339,7 +1283,6 @@ code { word-break: break-all; }
 <h2>Target</h2>
 <dl>
 <dt>Server</dt><dd><code>${escapeHtml(options.apiBaseUrl)}</code></dd>
-<dt>Tapp</dt><dd><code>${escapeHtml(options.projectId)}</code></dd>
 <dt>Runner</dt><dd><code>${escapeHtml(options.runnerId)}</code></dd>
 </dl>
 </aside>
@@ -1425,11 +1368,10 @@ function parseNonNegativeInteger(value, label) {
     return parsed;
 }
 function parseTriggerSyncOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
+    let projectId = envString("TAPI_PROJECT_ID") || "";
     let configPath = "";
-    const root = workspace?.root || process.cwd();
+    const root = process.cwd();
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
         if (!arg)
@@ -1465,7 +1407,7 @@ function parseTriggerSyncOptions(args) {
         throw new Error(`Unknown triggers option: ${arg}`);
     }
     if (!projectId) {
-        throw new Error("triggers sync requires --project, TAPI_PROJECT_ID, or .tapi/project.json.");
+        throw new Error("triggers sync requires --project or TAPI_PROJECT_ID.");
     }
     return {
         apiBaseUrl: normalizeHttpUrl(apiBaseUrl, "Tapi API base URL"),
@@ -1500,9 +1442,8 @@ async function syncServiceTriggers(args) {
     }
 }
 function parseSessionsOptions(args) {
-    const workspace = loadWorkspace();
-    let apiBaseUrl = envString("TAPI_BASE_URL") || workspace?.apiBaseUrl || DEFAULT_STUDIO_API_BASE_URL;
-    let projectId = envString("TAPI_PROJECT_ID") || workspace?.projectId || "";
+    let apiBaseUrl = envString("TAPI_BASE_URL") || DEFAULT_STUDIO_API_BASE_URL;
+    let projectId = envString("TAPI_PROJECT_ID") || "";
     let site = "";
     let sessionId = "";
     let json = false;
@@ -1558,7 +1499,7 @@ function parseSessionsOptions(args) {
         throw new Error(`Unexpected sessions argument: ${arg}`);
     }
     if (!projectId) {
-        throw new Error("sessions command requires --project, TAPI_PROJECT_ID, or .tapi/project.json.");
+        throw new Error("sessions command requires --project or TAPI_PROJECT_ID.");
     }
     return {
         sessionId,
@@ -3093,7 +3034,6 @@ function normalizeTappList(body) {
             tappId,
             name: typeof item.name === "string" && item.name.trim() ? item.name.trim() : tappId,
             serviceCount: normalizeNonnegativeInteger(item.serviceCount),
-            queueCount: normalizeNonnegativeInteger(item.queueCount),
         });
     }
     return tapps;
@@ -3114,7 +3054,6 @@ function preferredStudioTappId(options, lastSelection, tapps) {
 function formatTappChoice(tapp) {
     const details = [
         `${tapp.serviceCount} service${tapp.serviceCount === 1 ? "" : "s"}`,
-        `${tapp.queueCount} queue${tapp.queueCount === 1 ? "" : "s"}`,
     ].join(", ");
     return tapp.name === tapp.tappId
         ? `${tapp.tappId} ${pc.dim(`(${details})`)}`
@@ -3317,8 +3256,6 @@ async function launchPortableStudioServer(exePath, options, manifest) {
         apiBaseUrl: options.apiBaseUrl,
         projectId: options.projectId,
         tappId: options.projectId,
-        workspaceRoot: options.workspaceRoot,
-        workspaceConfig: options.workspace?.configPath,
         manifestVersion: manifest.version,
         updatedAt: new Date().toISOString(),
     });
@@ -3486,7 +3423,6 @@ async function runDoctor(options) {
     console.log(`Studio channel: ${options.channel}`);
     console.log(`Studio manifest: ${options.manifestUrl}`);
     console.log(`Studio cache: ${options.cacheDir}`);
-    console.log(`Workspace: ${options.workspaceRoot ?? "not found"}`);
     console.log(`Project: ${options.projectId ?? "not set"}`);
     try {
         const manifest = await withCliSpinner("Fetching latest Tapi Studio manifest", () => fetchStudioManifest(options.manifestUrl));
@@ -3507,12 +3443,6 @@ function buildStudioLaunchEnv(options) {
     const env = { ...process.env };
     env.TAPI_STUDIO_API_BASE_URL = options.apiBaseUrl;
     env.TAPI_BASE_URL = env.TAPI_BASE_URL || options.apiBaseUrl;
-    if (options.workspaceRoot) {
-        env.TAPI_WORKSPACE_ROOT = options.workspaceRoot;
-    }
-    if (options.workspace?.configPath) {
-        env.TAPI_WORKSPACE_CONFIG = options.workspace.configPath;
-    }
     if (options.projectId) {
         env.TAPI_PROJECT_ID = options.projectId;
     }
@@ -3893,7 +3823,6 @@ export function studioInstanceRecordPathForOptions(options) {
         .update(JSON.stringify({
         apiBaseUrl: comparableHttpUrl(options.apiBaseUrl),
         projectId: options.projectId ?? "",
-        workspaceRoot: comparableFsPath(options.workspaceRoot ?? ""),
     }))
         .digest("hex")
         .slice(0, 24);
@@ -3955,8 +3884,6 @@ async function readStudioInstanceRecord(options) {
             apiBaseUrl: typeof parsed.apiBaseUrl === "string" ? parsed.apiBaseUrl : "",
             projectId: typeof parsed.projectId === "string" ? parsed.projectId : undefined,
             tappId: typeof parsed.tappId === "string" ? parsed.tappId : undefined,
-            workspaceRoot: typeof parsed.workspaceRoot === "string" ? parsed.workspaceRoot : undefined,
-            workspaceConfig: typeof parsed.workspaceConfig === "string" ? parsed.workspaceConfig : undefined,
             manifestVersion: typeof parsed.manifestVersion === "string" ? parsed.manifestVersion : undefined,
             updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : "",
         };
@@ -3977,11 +3904,6 @@ function studioInstanceIdentityMatches(identity, options) {
     if (expectedProject && actualProject && actualProject !== expectedProject) {
         return false;
     }
-    const expectedWorkspace = comparableFsPath(options.workspaceRoot ?? "");
-    const actualWorkspace = comparableFsPath(typeof identity.workspaceRoot === "string" ? identity.workspaceRoot : "");
-    if (expectedWorkspace && actualWorkspace && actualWorkspace !== expectedWorkspace) {
-        return false;
-    }
     const expectedApiBaseUrl = comparableHttpUrl(options.apiBaseUrl);
     const actualApiBaseUrl = comparableHttpUrl(typeof identity.apiBaseUrl === "string" ? identity.apiBaseUrl : "");
     if (expectedApiBaseUrl && actualApiBaseUrl && actualApiBaseUrl !== expectedApiBaseUrl) {
@@ -3992,10 +3914,6 @@ function studioInstanceIdentityMatches(identity, options) {
 function comparableHttpUrl(value) {
     return String(value || "").trim().replace(/\/+$/, "").toLowerCase();
 }
-function comparableFsPath(value) {
-    const trimmed = String(value || "").trim();
-    return trimmed ? resolve(trimmed).toLowerCase() : "";
-}
 function getDefaultTapiDataDir() {
     if (process.platform === "win32") {
         const localAppData = process.env.LOCALAPPDATA
@@ -4506,7 +4424,9 @@ async function isTapiManagedReleaseDir(directory) {
     return Array.isArray(entries) && entries.length === 0;
 }
 function looksLikeTapiServiceReleaseDir(directory) {
-    return (existsSync(join(directory, "tapi-service-host.exe"))
+    const hasServiceHost = existsSync(join(directory, "tapi-service-host.exe"))
+        || existsSync(join(directory, "tapi-service-host", "tapi-service-host.exe"));
+    return (hasServiceHost
         && existsSync(join(directory, "install_tapi_service.ps1"))
         && (existsSync(join(directory, "tapi-service-worker.exe"))
             || existsSync(join(directory, "tapi-service-worker", "tapi-service-worker.exe"))));
@@ -4693,10 +4613,9 @@ function printHelp() {
 
 Usage:
   tapi login
-  tapi init --project PROJECT
-  tapi link --project PROJECT
   tapi studio install [--channel pilot] [--api-base-url URL]
   tapi studio
+  tapi studio dev --tapp <tapp>
   tapi studio --tapp <tapp>
   tapi studio --select
   tapi studio open
@@ -4704,20 +4623,20 @@ Usage:
   tapi tapp create <tapp>
   tapi queue create [display-name]
   tapi tapp service add <tapp> <service.call> --service-map ID --entry ENTRY
-  tapi tapp queue add <tapp> <queue-id>
-  tapi runner setup --runner-id RUNNER --project TAPP
+  tapi runner gui
+  tapi runner dev --tapp <tapp> [--capacity 4]
+  tapi runner setup --runner-id RUNNER
   tapi runner slot set <runner-id> <slot-index> <queue-id>
   tapi services describe <servicemap.run>
-  tapi services sync
-  tapi triggers sync
+  tapi triggers sync
   tapi sessions
   tapi service status
   tapi doctor
 
 Commands:
   login           Sign in with Firebase credentials for SDK commands
-  init            Create .tapi/project.json for this repo
-  link            Rebind this repo to an existing Tapi project
+  init            Retired; use tapp create/login/studio instead
+  link            Retired; use explicit Tapp commands instead
   studio install  Download, verify, and run the Tapi Studio installer
   studio          Open Tapi Studio for a selected Tapp
   studio open     Open Tapi Studio for a selected Tapp
@@ -4726,12 +4645,13 @@ Commands:
   queue create    Create a queue for service-run routing
   tapp service add
                   Add a ServiceMap-backed service call to a Tapp
-  tapp queue add  Attach a queue to a Tapp
-  runner setup    Open the local runner queue/slot setup UI
+  runner gui      Open the installed desktop Runner app
+  runner dev      Run a source Runner for a Tapp development session
+  runner setup    Open the legacy local browser queue/slot setup UI
   runner slot set Assign a queue to a runner slot
   services describe
                   Print a ServiceMap service-run input/output contract
-  services sync   Save the service-run catalog to .tapi/services
+  services sync   Retired; service-run contracts are server-backed
   triggers sync   Upsert service triggers from tapi.config
   sessions        List dev-mode API sessions and open takeover sessions
   service         Inspect or control the local Tapi Windows service
@@ -4753,7 +4673,6 @@ function printTappHelp() {
 Usage:
   tapi tapp create <tapp> [--name NAME] [--api-base-url URL]
   tapi tapp service add <tapp> <service.call> --service-map ID --entry ENTRY [--api-base-url URL]
-  tapi tapp queue add <tapp> <queue-id> [--api-base-url URL]
 
 Options:
   --api-base-url <url>     Tapi API base URL
@@ -4769,12 +4688,11 @@ function printQueueHelp() {
     console.log(`Tapi queue commands
 
 Usage:
-  tapi queue create [display-name] [--max-slots N] [--project TAPP] [--api-base-url URL]
+  tapi queue create [display-name] [--max-slots N] [--api-base-url URL]
 
 Options:
   --api-base-url <url>  Tapi API base URL
   --server <url>        Alias for --api-base-url
-  --project <id>        Optional project scope for the queue request
   --max-slots <n>       Maximum runner slots this queue may use
 `);
 }
@@ -4782,16 +4700,21 @@ function printRunnerHelp() {
     console.log(`Tapi runner commands
 
 Usage:
-  tapi runner setup --runner-id RUNNER --project TAPP [--port PORT] [--no-open] [--api-base-url URL]
-  tapi runner slot set <runner-id> <slot-index> <queue-id> [--project TAPP] [--api-base-url URL]
+  tapi runner gui
+  tapi runner dev --tapp <tapp> [--capacity COUNT] [--workspace PATH] [--no-watch]
+  tapi runner setup --runner-id RUNNER [--port PORT] [--no-open] [--api-base-url URL]
+  tapi runner slot set <runner-id> <slot-index> <queue-id> [--api-base-url URL]
 
 Options:
   --api-base-url <url>  Tapi API base URL
   --server <url>        Alias for --api-base-url
-  --project <id>        Tapi project id; defaults to TAPI_PROJECT_ID or .tapi/project.json
   --runner-id <id>      Runner id for setup; defaults to TAPI_RUNNER_ID
   --port <n>            Local setup UI port; defaults to 17687
   --no-open             Print the setup URL without opening a browser
+
+Notes:
+  The normal Windows path is the Tapi Runner desktop app. The setup command is
+  kept for development and automation fallback.
 `);
 }
 function printSessionsHelp() {
@@ -4805,7 +4728,7 @@ Usage:
 Options:
   --api-base-url <url>   Tapi API base URL
   --server <url>         Alias for --api-base-url
-  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID or .tapi/project.json
+  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID
   --site <name>          Limit sessions to one sitemap/site
   --json                 Print raw grouped session JSON
   --no-interactive       Print the grouped list without the arrow-key picker
@@ -4816,13 +4739,12 @@ function printServicesHelp() {
 
 Usage:
   tapi services describe <servicemap.run> [--api-base-url URL] [--project PROJECT]
-  tapi services sync [--api-base-url URL] [--project PROJECT]
+  tapi services sync
 
 Options:
   --api-base-url <url>   Tapi API base URL
   --server <url>         Alias for --api-base-url
-  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID or .tapi/project.json
-  --catalog <path>       Catalog JSON output path
+  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID
 `);
 }
 function printTriggersHelp() {
@@ -4832,10 +4754,10 @@ Usage:
   tapi triggers sync [--config FILE] [--api-base-url URL] [--project PROJECT]
 
 Options:
-  --config <path>        Trigger config path; defaults to tapi.config.ts/js/json in the workspace root
+  --config <path>        Trigger config path; defaults to tapi.config.ts/js/json in the current directory
   --api-base-url <url>   Tapi API base URL
   --server <url>         Alias for --api-base-url
-  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID or .tapi/project.json
+  --project <id>         Tapi project id; defaults to TAPI_PROJECT_ID
 
 Config:
   export default {
@@ -4854,8 +4776,9 @@ function printStudioHelp() {
     console.log(`Tapi Studio commands
 
 Usage:
-  tapi studio [options]
-  tapi studio install [options]
+  tapi studio [options]
+  tapi studio dev --tapp <tapp> [options]
+  tapi studio install [options]
   tapi studio open [options]
   tapi studio doctor [options]
 
@@ -4866,9 +4789,7 @@ Options:
   --tapp <id>            Open this Tapp directly
   --select               Force the account Tapp picker
   --last                 Reuse the last selected Tapp
-  --no-select            Skip the picker and use env/workspace/default context
-  --workspace <path>     Search this directory for .tapi/project.json
-  --no-workspace         Do not load .tapi/project.json
+  --no-select            Skip the picker and use explicit/env Tapp context
   --project <id>         Alias for --tapp
   --project-slug <slug>  Optional display slug for the bound project
   --install-token <tok>  Preissued Studio install token (skips browser sign-in)
@@ -4881,18 +4802,16 @@ Options:
 `);
 }
 function printWorkspaceHelp(command) {
-    console.log(`Tapi workspace ${command}
-
-Usage:
-  tapi ${command} --project PROJECT [--api-base-url URL] [--root PATH] [--force]
-
-Options:
-  --project <id>         Tapi project id/name to bind this repo to
-  --project-slug <slug>  Optional display slug
-  --api-base-url <url>   Tapi API base URL stored in .tapi/project.json
-  --server <url>         Alias for --api-base-url
-  --root <path>          Directory where .tapi/project.json should be written
-  --force                Overwrite an existing workspace config
+    console.log(`Tapi workspace ${command} is retired
+
+Usage:
+  tapi tapp create <tapp>
+  tapi login
+  tapi studio <tapp>
+
+Options:
+  --api-base-url <url>   Tapi API base URL
+  --server <url>         Alias for --api-base-url
 `);
 }
 function printServiceHelp() {