@amerged/ohmyhost-mcp 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amerged/ohmyhost-mcp",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "type": "module",
   "engines": {
     "node": ">=22"

package/src/apps/mcp/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "@ohmyhost/mcp",
+  "version": "0.1.24",
+  "private": true,
+  "ohmyhost": {
+    "deployment": "production",
+    "fakeProviderBoundary": {
+      "typescriptProject": "tsconfig.build.json",
+      "artifactRoot": "dist",
+      "entrypoints": [
+        "src/index.ts",
+        "src/stdio-main.ts",
+        "src/worker-main.ts"
+      ],
+      "bundles": []
+    }
+  },
+  "type": "module",
+  "bin": {
+    "ohmyhost-mcp": "./dist/stdio-main.js"
+  },
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "tsc --project tsconfig.build.json",
+    "deploy:dry-run": "wrangler deploy --dry-run --outdir .wrangler/dry-run",
+    "test": "vitest run --root ../.. apps/mcp/test",
+    "typecheck": "tsc --project tsconfig.json --noEmit"
+  },
+  "dependencies": {
+    "@ohmyhost/contracts": "workspace:*",
+    "@modelcontextprotocol/server": "2.0.0",
+    "@ohmyhost/agent-skills": "workspace:*",
+    "@ohmyhost/product-cli": "workspace:*",
+    "@ohmyhost/sdk-ts": "workspace:*",
+    "zod": "4.4.3"
+  },
+  "devDependencies": {
+    "wrangler": "4.125.0"
+  },
+  "license": "Apache-2.0"
+}

package/src/apps/mcp/{local-client.ts → src/local-client.ts}

@@ -60,6 +60,8 @@ import {
   setProjectCreditBudget,
   createDeployment,
   createProject,
+  planProjectDataChange,
+  createProjectDataChange,
   submitFeedback,
   getFeedback,
   createOrganization,
@@ -125,6 +127,7 @@ import {
   parsePaidDomain,
   parsePaidDomainPlan,
   parseOperation,
+  parseProjectDataChangePlan,
   parseAccountProfile,
   parseCurrentIdentity,
   chooseWorkspace,
@@ -132,9 +135,11 @@ import {
   publicWorkspace,
   selectWorkspace,
   InteractiveSessionRequiredError,
+  NativeKeyringProfileRegistry,
   type AuthenticatedProductApiOverrides,
   type EffectiveContext,
   type LocalProfile,
+  type ProfileRegistry,
   type WorkspaceSession,
 } from "@ohmyhost/product-cli";
 
@@ -145,6 +150,16 @@ export class OperationEventsUnavailableError extends Error {
   }
 }
 
+/** A saved login whose credential this call read but could not use; it names that login. */
+export class SavedLoginCredentialError extends ProductApiAuthenticationError {
+  public constructor(
+    code: ProductApiAuthenticationError["code"],
+    readonly profile: LocalProfile,
+  ) {
+    super(code);
+  }
+}
+
 /**
  * One client per tool call, for the login that call asked for. The process binding and the call's
  * own arguments choose it, so another agent's choice never changes which account a call uses.
@@ -153,9 +168,25 @@ export async function createAuthenticatedLocalMcpClient(
   signal: AbortSignal,
   overrides: Omit<AuthenticatedProductApiOverrides, "productApiOrigin" | "selector"> = {},
 ): Promise<LocalMcpProductClient> {
+  const platform = resolveProductCliEnvironment(overrides.environment);
+  const registry =
+    overrides.profiles ?? new NativeKeyringProfileRegistry(undefined, platform.credentialService);
+  // The login whose credential is read is the one a failed renewal concerns.
+  let read: LocalProfile | undefined;
+  const profiles: ProfileRegistry = {
+    list: () => registry.list(),
+    credential: (profile) => {
+      read = profile;
+      return registry.credential(profile);
+    },
+    save: (profile, credential, replaces) => registry.save(profile, credential, replaces),
+    remove: (profile) => registry.remove(profile),
+    legacy: () => registry.legacy(),
+  };
   try {
     const transport = await createAuthenticatedProductTransport(signal, {
       ...overrides,
+      profiles,
       selector: "mcp",
     });
     return new GeneratedSdkLocalMcpClient(
@@ -164,18 +195,12 @@ export async function createAuthenticatedLocalMcpClient(
       transport.fetch,
       transport.workspace,
       transport.context,
-      resolveProductCliEnvironment(overrides.environment).commandPrefix,
+      platform.commandPrefix,
     );
   } catch (error) {
-    if (!(error instanceof ProductApiAuthenticationError)) throw error;
-    if (error.code === "invalid_environment_token")
-      throw new Error(
-        "invalid_environment_token. Supply a valid OHMYHOST_TOKEN or unset it before interactive login.",
-      );
-    const environment = overrides.environment?.OHMYHOST_ENVIRONMENT ?? "production";
-    throw new Error(
-      `${error.code}. Run OHMYHOST_ENVIRONMENT=${environment} ohmyhost login and retry.`,
-    );
+    if (error instanceof ProductApiAuthenticationError && read !== undefined)
+      throw new SavedLoginCredentialError(error.code, read);
+    throw error;
   }
 }
 
@@ -525,6 +550,8 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
     input: Parameters<LocalMcpProductClient["createOrganization"]>[0],
     signal: AbortSignal,
   ): Promise<WorkspaceSelectionReport> {
+    // A user API token cannot own a new workspace, so it is refused before anything is sent.
+    const current = this.#interactiveSession().profile;
     const created = await createOrganization(
       {
         "Idempotency-Key": input.idempotencyKey,
@@ -535,7 +562,6 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
       },
       { client: this.#client },
     );
-    const current = this.#interactiveSession().profile;
     // A login in another organization keeps it, so no other agent using it moves along; the new
     // workspace gets its own login instead.
     if (current.organizationId !== null && current.organizationId !== created.id)
@@ -833,6 +859,32 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
     ) as import("@ohmyhost/sdk-ts").FeedbackStatus;
   }
 
+  public async planProjectDataChange(
+    input: Parameters<LocalMcpProductClient["planProjectDataChange"]>[0],
+  ) {
+    return parseProjectDataChangePlan(
+      await planProjectDataChange(
+        { project_id: input.projectId, projectDataChangeRequest: { change: input.change } },
+        { client: this.#client },
+      ),
+    );
+  }
+  public async createProjectDataChange(
+    input: Parameters<LocalMcpProductClient["createProjectDataChange"]>[0],
+  ): Promise<Operation> {
+    return parseOperation(
+      await createProjectDataChange(
+        {
+          project_id: input.projectId,
+          projectDataChangeRequest: { change: input.change },
+          "If-Match": input.ifMatch,
+          "X-Confirmation-Token": input.confirmationToken,
+          "Idempotency-Key": input.idempotencyKey,
+        },
+        { client: this.#client },
+      ),
+    );
+  }
   public createProject(input: Parameters<LocalMcpProductClient["createProject"]>[0]) {
     return createProject(
       {
@@ -975,7 +1027,12 @@ export class GeneratedSdkLocalMcpClient implements LocalMcpProductClient {
 
   public getDeploymentLogs(input: Parameters<LocalMcpProductClient["getDeploymentLogs"]>[0]) {
     return getDeploymentLogs(
-      { project_id: input.projectId, deployment_id: input.deploymentId, limit: input.limit },
+      {
+        project_id: input.projectId,
+        deployment_id: input.deploymentId,
+        limit: input.limit,
+        ...(input.cursor === undefined ? {} : { cursor: input.cursor }),
+      },
       { client: this.#client },
     );
   }