agentschat-mcp 0.36.7 → 0.36.9

package/src/profile-selection.ts

@@ -0,0 +1,45 @@
+import { existsSync, readFileSync } from "node:fs";
+import { isAbsolute, join, resolve } from "node:path";
+
+export interface ProjectProfileSelection {
+  selector: string;
+  source: "project-config" | "project-profile";
+  agentId?: string;
+  apiUrl?: string;
+  wsUrl?: string;
+}
+
+/** Read only this project's binding. Never scan parents or choose a sibling bot. */
+export function projectProfileSelector(cwd: string): ProjectProfileSelection | undefined {
+  const config = join(cwd, ".agentschat/config.json");
+  let doc: any = {};
+  if (existsSync(config)) {
+    try { doc = JSON.parse(readFileSync(config, "utf8")); }
+    catch { throw new Error("Invalid project .agentschat/config.json; repair it before choosing an identity"); }
+    if (!doc || typeof doc !== "object" || Array.isArray(doc)) throw new Error("Invalid project identity configuration");
+    for (const field of ["profile", "agent_id", "api_url", "ws_url"]) {
+      if (doc[field] !== undefined && (typeof doc[field] !== "string" || !doc[field].trim())) throw new Error(`Invalid project ${field}`);
+    }
+    for (const [field, protocols] of [["api_url", ["https:", "http:"]], ["ws_url", ["wss:", "ws:"]]] as const) {
+      if (doc[field] === undefined) continue;
+      let url: URL;
+      try { url = new URL(doc[field]); } catch { throw new Error(`Invalid project ${field}`); }
+      if (!(protocols as readonly string[]).includes(url.protocol) || url.username || url.password || url.search || url.hash ||
+          (!url.protocol.endsWith("s:") && !["127.0.0.1", "localhost", "[::1]"].includes(url.hostname)))
+        throw new Error(`Invalid project ${field}: require TLS (except loopback) and no credentials/query`);
+    }
+  }
+  const settings = {
+    ...(doc.agent_id !== undefined ? { agentId: doc.agent_id as string } : {}),
+    ...(doc.api_url !== undefined ? { apiUrl: doc.api_url as string } : {}),
+    ...(doc.ws_url !== undefined ? { wsUrl: doc.ws_url as string } : {}),
+  };
+  if (doc.profile !== undefined) {
+    const value = doc.profile as string;
+    return { selector: !isAbsolute(value) && !value.startsWith("~/") && value.includes("/") ? resolve(cwd, value) : value, source: "project-config", ...settings };
+  }
+  const profile = join(cwd, ".agentschat/profile.json");
+  if (existsSync(profile)) return { selector: profile, source: "project-profile", ...settings };
+  // A declared agent/server scope must never silently disappear into a global identity.
+  if (Object.keys(settings).length) throw new Error("Project identity/server settings require a profile binding");
+}

package/src/server.ts

@@ -43,6 +43,7 @@ import { computeReconnectDelay } from "./reconnect.ts";
 import { normalizeTimestampForCursor } from "./timestamps.ts";
 import { validateToolArgs } from "./argcheck.ts";
 import { decideIdentity, shouldMigrateDevToken, validateIdentityProfile } from "./identity.ts";
+import { projectProfileSelector } from "./profile-selection.ts";
 import type { ProfileSource } from "./identity.ts";
 import {
   decideGrokBind,
@@ -123,7 +124,8 @@ Setup guide for every supported host:
   Read skills/onboarding.md relative to this installed package root.
   Online: https://unpkg.com/agentschat-mcp@latest/skills/onboarding.md
   Start with: npx -y agentschat-mcp@latest --help
-  The guide selects Claude Code, Codex, OpenClaw, Hermes, Grok Bot, or URL wake.
+  The guide selects Claude Code, Codex, OpenClaw, Hermes, Grok Bot, URL wake,
+  or the separately deployed dot remote MCP + Events integration.
   Help only prints instructions; follow the guide and verify a real reply.
 
 Options:
@@ -167,7 +169,7 @@ Grok multi-bot identity bind (Cursor / Grok Bot, no --profile):
 Hermes relay connector (no Hermes patch): run with --connector. See --connector --help.
 
 Identity is never created implicitly. Without explicit selectors, an existing
-default profile or Grok binding is loaded; only when neither exists and no
+project/runtime binding or default profile is loaded; only when none exists and no
 credentials are supplied does the server run ANONYMOUS (lists tools, no account).
 
 Profiles stored in: ~/.agentschat/ (legacy fallback: ~/.agentchat/)
@@ -175,34 +177,32 @@ Docs: https://github.com/swswordholy-tech/AgentsChatProtocol`);
   process.exit(0);
 }
 
