@paradigma-inc/flywheel 0.1.95 → 0.1.99

package/src/cli.mjs

@@ -1193,8 +1193,11 @@ async function runUninstallCommand(options) {
   log.blank();
 }
 
-function buildProgram() {
+function buildProgram({ exitOverride = false } = {}) {
   const program = new Command();
+  if (exitOverride) {
+    program.exitOverride();
+  }
   program
     .name("flywheel")
     .description("Flywheel setup CLI")
@@ -1250,6 +1253,10 @@ Examples:
     )
     .action(async (shell, options) => {
       if (!shell) {
+        if (exitOverride) {
+          completionCommand.outputHelp();
+          return;
+        }
         completionCommand.help();
         return;
       }
@@ -1445,18 +1452,35 @@ Next steps:
   return program;
 }
 
-export async function runCli(argv = process.argv) {
+export async function runCli(argv = process.argv, { exitOverride = false } = {}) {
   try {
-    const program = buildProgram();
+    const program = buildProgram({ exitOverride });
     await program.parseAsync(argv);
+    return process.exitCode ?? 0;
   } catch (error) {
     if (error instanceof Error && error.name === "ExitPromptError") {
+      if (exitOverride) {
+        return 0;
+      }
       process.exit(0);
     }
     if (error instanceof Error && /cancelled/i.test(error.message)) {
       log.warn(error.message);
+      if (exitOverride) {
+        return 0;
+      }
       process.exit(0);
     }
+    if (
+      exitOverride &&
+      error &&
+      typeof error === "object" &&
+      typeof error.code === "string" &&
+      error.code.startsWith("commander.") &&
+      Number.isInteger(error.exitCode)
+    ) {
+      return error.exitCode;
+    }
     throw error;
   }
 }

package/src/public-command-metadata.mjs

@@ -58,6 +58,11 @@ export const HELP_EXTRAS = [
     name: "setup",
     summary: "Install Flywheel CLI + MCP + skills.",
   },
+  {
+    group: "setup-admin",
+    name: "update",
+    summary: "Update Flywheel CLI and refresh local setup artifacts.",
+  },
   {
     group: "setup-admin",
     name: "uninstall",
@@ -332,6 +337,45 @@ export const USAGE_EXTRAS = [
     ],
     related: ["uninstall"],
   },
+  {
+    group: "setup-admin",
+    name: "update",
+    summary: "Update the local Flywheel CLI package and setup artifacts",
+    endpoints: [],
+    required: [],
+    optional: [
+      {
+        name: "check",
+        type: "boolean",
+        description: "Print installed/latest status without changing files",
+      },
+      {
+        name: "dry-run",
+        type: "boolean",
+        description: "Print planned package and local setup refresh steps",
+      },
+      {
+        name: "yes",
+        type: "boolean",
+        description: "Run prompt-free for agent execution",
+      },
+    ],
+    examples: [
+      {
+        description: "Update the Flywheel CLI and refresh local setup",
+        invocation: "flywheel update --yes",
+      },
+      {
+        description: "Check whether a newer public package is available",
+        invocation: "flywheel update --check",
+      },
+      {
+        description: "Preview update and refresh steps",
+        invocation: "flywheel update --dry-run",
+      },
+    ],
+    related: ["setup", "uninstall"],
+  },
   {
     group: "setup-admin",
     name: "uninstall",

package/src/runtime/vendor/flywheel-cli-dist/commands/_wait-polling.d.ts

@@ -2,6 +2,7 @@ import type { CommandContext } from './types.js';
 interface ComputeLeaseSummary {
     lease_id?: string;
     status?: string;
+    error?: string | null;
 }
 interface ComputeStatusResponse {
     compute?: {
@@ -12,7 +13,27 @@ interface ComputeStatusResponse {
     state?: string;
     leases?: ComputeLeaseSummary[];
 }
+interface ComputeConnectionPayload {
+    lease_status?: string;
+    host?: string | null;
+    port?: number | null;
+    user?: string | null;
+    private_key?: string | null;
+}
+interface ComputeConnectionResponse {
+    compute?: ComputeConnectionPayload | null;
+    lease_status?: string;
+    host?: string | null;
+    port?: number | null;
+    user?: string | null;
+    private_key?: string | null;
+}
+interface ComputeConnectionPollState {
+    status: ComputeStatusResponse;
+    connection: ComputeConnectionResponse;
+}
 export declare function pollComputeStatusByToken(context: CommandContext, token: string, terminalStates: ReadonlySet<string>, commandName: string): Promise<ComputeStatusResponse>;
+export declare function pollComputeConnectionReadinessByToken(context: CommandContext, token: string, commandName: string): Promise<ComputeConnectionPollState>;
 interface GrantsListResponse {
     grants?: Array<{
         status?: string;

package/src/runtime/vendor/flywheel-cli-dist/commands/_wait-polling.js

@@ -1,7 +1,11 @@
 import { pollUntilTerminal } from '../http/poll.js';
+import { EXIT_TRANSPORT } from '../exit-codes.js';
+import { CliHttpError } from '../http/client.js';
+function extractLeases(result) {
+    return result?.compute?.leases ?? result?.leases ?? [];
+}
 function extractLeaseStatuses(result) {
-    const leases = result?.compute?.leases ?? result?.leases ?? [];
-    return leases
+    return extractLeases(result)
         .map((lease) => (typeof lease?.status === 'string' ? lease.status : null))
         .filter((status) => status !== null);
 }
@@ -17,6 +21,43 @@ function resolveEffectiveState(result) {
     }
     return result?.compute?.state ?? result?.state ?? null;
 }
+function connectionPayload(result) {
+    return result?.compute ?? result ?? null;
+}
+function hasPresentString(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+function hasPositiveInteger(value) {
+    return typeof value === 'number' && Number.isInteger(value) && value > 0;
+}
+function hasUsableConnectionMaterial(result) {
+    const payload = connectionPayload(result);
+    return (hasPresentString(payload?.host) &&
+        hasPositiveInteger(payload?.port) &&
+        hasPresentString(payload?.user) &&
+        hasPresentString(payload?.private_key));
+}
+function describeConnectionPollState(state) {
+    const status = resolveEffectiveState(state.status) ?? 'unknown';
+    const payload = connectionPayload(state.connection);
+    const connection = typeof payload?.lease_status === 'string' && payload.lease_status.trim()
+        ? payload.lease_status
+        : 'unknown';
+    const host = hasPresentString(payload?.host) ? 'present' : 'missing';
+    const port = hasPositiveInteger(payload?.port) ? 'present' : 'missing';
+    return `status=${status}; connection=${connection}; host=${host}; port=${port}`;
+}
+function throwIfStatusTerminalError(result) {
+    const lease = extractLeases(result)[0] ?? null;
+    const status = lease?.status ?? resolveEffectiveState(result);
+    if (status !== 'error') {
+        return;
+    }
+    const reason = typeof lease?.error === 'string' && lease.error.trim()
+        ? lease.error.trim()
+        : 'error';
+    throw new CliHttpError(`compute lease entered terminal error state: ${reason}`, EXIT_TRANSPORT, 200, result, { method: 'GET', path: '/compute/status' });
+}
 export async function pollComputeStatusByToken(context, token, terminalStates, commandName) {
     const timeoutS = context.globals?.waitTimeoutS ?? 600;
     const verbose = context.globals?.verbose === true;
@@ -47,6 +88,31 @@ export async function pollComputeStatusByToken(context, token, terminalStates, c
             : undefined,
     });
 }
+export async function pollComputeConnectionReadinessByToken(context, token, commandName) {
+    const timeoutS = context.globals?.waitTimeoutS ?? 600;
+    const verbose = context.globals?.verbose === true;
+    return pollUntilTerminal(async () => {
+        const status = await context.requestJson('GET', '/compute/status', {
+            query: { lease_control_token: token },
+            wrapperStep: 'wait-status',
+        });
+        throwIfStatusTerminalError(status);
+        const connection = await context.requestJson('GET', '/compute/connection', {
+            query: { lease_control_token: token },
+            wrapperStep: 'wait-connection',
+        });
+        return { status, connection };
+    }, (result) => hasUsableConnectionMaterial(result.connection), {
+        timeoutS,
+        commandName,
+        describeState: describeConnectionPollState,
+        onProgress: verbose
+            ? (event) => {
+                context.stderr?.(`${JSON.stringify({ event: 'status', data: event })}\n`);
+            }
+            : undefined,
+    });
+}
 export async function pollGrantsUntilActive(context, approvalSessionId, commandName) {
     const timeoutS = context.globals?.waitTimeoutS ?? 600;
     const verbose = context.globals?.verbose === true;

package/src/runtime/vendor/flywheel-cli-dist/commands/_wait-polling.js.map

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

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-acquire.js

@@ -1,11 +1,5 @@
-import { pollComputeStatusByToken } from './_wait-polling.js';
+import { pollComputeConnectionReadinessByToken } from './_wait-polling.js';
 import { optionalString, requiredString } from './utils.js';
-// uses pollUntilTerminal via _wait-polling.js
-// Wire values come from core.models.ComputeLeaseStatus (pending/active/
-// releasing/released/error) serialized verbatim by _serialize_compute_status.
-// `error` is the terminal failure state for a failed acquire; omitting it
-// causes --wait to poll until timeout instead of returning promptly.
-const TERMINAL = new Set(['active', 'error']);
 export const computeAcquireCommand = async (context) => {
     const nodeId = requiredString(context.params, 'node_id');
     const grantId = requiredString(context.params, 'compute_grant_id');
@@ -33,7 +27,7 @@ export const computeAcquireCommand = async (context) => {
     if (!token) {
         return response;
     }
-    const terminal = await pollComputeStatusByToken(context, token, TERMINAL, 'compute:acquire');
+    const terminal = await pollComputeConnectionReadinessByToken(context, token, 'compute:acquire');
     return { ...response, wait_result: terminal };
 };
 //# sourceMappingURL=compute-acquire.js.map

package/src/runtime/vendor/flywheel-cli-dist/commands/compute-acquire.js.map

@@ -1 +1 @@
-{"version":3,"file":"compute-acquire.js","sourceRoot":"","sources":["../../src/commands/compute-acquire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5D,8CAA8C;AAE9C,wEAAwE;AACxE,8EAA8E;AAC9E,0EAA0E;AAC1E,qEAAqE;AACrE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AAM9C,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACnE,MAAM,OAAO,GACX,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxD,8EAA8E;IAC9E,2EAA2E;IAC3E,0CAA0C;IAC1C,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,SAAS,CAAC;IACvE,MAAM,IAAI,GAA4B;QACpC,OAAO;QACP,gBAAgB,EAAE,OAAO;QACzB,QAAQ,EAAE,OAAO;QACjB,mBAAmB,EAAE,iBAAiB;KACvC,CAAC;IACF,IAAI,MAAM;QAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CACxC,MAAM,EACN,UAAU,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,EACtD,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CACjC,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,EAAE,OAAO,EAAE,mBAAmB,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAC7F,OAAO,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC,CAAC"}
+{"version":3,"file":"compute-acquire.js","sourceRoot":"","sources":["../../src/commands/compute-acquire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAQ5D,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACnE,MAAM,OAAO,GACX,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACxD,8EAA8E;IAC9E,2EAA2E;IAC3E,0CAA0C;IAC1C,MAAM,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,SAAS,CAAC;IACvE,MAAM,IAAI,GAA4B;QACpC,OAAO;QACP,gBAAgB,EAAE,OAAO;QACzB,QAAQ,EAAE,OAAO;QACjB,mBAAmB,EAAE,iBAAiB;KACvC,CAAC;IACF,IAAI,MAAM;QAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,WAAW,CACxC,MAAM,EACN,UAAU,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,EACtD,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CACjC,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QACnC,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,EAAE,OAAO,EAAE,mBAAmB,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,qCAAqC,CAC1D,OAAO,EACP,KAAK,EACL,iBAAiB,CAClB,CAAC;IACF,OAAO,EAAE,GAAG,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC,CAAC"}

package/src/runtime/vendor/flywheel-cli-dist/commands/feedback-create.js

@@ -13,9 +13,13 @@ export const feedbackCreateCommand = async (context) => {
         'command_family',
         'tool_family',
         'node_id',
+        'request_id',
         'trace_id',
         'sentry_event_id',
         'product_event_id',
+        'cli_invocation_id',
+        'mcp_request_id',
+        'mcp_idempotency_key',
     ]) {
         const value = optionalString(context.params, key);
         if (value !== undefined) {

package/src/runtime/vendor/flywheel-cli-dist/commands/feedback-create.js.map

@@ -1 +1 @@
-{"version":3,"file":"feedback-create.js","sourceRoot":"","sources":["../../src/commands/feedback-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE5E,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,IAAI,GAA2B;QACnC,OAAO,EAAE,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;QACnE,aAAa,EAAE,OAAO;QACtB,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CAAC,IAAI,OAAO;QAClF,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CAAC,IAAI,KAAK;KACjF,CAAC;IACF,KAAK,MAAM,GAAG,IAAI;QAChB,cAAc;QACd,sBAAsB;QACtB,gBAAgB;QAChB,aAAa;QACb,SAAS;QACT,UAAU;QACV,iBAAiB;QACjB,kBAAkB;KACnB,EAAE,CAAC;QACF,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC"}
+{"version":3,"file":"feedback-create.js","sourceRoot":"","sources":["../../src/commands/feedback-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE5E,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EAAE,OAAO,EAAE,EAAE;IACrE,MAAM,IAAI,GAA2B;QACnC,OAAO,EAAE,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE;QACnE,aAAa,EAAE,OAAO;QACtB,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CAAC,IAAI,OAAO;QAClF,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,mBAAmB,CAAC,IAAI,KAAK;KACjF,CAAC;IACF,KAAK,MAAM,GAAG,IAAI;QAChB,cAAc;QACd,sBAAsB;QACtB,gBAAgB;QAChB,aAAa;QACb,SAAS;QACT,YAAY;QACZ,UAAU;QACV,iBAAiB;QACjB,kBAAkB;QAClB,mBAAmB;QACnB,gBAAgB;QAChB,qBAAqB;KACtB,EAAE,CAAC;QACF,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/src/runtime/vendor/flywheel-cli-dist/commands/registry/compute.js

@@ -60,7 +60,7 @@ export const COMPUTE_COMMANDS = [
     {
         name: 'compute:acquire',
         group: 'compute-executions',
-        summary: 'Acquire managed compute for a node.',
+        summary: 'Acquire managed compute for a node; with --wait, wait for usable SSH connection material.',
         endpoints: ['POST /nodes/{node_id}/compute/acquire'],
         required: [
             { name: 'node_id', type: 'string', description: 'Target node.' },

package/src/runtime/vendor/flywheel-cli-dist/commands/registry/compute.js.map

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

package/src/runtime/vendor/flywheel-cli-dist/commands/registry/resources.js

@@ -29,6 +29,7 @@ export const RESOURCES_COMMANDS = [
                 description: 'MCP tool family associated with the feedback.',
             },
             { name: 'node_id', type: 'string', description: 'Related node ID.' },
+            { name: 'request_id', type: 'string', description: 'Related request ID.' },
             { name: 'trace_id', type: 'string', description: 'Related trace ID.' },
             {
                 name: 'sentry_event_id',
@@ -40,6 +41,21 @@ export const RESOURCES_COMMANDS = [
                 type: 'string',
                 description: 'Related product event ID.',
             },
+            {
+                name: 'cli_invocation_id',
+                type: 'string',
+                description: 'Related CLI invocation ID.',
+            },
+            {
+                name: 'mcp_request_id',
+                type: 'string',
+                description: 'Related MCP request ID.',
+            },
+            {
+                name: 'mcp_idempotency_key',
+                type: 'string',
+                description: 'Related MCP idempotency key.',
+            },
         ],
         examples: [
             {

package/src/runtime/vendor/flywheel-cli-dist/commands/registry/resources.js.map

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

package/src/runtime/vendor/manifest.json

@@ -1,5 +1,5 @@
 {
-  "sourceCommit": "59f9a3cf94dd350a45ada948ab6b41d4c3aad508",
+  "sourceCommit": "8c6b8edcadb0b2513c57e53ddcfbceca76c1c2c4",
   "files": [
     "auth/active-key-id.d.ts",
     "auth/active-key-id.js",

package/src/setup/shared/prior-mode-detect.mjs

@@ -123,7 +123,34 @@ function isFlywheelMcpUrl(url, targetOrigin) {
   return targetOrigin !== null && parsed.origin.toLowerCase() === targetOrigin;
 }
 
-async function findFlywheelTomlEntryNames(filePath, targetOrigin) {
+function isMcpServerUrl(url) {
+  if (typeof url !== "string" || url.trim().length === 0) {
+    return false;
+  }
+  try {
+    return new URL(url).pathname === "/mcp-server";
+  } catch {
+    return false;
+  }
+}
+
+function shouldTreatAsFlywheelMcpEntry({
+  serverName,
+  serverUrl,
+  targetOrigin,
+  trustedServerNames,
+}) {
+  return (
+    isFlywheelMcpUrl(serverUrl, targetOrigin) ||
+    (trustedServerNames.has(serverName) && isMcpServerUrl(serverUrl))
+  );
+}
+
+async function findFlywheelTomlEntries(
+  filePath,
+  targetOrigin,
+  trustedServerNames,
+) {
   let raw;
   try {
     raw = await readFile(filePath, "utf8");
@@ -139,9 +166,14 @@ async function findFlywheelTomlEntryNames(filePath, targetOrigin) {
     if (
       currentServerName !== null &&
       currentUrl !== null &&
-      isFlywheelMcpUrl(currentUrl, targetOrigin)
+      shouldTreatAsFlywheelMcpEntry({
+        serverName: currentServerName,
+        serverUrl: currentUrl,
+        targetOrigin,
+        trustedServerNames,
+      })
     ) {
-      matches.push(currentServerName);
+      matches.push({ serverName: currentServerName, serverUrl: currentUrl });
     }
     currentServerName = null;
     currentUrl = null;
@@ -176,26 +208,48 @@ async function findFlywheelTomlEntryNames(filePath, targetOrigin) {
   }
   commitCurrent();
 
-  return unique(matches);
+  return uniqueEntries(matches);
+}
+
+function uniqueEntries(entries = []) {
+  const seen = new Set();
+  const out = [];
+  for (const entry of entries) {
+    const key = `${entry.serverName}\0${entry.serverUrl}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(entry);
+  }
+  return out.sort((left, right) => {
+    const byName = left.serverName.localeCompare(right.serverName);
+    if (byName !== 0) return byName;
+    return left.serverUrl.localeCompare(right.serverUrl);
+  });
 }
 
-export async function findFlywheelMcpEntryNames({
+export async function findFlywheelMcpEntries({
   hostName,
   scope,
   cwd = process.cwd(),
   targetOrigin = null,
+  trustedServerNames = [],
   getHost = defaultGetHost,
   resolveMcpPath = defaultResolveMcpPath,
   readJsonConfig = defaultReadJsonConfig,
   readYamlConfig = defaultReadYamlConfig,
 }) {
+  const trustedServerNameSet = new Set(trustedServerNames);
   try {
     const host = getHost(hostName);
     const candidates = resolveCandidatesForScope(host, scope, cwd);
     const filePath = await resolveMcpPath(candidates);
 
     if (host.mcp.configType === "toml") {
-      return await findFlywheelTomlEntryNames(filePath, targetOrigin);
+      return await findFlywheelTomlEntries(
+        filePath,
+        targetOrigin,
+        trustedServerNameSet,
+      );
     }
 
     const config =
@@ -223,16 +277,29 @@ export async function findFlywheelMcpEntryNames({
     const matches = [];
     for (const [entryName, entry] of Object.entries(section)) {
       const entryUrl = readEntryServerUrl(entry);
-      if (entryUrl !== null && isFlywheelMcpUrl(entryUrl, targetOrigin)) {
-        matches.push(entryName);
+      if (
+        entryUrl !== null &&
+        shouldTreatAsFlywheelMcpEntry({
+          serverName: entryName,
+          serverUrl: entryUrl,
+          targetOrigin,
+          trustedServerNames: trustedServerNameSet,
+        })
+      ) {
+        matches.push({ serverName: entryName, serverUrl: entryUrl });
       }
     }
-    return unique(matches);
+    return uniqueEntries(matches);
   } catch {
     return [];
   }
 }
 
+export async function findFlywheelMcpEntryNames(options) {
+  const entries = await findFlywheelMcpEntries(options);
+  return entries.map((entry) => entry.serverName);
+}
+
 /**
  * Determine whether a truly skill-only host's ownership marker is present at
  * the skills-root that `hostName` would write into. The two destination