@stigmer/cli 3.12.8 → 3.13.0

package/resources/run/header.js

@@ -27,6 +27,9 @@ export function renderSessionHeader(out, info) {
         lines.push(row(s, "Subject", info.subject ?? ""));
     if (info.model !== "")
         lines.push(row(s, "Model", info.model));
+    // Only "cursor" is surfaced; native/"" is the default and stays implicit.
+    if (info.harness === "cursor")
+        lines.push(row(s, "Harness", "Cursor"));
     // Only "plan" is surfaced; "agent"/"" is the default and stays implicit.
     if (info.mode === "plan")
         lines.push(row(s, "Mode", "Plan (read-only)"));

package/resources/run/header.js.map

@@ -1 +1 @@
-{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/resources/run/header.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,qEAAqE;AACrE,EAAE;AACF,4EAA4E;AAC5E,wEAAwE;AACxE,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,+EAA+E;AAC/E,4EAA4E;AAG5E,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa/D,8EAA8E;AAC9E,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,GAAuD,EAAE,IAAuB;IAClH,MAAM,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IACnF,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/D,yEAAyE;IACzE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACzE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvC,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/B,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,GAAG,CAAC,CAA4B,EAAE,KAAa,EAAE,KAAa;IACrE,MAAM,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC;AACpC,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,cAAc,CAAC,OAAkC;IAC/D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../src/resources/run/header.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,qEAAqE;AACrE,EAAE;AACF,4EAA4E;AAC5E,wEAAwE;AACxE,4EAA4E;AAC5E,2EAA2E;AAC3E,4EAA4E;AAC5E,+EAA+E;AAC/E,4EAA4E;AAG5E,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB/D,8EAA8E;AAC9E,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,GAAuD,EAAE,IAAuB;IAClH,MAAM,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACvE,IAAI,IAAI,CAAC,SAAS,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;IACnF,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/D,0EAA0E;IAC1E,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvE,yEAAyE;IACzE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACzE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvC,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC/B,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,GAAG,CAAC,CAA4B,EAAE,KAAa,EAAE,KAAa;IACrE,MAAM,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC;AACpC,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,cAAc,CAAC,OAAkC;IAC/D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC"}

package/resources/run/prepare.d.ts

@@ -17,6 +17,14 @@ export type ServiceTierFlag = "" | "standard" | "fast";
  * unset — distinct from an explicit "disabled" for the same ledger reason.
  */
 export type ThinkingFlag = "" | "disabled" | "enabled";
+/**
+ * The `--harness` flag's value space (oss#293): empty means unset — the
+ * account preference may fill it (see {@link prepareAgentExec}), and when
+ * nothing resolves the server defaults the session to native. Deliberately
+ * only the two shipped engines, mirroring the proto validation on
+ * `IdentityAccountPreferences.default_harness`.
+ */
+export type HarnessFlag = "" | "native" | "cursor";
 /** Raw agent-execution flags shared by `run` and `draft` (Go's agentExecFlags). */
 export interface AgentExecFlags {
     readonly message: string;
@@ -36,6 +44,7 @@ export interface AgentExecFlags {
     readonly mode: RunMode;
     readonly serviceTier: ServiceTierFlag;
     readonly thinking: ThinkingFlag;
+    readonly harness: HarnessFlag;
 }
 /**
  * The validated, resolved inputs ready for create + stream. Mirrors Go's
@@ -55,17 +64,37 @@ export interface PreparedRun {
     readonly mode: RunMode;
     readonly serviceTier: ServiceTierFlag;
     readonly thinking: ThinkingFlag;
+    /**
+     * The RESOLVED harness for the new session: the explicit flag, else the
+     * account preference (when the caller opted in), else "" — which stays off
+     * the wire so the server default (native) applies. Also drives the header's
+     * visibility row: a cursor session is never entered silently.
+     */
+    readonly harness: HarnessFlag;
 }
 /** Optional behavior switches for {@link prepareAgentExec}. */
 export interface PrepareAgentExecOptions {
     /**
      * When `true` (the caller's backend is Stigmer Cloud) and `--model` is
      * omitted, the model is filled from the caller's account preference
-     * (`IdentityAccountPreferences.default_native_model`) via `whoAmI()`.
-     * Local mode has no IdentityAccount, so callers pass `false` there and
-     * the omitted model keeps resolving to the platform default.
+     * (`IdentityAccountPreferences.default_*_model` for the resolved harness)
+     * via `whoAmI()`. Local mode has no IdentityAccount, so callers pass
+     * `false` there and the omitted model keeps resolving to the platform
+     * default.
      */
     readonly cloudBackend?: boolean;
+    /**
+     * When `true` and `--harness` is omitted, the harness is filled from the
+     * caller's account preference (`IdentityAccountPreferences.default_harness`)
+     * on cloud. `run` opts in; `draft` deliberately does not: draft executes the
+     * seedpack's system creator agents (a utility flow, not the user's own
+     * conversation), which are built and exercised on the native harness —
+     * silently rerouting them onto the cursor engine (different toolset,
+     * premium billing tier) would fail the least-surprise test. An explicit
+     * `--harness` on draft still wins; only the silent preference fill is
+     * scoped out. Owner-ratified (D5, 2026-08-23).
+     */
+    readonly applyAccountHarnessDefault?: boolean;
 }
 /**
  * Validate flags and resolve all execution inputs. The `org` is used to inject
@@ -98,4 +127,13 @@ export declare function validateServiceTier(tier: string): asserts tier is Servi
  * before a network round trip.
  */
 export declare function validateThinking(mode: string): asserts mode is ThinkingFlag;
+/**
+ * Validate the `--harness` flag. Empty means "use default": the account
+ * preference when the caller opted in, else the platform default (native).
+ * Only the shipped engines are accepted — other harness names that appear in
+ * UI metadata (copilot, codex, ...) have no proto mapping yet, so rejecting
+ * them here is honest, and this check catches spelling errors before a
+ * network round trip.
+ */
+export declare function validateHarness(harness: string): asserts harness is HarnessFlag;
 //# sourceMappingURL=prepare.d.ts.map

package/resources/run/prepare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../src/resources/run/prepare.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../../src/resources/run/prepare.ts"],"names":[],"mappings":"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"}

package/resources/run/prepare.js

@@ -20,13 +20,25 @@ export async function prepareAgentExec(flags, client, org, progress, options) {
     validateMode(flags.mode);
     validateServiceTier(flags.serviceTier);
     validateThinking(flags.thinking);
-    // Layered model seed (oss#293 Phase 1.5): an explicit --model always wins;
-    // an omitted one fills from the account preference on cloud. `run` and
-    // `draft` always create a NEW session (threading lives in `resume`, which
-    // does not pass through here), so the fill never injects a native model
-    // into an existing cursor-harness session.
-    const model = flags.model === "" && options?.cloudBackend === true
-        ? await resolveModelFromAccountPreference(client)
+    validateHarness(flags.harness);
+    // Layered seeds (oss#293, DD-003): explicit flag > account preference
+    // (cloud only) > platform default. Harness resolves first because the model
+    // fill is harness-aware: a cursor session fills from default_cursor_model,
+    // everything else from default_native_model. `run` and `draft` always
+    // create a NEW session (threading lives in `resume`, which does not pass
+    // through here), so neither fill can ever contradict an existing session's
+    // immutable harness. One whoAmI round trip serves both fills, and it is
+    // skipped entirely when explicit flags leave nothing to fill.
+    const wantsHarnessFill = flags.harness === "" && options?.applyAccountHarnessDefault === true;
+    const wantsModelFill = flags.model === "";
+    const accountDefaults = options?.cloudBackend === true && (wantsHarnessFill || wantsModelFill)
+        ? await resolveAccountExecutionDefaults(client)
+        : NO_ACCOUNT_DEFAULTS;
+    const harness = flags.harness !== "" ? flags.harness : wantsHarnessFill ? accountDefaults.harness : "";
+    const model = wantsModelFill
+        ? harness === "cursor"
+            ? accountDefaults.cursorModel
+            : accountDefaults.nativeModel
         : flags.model;
     const workspaceEntries = parseWorkspaceEntries(flags.workspace, flags.branch, flags.commit);
     const runtimeEnv = loadAndMergeEnv({
@@ -53,23 +65,35 @@ export async function prepareAgentExec(flags, client, org, progress, options) {
         mode: flags.mode,
         serviceTier: flags.serviceTier,
         thinking: flags.thinking,
+        harness,
     };
 }
+const NO_ACCOUNT_DEFAULTS = { harness: "", nativeModel: "", cursorModel: "" };
 /**
- * Best-effort read of the caller's default model for native-harness runs
- * (CLI sessions are native — there is no --harness flag yet, so the cursor
- * default is deliberately not consulted). Any failure — network, auth, a
- * backend without IdentityAccount — resolves to "" and the run proceeds
- * exactly as an unfilled --model does today: a missing preference must
- * never fail a run.
+ * Best-effort read of the caller's execution defaults
+ * (`IdentityAccountPreferences.default_harness` / `default_*_model`) in one
+ * whoAmI round trip. Any failure — network, auth, a backend without
+ * IdentityAccount — resolves to no defaults and the run proceeds exactly as
+ * unfilled flags do today: a missing preference must never fail a run.
+ *
+ * The persisted harness value is allowlist-guarded to the shipped engines
+ * (the same guard the web launcher's useAccountExecutionDefaults applies):
+ * a client must not trust stored data it did not write, so anything outside
+ * native/cursor is treated as undeclared rather than stamped on the wire.
  */
-async function resolveModelFromAccountPreference(client) {
+async function resolveAccountExecutionDefaults(client) {
     try {
         const account = await client.identityAccount.whoAmI();
-        return account.spec?.preferences?.defaultNativeModel ?? "";
+        const prefs = account.spec?.preferences;
+        const declared = prefs?.defaultHarness;
+        return {
+            harness: declared === "native" || declared === "cursor" ? declared : "",
+            nativeModel: prefs?.defaultNativeModel ?? "",
+            cursorModel: prefs?.defaultCursorModel ?? "",
+        };
     }
     catch {
-        return "";
+        return NO_ACCOUNT_DEFAULTS;
     }
 }
 /**
@@ -127,4 +151,17 @@ export function validateThinking(mode) {
         throw new UsageError(`invalid --thinking value "${mode}": must be "disabled" or "enabled"`);
     }
 }
+/**
+ * Validate the `--harness` flag. Empty means "use default": the account
+ * preference when the caller opted in, else the platform default (native).
+ * Only the shipped engines are accepted — other harness names that appear in
+ * UI metadata (copilot, codex, ...) have no proto mapping yet, so rejecting
+ * them here is honest, and this check catches spelling errors before a
+ * network round trip.
+ */
+export function validateHarness(harness) {
+    if (harness !== "" && harness !== "native" && harness !== "cursor") {
+        throw new UsageError(`invalid --harness value "${harness}": must be "native" or "cursor"`);
+    }
+}
 //# sourceMappingURL=prepare.js.map

package/resources/run/prepare.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/resources/run/prepare.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/resources/run/prepare.ts"],"names":[],"mappings":"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"}

package/src/commands/agent-exec-flags.ts

@@ -3,7 +3,7 @@
 // execution flag is added here once and both surfaces pick it up.
 
 import type { Command } from "commander";
-import type { AgentExecFlags, RunMode, ServiceTierFlag, ThinkingFlag } from "../resources/run/prepare.js";
+import type { AgentExecFlags, HarnessFlag, RunMode, ServiceTierFlag, ThinkingFlag } from "../resources/run/prepare.js";
 
 /** Commander collector for repeatable string options. */
 export const collect = (value: string, previous: string[]): string[] => [...previous, value];
@@ -27,6 +27,7 @@ export interface AgentExecOptions {
   mode?: string;
   serviceTier?: string;
   thinking?: string;
+  harness?: string;
 }
 
 /**
@@ -54,7 +55,8 @@ export function addAgentExecFlags(command: Command, requireMessage = false): Com
     .option("--auto-approve", "automatically approve all tool executions")
     .option("--mode <mode>", 'interaction mode: "agent" (default) or "plan" (read-only)')
     .option("--service-tier <tier>", 'model service tier: "standard" (default) or "fast" (requires --model naming a model with a fast tier; billed at fast rates)')
-    .option("--thinking <mode>", 'extended reasoning: "disabled" (default) or "enabled" (requires --model naming a thinking-capable model; billed at base rates, uses more output tokens)');
+    .option("--thinking <mode>", 'extended reasoning: "disabled" (default) or "enabled" (requires --model naming a thinking-capable model; billed at base rates, uses more output tokens)')
+    .option("--harness <harness>", 'execution harness for the new session: "native" (default) or "cursor"');
 }
 
 /** Map parsed commander options onto the shared {@link AgentExecFlags} shape. */
@@ -77,5 +79,6 @@ export function toAgentExecFlags(options: AgentExecOptions): AgentExecFlags {
     mode: (options.mode ?? "") as RunMode,
     serviceTier: (options.serviceTier ?? "") as ServiceTierFlag,
     thinking: (options.thinking ?? "") as ThinkingFlag,
+    harness: (options.harness ?? "") as HarnessFlag,
   };
 }

package/src/commands/run.ts

@@ -173,6 +173,9 @@ async function runResolvedAgent(
 
   const prepared = await prepareAgentExec(toAgentExecFlags(options), client.stigmer, org, stderrProgress(), {
     cloudBackend: isCloudMode(client.config),
+    // run opts into the account default_harness fill; draft deliberately
+    // does not (see the option's doc comment for the D5 rationale).
+    applyAccountHarnessDefault: true,
   });
   await executeResolvedAgent({
     agent,

package/src/commands/up.ts

@@ -6,9 +6,11 @@
 // outcome. The launcher (and the heavy resolvers it pulls in) load lazily so
 // `--help` stays fast (DD-001).
 
+import { homedir } from "node:os";
+import { join } from "node:path";
 import type { Command } from "commander";
 import { CommandResult, type OutputFlags, renderResult } from "../output/index.js";
-import { SERVER_PORT } from "../local/constants.js";
+import { HEALTH_STATE_FILE, SERVER_PORT } from "../local/constants.js";
 import { addResultFlags, resultFormat } from "./shared.js";
 
 interface UpFlags extends OutputFlags {
@@ -16,15 +18,17 @@ interface UpFlags extends OutputFlags {
   web?: boolean; // false when --no-web is passed
 }
 
+// The server serves the web console from its unified port (DD-012); the
+// flag suppresses probing/reporting it, not the serving itself (one
+// process, one origin — there is no separate console to not-start).
+const NO_WEB_HELP = "don't report the web console URL";
+
 export function registerUp(program: Command): void {
   const up = program
     .command("up")
     .description("start the local Stigmer stack (server, runner, Temporal)")
     .option("--server-only", "start only the control plane (no runners)")
-    // Accepted for compatibility with the Go CLI; this CLI does not bundle a
-    // local web console, so the stack is headless either way (use the cloud
-    // console at app.stigmer.ai for a UI).
-    .option("--no-web", "no-op: this CLI does not serve a local web console")
+    .option("--no-web", NO_WEB_HELP)
     .action((options: UpFlags) =>
       runUp({ serverOnly: options.serverOnly === true, noWeb: options.web === false }, options),
     );
@@ -33,7 +37,7 @@ export function registerUp(program: Command): void {
   const server = up
     .command("server")
     .description("start only the control plane (no runners)")
-    .option("--no-web", "no-op: this CLI does not serve a local web console")
+    .option("--no-web", NO_WEB_HELP)
     .action((options: UpFlags) => runUp({ serverOnly: true, noWeb: options.web === false }, options));
   addResultFlags(server);
 }
@@ -46,6 +50,20 @@ async function runUp(opts: { serverOnly: boolean; noWeb: boolean }, flags: Outpu
   const result = CommandResult.success(opts.serverOnly ? "Stigmer control plane is up" : "Stigmer local stack is up");
   const section = result.addSection("Endpoints");
   section.field("server", `http://localhost:${SERVER_PORT}`);
+  if (await consoleReported()) {
+    // Same origin as the API: the server serves the console (DD-012). Only
+    // printed when the daemon's probe found a bundled export — a dev-tree
+    // server without one must not advertise a dead URL.
+    section.field("console", `http://localhost:${SERVER_PORT}`);
+  }
   result.hint("Check status with: stigmer status").hint("Stop it with:    stigmer down");
   renderResult(result, resultFormat(flags));
 }
+
+/** Whether the daemon recorded the web console as running (its own probe). */
+async function consoleReported(): Promise<boolean> {
+  const { dataDir } = await import("../local/paths.js");
+  const { loadHealthState } = await import("../local/state/health-state.js");
+  const health = loadHealthState(join(dataDir(homedir()), HEALTH_STATE_FILE));
+  return health?.components["web-console"]?.state === "running";
+}

package/src/config/resolve.test.ts

@@ -109,7 +109,7 @@ describe("resolveConsoleURL", () => {
   });
 
   it("uses the local web-console port for the local backend", () => {
-    expect(resolveConsoleURL("local", {} as NodeJS.ProcessEnv)).toBe("http://localhost:8234");
+    expect(resolveConsoleURL("local", {} as NodeJS.ProcessEnv)).toBe("http://localhost:7234");
   });
 
   it("uses the cloud console URL for the cloud backend", () => {

package/src/config/resolve.ts

@@ -3,7 +3,7 @@
 // precedence keeps every call site consistent (mirrors the Go CLI's Resolve*).
 
 import { CliExitError, ExitCode } from "../errors/index.js";
-import { WEB_CONSOLE_PORT } from "../local/constants.js";
+import { SERVER_PORT } from "../local/constants.js";
 import { type BackendType, type Config, isCloudMode } from "./config.js";
 
 const DEFAULT_CLOUD_ENDPOINT = "api.stigmer.ai:443";
@@ -76,17 +76,20 @@ export function resolveOrganization(config: Config, flagOrg?: string): string {
 /**
  * Resolve the web console URL:
  *   1. `STIGMER_CONSOLE_URL` (explicit override)
- *   2. local backend → `http://localhost:{WEB_CONSOLE_PORT}`
+ *   2. local backend → `http://localhost:{SERVER_PORT}` — the server's own
+ *      unified port serves the console since DD-012 (one origin for UI and
+ *      API; the Go-era separate 8234 listener is retired)
  *   3. cloud backend → {@link DEFAULT_CLOUD_CONSOLE_URL}
  *
  * The console origin is also the app origin that serves the hosted chat
  * page (`/chat/<org>/<slug>`) and the embed loader (`/embed.js`), so
- * share-link builders use this same resolver.
+ * share-link builders use this same resolver — both routes live in the
+ * same static export the server serves.
  */
 export function resolveConsoleURL(backendType: BackendType, env: NodeJS.ProcessEnv = process.env): string {
   const override = env.STIGMER_CONSOLE_URL;
   if (override !== undefined && override !== "") return override;
-  if (backendType === "local") return `http://localhost:${WEB_CONSOLE_PORT}`;
+  if (backendType === "local") return `http://localhost:${SERVER_PORT}`;
   return DEFAULT_CLOUD_CONSOLE_URL;
 }
 

package/src/local/constants.ts

@@ -7,12 +7,16 @@
 // runner-poll can never drift (see the T05 plan's "Critical correctness
 // finding").
 
-/** Port `stigmer-server` listens on (gRPC). Matches the Go CLI's `DaemonPort`. */
+/**
+ * Port `stigmer-server` listens on (gRPC). Matches the Go CLI's `DaemonPort`.
+ *
+ * This is also the web console's origin: since DD-012 the server serves the
+ * console's static export on this same unified port (lane 4), so the Go-era
+ * WEB_CONSOLE_PORT (8234, a separate CLI-embedded listener) is retired —
+ * one process, one origin, no CORS hop.
+ */
 export const SERVER_PORT = 7234;
 
-/** Port the embedded web console is served on (7xxx=API, 8xxx=UI convention). */
-export const WEB_CONSOLE_PORT = 8234;
-
 /** Temporal frontend gRPC port (dev server default). */
 export const TEMPORAL_PORT = 7233;
 

package/src/local/daemon/components.test.ts

@@ -11,7 +11,7 @@ const config: DaemonConfig = {
   temporalAddress: "127.0.0.1:7233",
   serverOnly: false,
   noWeb: false,
-  serverBin: "/bin/stigmer-server",
+  server: { nodeBin: "/bin/node", entryPath: "/repo/server/dist/main.js", appDir: "/repo/server" },
   runner: { nodeBin: "/bin/node", entryPath: "/repo/runner/dist/main.js", appDir: "/repo/runner" },
 };
 
@@ -133,6 +133,14 @@ describe("buildComponents", () => {
     expect(runner.resolve().args).toEqual(["/repo/runner/dist/main.js"]);
   });
 
+  // The TS server child is `node <entry>` — the runner's launch shape.
+  it("spawns the node-shape server as node + entry", () => {
+    const [server] = buildComponents(config, {});
+    const spawn = server.resolve();
+    expect(spawn.command).toBe("/bin/node");
+    expect(spawn.args).toEqual(["/repo/server/dist/main.js"]);
+  });
+
   it("omits the runner in server-only mode", () => {
     const components = buildComponents({ ...config, serverOnly: true }, {});
     expect(components.map((c) => c.name)).toEqual(["stigmer-server"]);

package/src/local/daemon/components.ts

@@ -91,9 +91,11 @@ export function buildComponents(config: DaemonConfig, base: NodeJS.ProcessEnv =
       name: "stigmer-server",
       pidFile: join(config.dataDir, SERVER_PID_FILE),
       critical: true,
+      // The server is `node <entry>` — the runner's launch shape, one child
+      // contract for both components.
       resolve: () => ({
-        command: config.serverBin,
-        args: [],
+        command: config.server.nodeBin,
+        args: [config.server.entryPath],
         env: buildServerEnv(config, base),
         logFile: join(config.logDir, "stigmer-server.log"),
       }),

package/src/local/daemon/daemon.integration.test.ts

@@ -128,7 +128,7 @@ describe("runInternalDaemon (full body with fakes)", () => {
       temporalAddress: "127.0.0.1:7233",
       serverOnly: false,
       noWeb: true,
-      serverBin: "server-cmd",
+      server: { nodeBin: "node-cmd", entryPath: join(data, "server-entry.js"), appDir: data },
       runner: { nodeBin: "node-cmd", entryPath: join(data, "entry.js"), appDir: data },
     };
 

package/src/local/daemon/env.test.ts

@@ -8,7 +8,11 @@ const baseInputs: DaemonEnvInputs = {
   temporalAddress: "127.0.0.1:7233",
   serverOnly: false,
   noWeb: false,
-  serverBin: "/usr/local/bin/stigmer-server",
+  server: {
+    nodeBin: "/usr/bin/node",
+    entryPath: "/repo/server/dist/main.js",
+    appDir: "/repo/server",
+  },
   runner: { nodeBin: "/usr/bin/node", entryPath: "/repo/runner/dist/main.js", appDir: "/repo/runner" },
 };
 
@@ -23,7 +27,11 @@ describe("buildDaemonEnv + readDaemonConfig", () => {
       temporalAddress: "127.0.0.1:7233",
       serverOnly: false,
       noWeb: false,
-      serverBin: "/usr/local/bin/stigmer-server",
+      server: {
+        nodeBin: "/usr/bin/node",
+        entryPath: "/repo/server/dist/main.js",
+        appDir: "/repo/server",
+      },
       runner: { nodeBin: "/usr/bin/node", entryPath: "/repo/runner/dist/main.js", appDir: "/repo/runner" },
       cursorApiKey: undefined,
       anthropicApiKey: undefined,
@@ -90,8 +98,11 @@ describe("buildDaemonEnv + readDaemonConfig", () => {
     expect(readDaemonConfig(env)).not.toHaveProperty("openaiApiKey");
   });
 
-  it("requires the data dir and server binary", () => {
+  it("requires the data dir and the full server launch triple", () => {
     expect(() => readDaemonConfig({})).toThrow(/STIGMER_DATA_DIR/);
-    expect(() => readDaemonConfig({ STIGMER_DATA_DIR: "/x" })).toThrow(/STIGMER_SERVER_BIN/);
+    expect(() => readDaemonConfig({ STIGMER_DATA_DIR: "/x" })).toThrow(/STIGMER_SERVER_NODE_BIN/);
+    expect(() => readDaemonConfig({ STIGMER_DATA_DIR: "/x", STIGMER_SERVER_NODE_BIN: "/usr/bin/node" })).toThrow(
+      /STIGMER_SERVER_ENTRY/,
+    );
   });
 });

package/src/local/daemon/env.ts

@@ -12,7 +12,9 @@ export const DaemonEnvVar = {
   TemporalAddress: "TEMPORAL_SERVICE_ADDRESS",
   ServerOnly: "STIGMER_SERVER_ONLY",
   NoWeb: "STIGMER_NO_WEB",
-  ServerBin: "STIGMER_SERVER_BIN",
+  ServerNodeBin: "STIGMER_SERVER_NODE_BIN",
+  ServerEntry: "STIGMER_SERVER_ENTRY",
+  ServerAppDir: "STIGMER_SERVER_APP_DIR",
   RunnerNodeBin: "STIGMER_RUNNER_NODE_BIN",
   RunnerEntry: "STIGMER_RUNNER_ENTRY",
   RunnerAppDir: "STIGMER_RUNNER_APP_DIR",
@@ -30,6 +32,18 @@ export interface RunnerLaunch {
   appDir: string;
 }
 
+/**
+ * Resolved server launch coordinates: a node binary + bundled entry — the
+ * same launch shape as the runner. (Until #25 go-server-retirement this was
+ * a discriminated union whose "binary" variant carried the Go rollback
+ * executable.)
+ */
+export interface ServerLaunch {
+  nodeBin: string;
+  entryPath: string;
+  appDir: string;
+}
+
 /** The daemon's resolved configuration, parsed from the environment. */
 export interface DaemonConfig {
   dataDir: string;
@@ -38,7 +52,7 @@ export interface DaemonConfig {
   temporalAddress: string;
   serverOnly: boolean;
   noWeb: boolean;
-  serverBin: string;
+  server: ServerLaunch;
   runner?: RunnerLaunch;
   cursorApiKey?: string;
   anthropicApiKey?: string;
@@ -55,7 +69,7 @@ export interface DaemonEnvInputs {
   temporalAddress: string;
   serverOnly: boolean;
   noWeb: boolean;
-  serverBin: string;
+  server: ServerLaunch;
   runner?: RunnerLaunch;
   // Anthropic API key resolved by the launcher (env > config file). Must be
   // written into the daemon env explicitly: unlike a shell-exported key, a key
@@ -83,7 +97,9 @@ export function buildDaemonEnv(inputs: DaemonEnvInputs, base: NodeJS.ProcessEnv
   env[DaemonEnvVar.LogDir] = inputs.logDir;
   env[DaemonEnvVar.TemporalManaged] = String(inputs.temporalManaged);
   env[DaemonEnvVar.TemporalAddress] = inputs.temporalAddress;
-  env[DaemonEnvVar.ServerBin] = inputs.serverBin;
+  env[DaemonEnvVar.ServerNodeBin] = inputs.server.nodeBin;
+  env[DaemonEnvVar.ServerEntry] = inputs.server.entryPath;
+  env[DaemonEnvVar.ServerAppDir] = inputs.server.appDir;
   if (inputs.serverOnly) env[DaemonEnvVar.ServerOnly] = "true";
   if (inputs.noWeb) env[DaemonEnvVar.NoWeb] = "1";
   if (inputs.runner !== undefined && !inputs.serverOnly) {
@@ -112,7 +128,7 @@ export function readDaemonConfig(env: NodeJS.ProcessEnv = process.env): DaemonCo
     temporalAddress: env[DaemonEnvVar.TemporalAddress] ?? "127.0.0.1:7233",
     serverOnly,
     noWeb: env[DaemonEnvVar.NoWeb] === "1",
-    serverBin: required(env, DaemonEnvVar.ServerBin),
+    server: readServer(env),
     runner: serverOnly ? undefined : runner,
     cursorApiKey: nonEmpty(env[DaemonEnvVar.CursorApiKey]),
     anthropicApiKey: nonEmpty(env[DaemonEnvVar.AnthropicApiKey]),
@@ -122,6 +138,18 @@ export function readDaemonConfig(env: NodeJS.ProcessEnv = process.env): DaemonCo
   };
 }
 
+function readServer(env: NodeJS.ProcessEnv): ServerLaunch {
+  const nodeBin = env[DaemonEnvVar.ServerNodeBin];
+  const entryPath = env[DaemonEnvVar.ServerEntry];
+  const appDir = env[DaemonEnvVar.ServerAppDir];
+  if (!nodeBin || !entryPath || !appDir) {
+    throw new Error(
+      `the ${DaemonEnvVar.ServerNodeBin}/${DaemonEnvVar.ServerEntry}/${DaemonEnvVar.ServerAppDir} triple is required for the daemon process`,
+    );
+  }
+  return { nodeBin, entryPath, appDir };
+}
+
 function readRunner(env: NodeJS.ProcessEnv): RunnerLaunch | undefined {
   const nodeBin = env[DaemonEnvVar.RunnerNodeBin];
   const entryPath = env[DaemonEnvVar.RunnerEntry];

package/src/local/daemon/launch.ts

@@ -2,7 +2,7 @@
 // `down` (signal + wait + safety-net cleanup), and a liveness check.
 //
 // `up` resolves every heavy dependency in the foreground (Temporal binary,
-// server binary, runner entry) so failures surface with a clear message before
+// server launch, runner entry) so failures surface with a clear message before
 // a detached daemon is spawned, then re-execs this same CLI as the hidden
 // `internal-daemon` and waits until the server's gRPC port answers.
 
@@ -24,7 +24,7 @@ import { rotateLogs } from "../state/log-rotation.js";
 import { resolveApiKey, resolveProvider } from "../llm-config.js";
 import { resolveOperatorIdentity } from "../operator-config.js";
 import { ensureRunner } from "../runtime/runner.js";
-import { ensureServerBinary } from "../runtime/server.js";
+import { ensureServer } from "../runtime/server.js";
 import { TemporalManager } from "../temporal/manager.js";
 import { buildDaemonEnv, type DaemonEnvInputs } from "./env.js";
 
@@ -64,7 +64,8 @@ export async function up(options: UpOptions = {}, home: string = homedir()): Pro
     await temporal.ensureInstalled();
   }
 
-  const serverBin = await ensureServerBinary({ home });
+  // Resolves the server (repo tree or the acquired @stigmer/server-slim).
+  const server = ensureServer({ home });
   const runner = options.serverOnly === true ? undefined : ensureRunner({ home });
 
   const env = buildDaemonEnv(
@@ -75,7 +76,7 @@ export async function up(options: UpOptions = {}, home: string = homedir()): Pro
       temporalAddress: temporal.address,
       serverOnly: options.serverOnly === true,
       noWeb: options.noWeb === true,
-      serverBin,
+      server,
       runner,
       ...resolveLlmKeyInputs(config),
       ...resolveOperatorIdentityInputs(config),