@mycadet/cli 0.13.0-dev.202610171626.d97b8b8 → 0.13.0-dev.202610181631.3760abb

package/node_modules/@mycadet/assistant-api/index.ts

@@ -60,10 +60,6 @@ import { GenerationHandoffEventSchema } from "./events/generation-handoff.js";
 import { HeartbeatConversationCreatedEventSchema } from "./events/heartbeat-conversation-created.js";
 import { HomeFeedUpdatedEventSchema } from "./events/home-feed-updated.js";
 import { HookEventSchema } from "./events/hook-event.js";
-import {
-  HostAppControlCancelEventSchema,
-  HostAppControlRequestEventSchema,
-} from "./events/host-app-control.js";
 import {
   HostBashCancelEventSchema,
   HostBashRequestEventSchema,
@@ -418,16 +414,6 @@ export {
   HookEventOwnerSchema,
   HookEventSchema,
 } from "./events/hook-event.js";
-export {
-  type HostAppControlCancelEvent,
-  HostAppControlCancelEventSchema,
-  type HostAppControlInput,
-  HostAppControlInputSchema,
-  type HostAppControlRequestEvent,
-  HostAppControlRequestEventSchema,
-  type HostAppControlSequenceStep,
-  HostAppControlSequenceStepSchema,
-} from "./events/host-app-control.js";
 export {
   type HostBashCancelEvent,
   HostBashCancelEventSchema,
@@ -1061,8 +1047,6 @@ export const AssistantEventSchema = z.discriminatedUnion("type", [
   HeartbeatConversationCreatedEventSchema,
   HomeFeedUpdatedEventSchema,
   HookEventSchema,
-  HostAppControlCancelEventSchema,
-  HostAppControlRequestEventSchema,
   HostBashCancelEventSchema,
   HostBashRequestEventSchema,
   HostBrowserCancelEventSchema,

package/node_modules/@mycadet/environments/src/__tests__/cloud-assistant-hub-url.test.ts

@@ -2,7 +2,9 @@
  * Pins the environment-to-cloud-hub mapping in one place. Both consumers
  * (the Capacitor shell's `server.url` and the CLI remote-web edge's
  * `hubUrl`) read this helper, so this matrix is the single behavioral pin
- * for the served URLs.
+ * for the served URLs. (The remote-web edge additionally folds local → dev
+ * at its own site: clients served through a tunnel cannot reach the local
+ * seed's loopback.)
  */
 
 import { describe, expect, test } from "bun:test";
@@ -10,29 +12,19 @@ import { describe, expect, test } from "bun:test";
 import { cloudAssistantHubUrl, SEEDS } from "../index.js";
 
 describe("cloudAssistantHubUrl", () => {
-  test("cloud environments resolve to their own web origin", () => {
-    expect(cloudAssistantHubUrl("production")).toBe(
-      "https://mycadet.ai/assistant",
-    );
-    expect(cloudAssistantHubUrl("staging")).toBe(
-      "https://staging.mycadet.ai/assistant",
-    );
-  });
-
-  test("every other environment falls back to the dev SPA", () => {
-    for (const name of ["dev", "test", "local", "unknown-env", undefined]) {
+  test("every known environment resolves to its own web origin", () => {
+    for (const name of ["production", "staging", "dev", "test", "local"]) {
       expect(cloudAssistantHubUrl(name)).toBe(
-        "https://dev.mycadet.ai/assistant",
+        `${SEEDS[name].webUrl}/assistant`,
       );
     }
   });
 
-  test("cloud hub URLs derive from the seed web URLs", () => {
-    for (const name of ["production", "staging"]) {
+  test("unknown environments fall back to the dev SPA", () => {
+    for (const name of ["unknown-env", undefined]) {
       expect(cloudAssistantHubUrl(name)).toBe(
-        `${SEEDS[name].webUrl}/assistant`,
+        "https://dev.mycadet.ai/assistant",
       );
     }
-    expect(cloudAssistantHubUrl("local")).toBe(`${SEEDS.dev.webUrl}/assistant`);
   });
 });

package/node_modules/@mycadet/environments/src/seeds.ts

@@ -26,15 +26,11 @@ function portBlock(base: number): PortMap {
 
 /**
  * Base URL of the cloud-hosted assistant SPA (the "hub") for a deployment
- * environment. The Capacitor mobile shell bakes this into native builds as
- * `server.url`, and the CLI's remote-web edge stamps it into the served
- * config as `hubUrl`, so the environment-to-hub mapping lives here exactly
- * once.
- *
- * Only the cloud deployments (production, staging) serve the hosted SPA at
- * their own web origin; every other environment (dev, test, local, unknown)
- * falls back to the dev SPA, whose host serves remote clients that cannot
- * reach a local or per-developer web URL.
+ * environment: always `${SEEDS[env].webUrl}/assistant`. The Capacitor mobile
+ * shell bakes this into native builds as `server.url`, and the CLI's
+ * remote-web edge stamps it into the served config as `hubUrl`, so the
+ * environment-to-hub mapping lives here exactly once. Unknown environment
+ * names fall back to the dev SPA defensively.
  *
  * The `/assistant` suffix is deliberate: booting on the bare host lands on
  * the marketing page, whose CTA redirects to `mycadet.ai/assistant` and
@@ -46,10 +42,7 @@ function portBlock(base: number): PortMap {
  * imports type-only so it stays loadable on its own.
  */
 export function cloudAssistantHubUrl(envName: string | undefined): string {
-  const seed =
-    envName === "production" || envName === "staging"
-      ? SEEDS[envName]
-      : SEEDS.dev;
+  const seed = (envName && SEEDS[envName]) || SEEDS.dev;
   return `${seed.webUrl}/assistant`;
 }
 

package/node_modules/@mycadet/local-mode/node_modules/@mycadet/environments/src/__tests__/cloud-assistant-hub-url.test.ts

@@ -2,7 +2,9 @@
  * Pins the environment-to-cloud-hub mapping in one place. Both consumers
  * (the Capacitor shell's `server.url` and the CLI remote-web edge's
  * `hubUrl`) read this helper, so this matrix is the single behavioral pin
- * for the served URLs.
+ * for the served URLs. (The remote-web edge additionally folds local → dev
+ * at its own site: clients served through a tunnel cannot reach the local
+ * seed's loopback.)
  */
 
 import { describe, expect, test } from "bun:test";
@@ -10,29 +12,19 @@ import { describe, expect, test } from "bun:test";
 import { cloudAssistantHubUrl, SEEDS } from "../index.js";
 
 describe("cloudAssistantHubUrl", () => {
-  test("cloud environments resolve to their own web origin", () => {
-    expect(cloudAssistantHubUrl("production")).toBe(
-      "https://mycadet.ai/assistant",
-    );
-    expect(cloudAssistantHubUrl("staging")).toBe(
-      "https://staging.mycadet.ai/assistant",
-    );
-  });
-
-  test("every other environment falls back to the dev SPA", () => {
-    for (const name of ["dev", "test", "local", "unknown-env", undefined]) {
+  test("every known environment resolves to its own web origin", () => {
+    for (const name of ["production", "staging", "dev", "test", "local"]) {
       expect(cloudAssistantHubUrl(name)).toBe(
-        "https://dev.mycadet.ai/assistant",
+        `${SEEDS[name].webUrl}/assistant`,
       );
     }
   });
 
-  test("cloud hub URLs derive from the seed web URLs", () => {
-    for (const name of ["production", "staging"]) {
+  test("unknown environments fall back to the dev SPA", () => {
+    for (const name of ["unknown-env", undefined]) {
       expect(cloudAssistantHubUrl(name)).toBe(
-        `${SEEDS[name].webUrl}/assistant`,
+        "https://dev.mycadet.ai/assistant",
       );
     }
-    expect(cloudAssistantHubUrl("local")).toBe(`${SEEDS.dev.webUrl}/assistant`);
   });
 });

package/node_modules/@mycadet/local-mode/node_modules/@mycadet/environments/src/seeds.ts

@@ -26,15 +26,11 @@ function portBlock(base: number): PortMap {
 
 /**
  * Base URL of the cloud-hosted assistant SPA (the "hub") for a deployment
- * environment. The Capacitor mobile shell bakes this into native builds as
- * `server.url`, and the CLI's remote-web edge stamps it into the served
- * config as `hubUrl`, so the environment-to-hub mapping lives here exactly
- * once.
- *
- * Only the cloud deployments (production, staging) serve the hosted SPA at
- * their own web origin; every other environment (dev, test, local, unknown)
- * falls back to the dev SPA, whose host serves remote clients that cannot
- * reach a local or per-developer web URL.
+ * environment: always `${SEEDS[env].webUrl}/assistant`. The Capacitor mobile
+ * shell bakes this into native builds as `server.url`, and the CLI's
+ * remote-web edge stamps it into the served config as `hubUrl`, so the
+ * environment-to-hub mapping lives here exactly once. Unknown environment
+ * names fall back to the dev SPA defensively.
  *
  * The `/assistant` suffix is deliberate: booting on the bare host lands on
  * the marketing page, whose CTA redirects to `mycadet.ai/assistant` and
@@ -46,10 +42,7 @@ function portBlock(base: number): PortMap {
  * imports type-only so it stays loadable on its own.
  */
 export function cloudAssistantHubUrl(envName: string | undefined): string {
-  const seed =
-    envName === "production" || envName === "staging"
-      ? SEEDS[envName]
-      : SEEDS.dev;
+  const seed = (envName && SEEDS[envName]) || SEEDS.dev;
   return `${seed.webUrl}/assistant`;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mycadet/cli",
-  "version": "0.13.0-dev.202610171626.d97b8b8",
+  "version": "0.13.0-dev.202610181631.3760abb",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vargasjr-dev/mycadet-temp.git"

package/src/lib/nginx-ingress.ts

@@ -1269,11 +1269,19 @@ export async function startRemoteWebIngress(opts: {
   ) {
     listenPort = recorded.listenPort;
   }
+  // The hub mapping is per-environment, but every client served by THIS edge
+  // is remote (they arrived through the tunnel) and cannot reach a
+  // developer's loopback — so a local environment serves the dev hub, whose
+  // host is reachable from anywhere.
+  const currentEnvName = getCurrentEnvironment().name;
+  const hubUrl = cloudAssistantHubUrl(
+    currentEnvName === "local" ? "dev" : currentEnvName,
+  );
   // The SPA config the served index must carry, computed up front so the
   // reuse decision and the actual spawn share one value and cannot drift.
   const spaOptions = includeWebApp
     ? {
-        hubUrl: cloudAssistantHubUrl(getCurrentEnvironment().name),
+        hubUrl,
         ...(opts.assistantName ? { assistantName: opts.assistantName } : {}),
         ...(opts.assistantId ? { assistantId: opts.assistantId } : {}),
       }

package/node_modules/@mycadet/assistant-api/events/host-app-control.ts

@@ -1,146 +0,0 @@
-/**
- * Host app-control proxy SSE events (`host_app_control_request` /
- * `host_app_control_cancel`).
- *
- * Server → client instructions that proxy app-control actions (start,
- * observe, press, combo, sequence, type, click, drag, stop) to the desktop
- * client, targeting a specific application by bundle ID or process name. The
- * client executes the action and POSTs the result back to
- * `/v1/host-app-control-result`. `host_app_control_cancel` withdraws an
- * in-flight request.
- *
- * Canonical wire-contract source. Daemon code imports the types
- * directly from this file; external consumers import via
- * `@mycadet/assistant-api`.
- */
-
-import { z } from "zod";
-
-const HostAppControlStartInputSchema = z.object({
-  tool: z.literal("start"),
-  /** Bundle ID (preferred) or process name. */
-  app: z.string(),
-  /** Optional command-line arguments to launch the app with. */
-  args: z.array(z.string()).optional(),
-});
-
-const HostAppControlObserveInputSchema = z.object({
-  tool: z.literal("observe"),
-  app: z.string(),
-  /** Milliseconds to wait before capturing the window (default ~200ms). */
-  settle_ms: z.number().optional(),
-});
-
-const HostAppControlPressInputSchema = z.object({
-  tool: z.literal("press"),
-  app: z.string(),
-  /** Single key identifier, e.g. "return", "a", "f12". */
-  key: z.string(),
-  /** Modifier list, e.g. ["cmd", "shift"]. */
-  modifiers: z.array(z.string()).optional(),
-  /** Hold duration in milliseconds. */
-  duration_ms: z.number().optional(),
-});
-
-const HostAppControlComboInputSchema = z.object({
-  tool: z.literal("combo"),
-  app: z.string(),
-  /** Sequence of keys pressed simultaneously, e.g. ["cmd", "shift", "4"]. */
-  keys: z.array(z.string()),
-  /** Hold duration in milliseconds. */
-  duration_ms: z.number().optional(),
-});
-
-/** A single step inside a sequence: one key press with optional modifiers, hold duration, and post-press gap. */
-export const HostAppControlSequenceStepSchema = z.object({
-  /** Single key identifier, e.g. "right", "a", "return". */
-  key: z.string(),
-  /** Modifier list, e.g. ["cmd", "shift"]. Omit for no modifiers. */
-  modifiers: z.array(z.string()).optional(),
-  /** Hold duration for this key in milliseconds. */
-  duration_ms: z.number().optional(),
-  /** Pause after this step before starting the next, in milliseconds. */
-  gap_ms: z.number().optional(),
-});
-
-export type HostAppControlSequenceStep = z.infer<
-  typeof HostAppControlSequenceStepSchema
->;
-
-const HostAppControlSequenceInputSchema = z.object({
-  tool: z.literal("sequence"),
-  app: z.string(),
-  /** Ordered list of single-key presses to execute serially. */
-  steps: z.array(HostAppControlSequenceStepSchema),
-});
-
-const HostAppControlTypeInputSchema = z.object({
-  tool: z.literal("type"),
-  app: z.string(),
-  text: z.string(),
-});
-
-const HostAppControlClickInputSchema = z.object({
-  tool: z.literal("click"),
-  app: z.string(),
-  x: z.number(),
-  y: z.number(),
-  button: z.enum(["left", "right", "middle"]).optional(),
-  double: z.boolean().optional(),
-});
-
-const HostAppControlDragInputSchema = z.object({
-  tool: z.literal("drag"),
-  app: z.string(),
-  from_x: z.number(),
-  from_y: z.number(),
-  to_x: z.number(),
-  to_y: z.number(),
-  button: z.enum(["left", "right", "middle"]).optional(),
-});
-
-const HostAppControlStopInputSchema = z.object({
-  tool: z.literal("stop"),
-  /** Optional — when omitted the proxy stops whichever app currently holds the session. */
-  app: z.string().optional(),
-  /** Free-form reason, surfaced for logging. */
-  reason: z.string().optional(),
-});
-
-/** Inputs accepted by the nine app-control tool variants. */
-export const HostAppControlInputSchema = z.discriminatedUnion("tool", [
-  HostAppControlStartInputSchema,
-  HostAppControlObserveInputSchema,
-  HostAppControlPressInputSchema,
-  HostAppControlComboInputSchema,
-  HostAppControlSequenceInputSchema,
-  HostAppControlTypeInputSchema,
-  HostAppControlClickInputSchema,
-  HostAppControlDragInputSchema,
-  HostAppControlStopInputSchema,
-]);
-
-export type HostAppControlInput = z.infer<typeof HostAppControlInputSchema>;
-
-export const HostAppControlRequestEventSchema = z.object({
-  type: z.literal("host_app_control_request"),
-  requestId: z.string(),
-  conversationId: z.string(),
-  /** "app_control_start", "app_control_observe", etc. */
-  toolName: z.string(),
-  input: HostAppControlInputSchema,
-});
-
-export type HostAppControlRequestEvent = z.infer<
-  typeof HostAppControlRequestEventSchema
->;
-
-export const HostAppControlCancelEventSchema = z.object({
-  type: z.literal("host_app_control_cancel"),
-  requestId: z.string(),
-  conversationId: z.string(),
-});
-
-export type HostAppControlCancelEvent = z.infer<
-  typeof HostAppControlCancelEventSchema
->;