-// Profile resolution priority:
-//   1. AGENTSCHAT_PROFILE env var (name or path; canonical plural)
-//   2. AGENTCHAT_PROFILE env var (legacy singular)
-//   3. --profile <name> CLI arg
-//   4. --name <name> CLI arg (also used as profile name)
-//   5. Grok bind: CURSOR_CONVERSATION_ID → ~/.agentschat/grok-binds.json
-//      (skipped if an explicit token is set; does NOT imply AGENTCHAT_WAKE_MODE)
-//   6. default ~/.agentschat/profile.json, falling back to ~/.agentchat/profile.json
+// Explicit CLI selection > project binding > runtime binding > environment > default.
+// Onboarding resolves ambiguous unbound candidates with the user; never scan-and-pick.
 const homeDir = process.env.HOME || process.env.USERPROFILE || ".";
 const configDir = join(homeDir, ".agentschat");
 const legacyConfigDir = join(homeDir, ".agentchat");
 const profileDirs = [configDir, legacyConfigDir];
 
 function profileNameToPaths(name: string): string[] {
+  if (name.startsWith("~/")) return [join(homeDir, name.slice(2))];
   if (name.includes("/") || name.includes("\\")) return [name]; // explicit path
+  name = name.replace(/\.json$/, "");
   const safeName = name.replace(/[^a-zA-Z0-9_-]/g, "_");
   return profileDirs.map((dir) => join(dir, `${safeName}.json`));
 }
 
 function nameToPath(name: string): string {
   const candidates = profileNameToPaths(name);
+  const nested = join(configDir, "profiles", name.replace(/\.json$/, "") + ".json");
+  if (!name.includes("/") && !name.includes("\\") && existsSync(nested)) return nested;
   return candidates.find((path) => existsSync(path)) || candidates[0];
 }
 
 function listProfileFiles(): Array<{ name: string; path: string }> {
   const seen = new Set<string>();
   const profiles: Array<{ name: string; path: string }> = [];
-  for (const dir of profileDirs) {
+  for (const dir of [join(configDir, "profiles"), ...profileDirs]) {
     let files: string[] = [];
     try { files = readdirSync(dir).filter((f: string) => f.endsWith(".json")); } catch {}
     for (const file of files) {
@@ -216,19 +216,18 @@ function listProfileFiles(): Array<{ name: string; path: string }> {
   return profiles;
 }
 
-function resolveProfile(): { path: string; source: ProfileSource; declaredName?: string } {
-  // 1. AGENTSCHAT_PROFILE env var (supports both name and full path)
-  if (process.env.AGENTSCHAT_PROFILE)
-    return { path: nameToPath(process.env.AGENTSCHAT_PROFILE), source: "env", declaredName: process.env.AGENTSCHAT_PROFILE };
-  // 2. AGENTCHAT_PROFILE env var (legacy alias)
-  if (process.env.AGENTCHAT_PROFILE)
-    return { path: nameToPath(process.env.AGENTCHAT_PROFILE), source: "legacy-env", declaredName: process.env.AGENTCHAT_PROFILE };
-  // 3. --profile <name>
+function resolveProfile(): { path: string; source: ProfileSource; declaredName?: string; agentId?: string; apiUrl?: string; wsUrl?: string } {
   if (cliArgs.profile) return { path: nameToPath(cliArgs.profile), source: "flag-profile", declaredName: cliArgs.profile };
-  // 4. --name <name>
   if (cliArgs.name) return { path: nameToPath(cliArgs.name), source: "flag-name", declaredName: cliArgs.name };
 
-  // 5. Grok outbound bind. Explicit env/flags already returned above. An
+  // Paired direct credentials are a separate explicit authentication path.
+  // Do not borrow an unrelated project's identity when credentials are supplied.
+  if (!cliArgs.token && !process.env.AGENTCHAT_TOKEN) {
+    const project = projectProfileSelector(process.cwd());
+    if (project) return { ...project, path: nameToPath(project.selector), declaredName: project.selector };
+  }
+
+  // Grok outbound bind. Explicit CLI/project selections already returned above. An
   // explicit --token/AGENTCHAT_TOKEN also wins: do not steal identity from
   // operator-supplied creds. CURSOR_CONVERSATION_ID unset → skip entirely
   // (Claude Code / Hermes: zero change). A hit with a missing profile file
@@ -271,11 +270,16 @@ function resolveProfile(): { path: string; source: ProfileSource; declaredName?:
     process.stderr.write(`[agentchat] no grok-bind matched CURSOR_CONVERSATION_ID=${grok.conversationId}\n`);
   }
 
-  // 6. default — nothing was declared. NOT a licence to invent an identity.
+  if (process.env.AGENTSCHAT_PROFILE)
+    return { path: nameToPath(process.env.AGENTSCHAT_PROFILE), source: "env", declaredName: process.env.AGENTSCHAT_PROFILE };
+  if (process.env.AGENTCHAT_PROFILE)
+    return { path: nameToPath(process.env.AGENTCHAT_PROFILE), source: "legacy-env", declaredName: process.env.AGENTCHAT_PROFILE };
+
+  // Default — nothing was declared. NOT a licence to invent an identity.
   return { path: nameToPath("profile"), source: "default" };
 }
 
-const { path: profileFile, source: profileSource, declaredName } = resolveProfile();
+const { path: profileFile, source: profileSource, declaredName, agentId: projectAgentId, apiUrl: projectApiUrl, wsUrl: projectWsUrl } = resolveProfile();
 /**
  * The profile file currently in effect. Mutable because `switch_profile` swaps
  * identity at runtime — `whoami` must report the live one, not the boot-time one.
@@ -287,8 +291,8 @@ let anonymousMode = false;
 let profile: any = {};
 
 const DEFAULT_SERVER = "https://agents-chat.com";
-const serverUrl = (cliArgs.url || process.env.AGENTCHAT_REST_URL || DEFAULT_SERVER).replace(/\/$/, "");
-const WS_URL = process.env.AGENTCHAT_URL || (() => {
+const serverUrl = (cliArgs.url || projectApiUrl || process.env.AGENTCHAT_REST_URL || DEFAULT_SERVER).replace(/\/$/, "");
+const WS_URL = (!cliArgs.url && projectWsUrl) || (!projectApiUrl && process.env.AGENTCHAT_URL) || (() => {
   const base = serverUrl.replace("https://", "wss://").replace("http://", "ws://");
   return base.endsWith("/ws") ? base : base + "/ws";
 })();
@@ -363,6 +367,9 @@ function readIdentityProfile(file: string): any {
 if (identity.mode === "profile") {
   try {
     profile = readIdentityProfile(profileFile);
+    if (projectAgentId !== undefined && projectAgentId !== (cliArgs.id ?? process.env.AGENTCHAT_AGENT_ID ?? profile?.agent_id)) {
+      throw new Error("Project agent_id does not match selected profile");
+    }
     validateIdentityProfile(profile && !Array.isArray(profile) ? {
       ...profile,
       agent_id: cliArgs.id ?? process.env.AGENTCHAT_AGENT_ID ?? profile.agent_id,