@amerged/ohmyhost-mcp 0.1.22 → 0.1.24

package/src/apps/product-cli/{user-token-file.ts → src/user-token-file.ts}

@@ -23,23 +23,28 @@ export class UserTokenFileError extends Error {
       | "token_value_unavailable",
     readonly keyId?: string,
   ) {
-    super(
-      {
-        token_file_not_ignored:
-          "Add the selected env file to .gitignore or choose a location outside the repository. No token was created or written.",
-        token_file_unsafe:
-          "Choose a private .env file owned by you. Symlinks, shared files and files larger than 64 KiB are not accepted.",
-        token_file_has_token:
-          "The selected file already contains OHMYHOST_TOKEN. Use that token or choose a new file; existing credentials were preserved.",
-        token_file_changed:
-          "The environment file changed during creation. It was not overwritten. List tokens to inspect the issued key before creating another.",
-        token_value_unavailable:
-          "This token was already issued and its full value cannot be retrieved. Use the previously saved file, or explicitly revoke the listed key before creating a replacement.",
-      }[code] + (keyId ? ` Token ID: ${keyId}.` : ""),
-    );
+    super(tokenFileAction(code, keyId));
   }
 }
 
+/** What to do next; once a key was issued, the answer names it so it can be revoked. */
+const tokenFileAction = (code: UserTokenFileError["code"], keyId: string | undefined): string => {
+  switch (code) {
+    case "token_file_not_ignored":
+      return "Add the selected env file to .gitignore or choose a location outside the repository. No token was created or written.";
+    case "token_file_unsafe":
+      return "Choose an env file whose name starts or ends with .env, for example .env.local: a regular file you own, not a symlink or hard link, at most 64 KiB.";
+    case "token_file_has_token":
+      return "The selected file already contains OHMYHOST_TOKEN. Use that token or choose a new file; existing credentials were preserved.";
+    case "token_file_changed":
+      return keyId === undefined
+        ? "The env file changed while it was being read; no key was issued. Run the same command again."
+        : `The env file changed while the token was being saved, so its value may not be in the file; key ${keyId} was issued. Revoke it with 'ohmyhost token revoke --organization ULID --key ${keyId} --yes --json' (MCP token_revoke), then create a new one with a new idempotency key.`;
+    case "token_value_unavailable":
+      return `A key was already issued for this idempotency key, and its value is shown only once. Use the file it was saved to, or revoke key ${String(keyId)} (ohmyhost token revoke, MCP token_revoke) and create a replacement with a new idempotency key.`;
+  }
+};
+
 /** Prepare before the API call; append only OHMYHOST_TOKEN and never return its value to a chat. */
 export async function prepareUserTokenFile(output: string) {
   const path = resolve(output);
@@ -77,28 +82,34 @@ export async function prepareUserTokenFile(output: string) {
         const result = parseUserApiKeyCreation(value);
         if (result.value === null)
           throw new UserTokenFileError("token_value_unavailable", result.key.id);
-        const current = await lstat(path);
-        if (
-          !current.isFile() ||
-          current.isSymbolicLink() ||
-          current.nlink !== 1 ||
-          current.ino !== identity.ino ||
-          current.dev !== identity.dev ||
-          (await tokenFileText(handle)) !== initial
-        )
-          throw new UserTokenFileError("token_file_changed");
-        await handle.appendFile(`\nOHMYHOST_TOKEN=${result.value}\n`, "utf8");
-        await handle.sync();
-        if (parseEnv(await tokenFileText(handle))["OHMYHOST_TOKEN"] !== result.value)
-          throw new UserTokenFileError("token_file_changed");
-        const saved = await lstat(path);
-        if (
-          !saved.isFile() ||
-          saved.isSymbolicLink() ||
-          saved.ino !== identity.ino ||
-          saved.dev !== identity.dev
-        )
+        try {
+          const current = await lstat(path);
+          if (
+            !current.isFile() ||
+            current.isSymbolicLink() ||
+            current.nlink !== 1 ||
+            current.ino !== identity.ino ||
+            current.dev !== identity.dev ||
+            (await tokenFileText(handle)) !== initial
+          )
+            throw new UserTokenFileError("token_file_changed");
+          await handle.appendFile(`\nOHMYHOST_TOKEN=${result.value}\n`, "utf8");
+          await handle.sync();
+          if (parseEnv(await tokenFileText(handle))["OHMYHOST_TOKEN"] !== result.value)
+            throw new UserTokenFileError("token_file_changed");
+          const saved = await lstat(path);
+          if (
+            !saved.isFile() ||
+            saved.isSymbolicLink() ||
+            saved.ino !== identity.ino ||
+            saved.dev !== identity.dev
+          )
+            throw new UserTokenFileError("token_file_changed");
+        } catch {
+          // The file was checked before the key was issued, so any refusal now means it changed,
+          // and the answer names the issued key so it can be revoked.
           throw new UserTokenFileError("token_file_changed", result.key.id);
+        }
         return { request_id: result.request_id, key: result.key, token_file: path };
       },
       close: () => handle.close(),

package/src/apps/product-cli/{workspace.ts → src/workspace.ts}

@@ -119,8 +119,14 @@ export const selectWorkspace = async (
     session.profile.userId,
     organization.id,
   );
+  // That user's existing login in the organization keeps its name; binding under this login's alias
+  // would silently rename it for every agent that selects it by name.
+  const existing = (await session.profiles.list()).find(
+    (saved) => saved.userId === session.profile.userId && saved.organizationId === organization.id,
+  );
   const bound: LocalProfile = {
     ...session.profile,
+    name: existing?.name ?? session.profile.name,
     organizationId: organization.id,
     organizationName: organization.name,
   };

package/src/packages/agent-skills/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "@ohmyhost/agent-skills",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "node scripts/generate-skill-resources.mjs && tsc --project tsconfig.build.json",
+    "generate:check": "node scripts/generate-skill-resources.mjs --check",
+    "test": "node scripts/generate-skill-resources.mjs --check && vitest run --root ../.. packages/agent-skills/test",
+    "typecheck": "tsc --project tsconfig.json --noEmit"
+  },
+  "devDependencies": {
+    "@ohmyhost/customer-runtime": "workspace:*",
+    "prettier": "3.6.2"
+  },
+  "license": "Apache-2.0"
+}