@cohortapp/agent-sdk 2.11.7 → 2.11.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cohortapp/agent-sdk",
-  "version": "2.11.7",
+  "version": "2.11.8",
   "description": "Cohort Agent SDK — autonomous AI colleague runtime. Deploy senior AI colleagues on dedicated Mac minis, wired to the Cohort operating surface.",
   "type": "module",
   "bin": {

package/scripts/daemon/agent-daemon.mjs

@@ -1118,13 +1118,26 @@ export async function resolveSelfMemberId(deps = {}) {
   try {
     const cfg = daemonOrgCfg();
     const conn = configFromAgent(cfg) || {};
-    const apiKey = conn.apiKey || process.env.COHORT_API_KEY || "";
+    // configFromAgent returns the org key as `token` (NOT `apiKey`), and the
+    // daemon's creds come from config/org.yaml, not process.env — so read `token`
+    // first and only fall back to env. The slug lives at cfg.org.cohort.agentId
+    // (same source ladderMemberId used); without it fetchSelfProfile can't hit
+    // /members/<slug> and whoami is ambiguous in a multi-agent org.
+    const apiKey = conn.token || conn.apiKey || process.env.COHORT_API_KEY || "";
     const orgId = conn.orgId || process.env.COHORT_ORG_ID || "";
-    const agentId = conn.agentId || process.env.COHORT_AGENT_ID || "";
+    const agentId =
+      conn.agentId ||
+      (cfg && cfg.org && cfg.org.cohort && cfg.org.cohort.agentId) ||
+      process.env.COHORT_AGENT_ID ||
+      "";
+    const base = conn.base || process.env.COHORT_BASE || "";
     if (!apiKey || !orgId) return _selfMemberId;
     const fetchSelf = deps.fetchSelfProfileImpl || fetchSelfProfile;
-    const res = await fetchSelf({ base: conn.base, apiKey, orgId, agentId });
-    const mid = res && res.ok && res.member && res.member.memberId ? String(res.member.memberId) : "";
+    const res = await fetchSelf({ base, apiKey, orgId, agentId });
+    // fetchSelfProfile returns a res frame with the member under `result` (the
+    // authed call() shape); tolerate `member` too for the raw directory route.
+    const m = res && res.ok ? (res.result || res.member) : null;
+    const mid = m && m.memberId ? String(m.memberId) : "";
     if (mid) {
       _selfMemberId = mid;
       try {

package/scripts/daemon/agent-daemon.test.mjs

@@ -830,3 +830,35 @@ test("NO FALLTHROUGH: a TRANSIENT quick-reply failure still falls through to a f
   assert.equal(dispatched, true, "a transient failure falls through to the full session, as before");
   assert.equal(res.path, "session");
 });
+
+test("resolveSelfMemberId reads the member cuid from the res frame's `result` (own-echo keystone)", async () => {
+  daemon._resetSelfMemberId();
+  const pk = process.env.COHORT_API_KEY, po = process.env.COHORT_ORG_ID, pa = process.env.COHORT_AGENT_ID;
+  process.env.COHORT_API_KEY = "nlk_test";
+  process.env.COHORT_ORG_ID = "org_test";
+  process.env.COHORT_AGENT_ID = "A016";
+  try {
+    let calls = 0;
+    // fetchSelfProfile returns the authed call() res frame: the member is under
+    // `result`, and the org key is passed as apiKey. (Both were wrong in 2.11.7.)
+    const mid = await daemon.resolveSelfMemberId({
+      fetchSelfProfileImpl: async (o) => {
+        calls++;
+        assert.equal(o.agentId, "A016", "must pass the slug so /members/<slug> resolves");
+        return { ok: true, result: { memberId: "cmSELFcuid", slug: o.agentId } };
+      },
+    });
+    assert.equal(mid, "cmSELFcuid");
+    // cached: a second call must NOT refetch
+    const again = await daemon.resolveSelfMemberId({
+      fetchSelfProfileImpl: async () => { throw new Error("must not refetch a cached self id"); },
+    });
+    assert.equal(again, "cmSELFcuid");
+    assert.equal(calls, 1);
+  } finally {
+    daemon._resetSelfMemberId();
+    if (pk === undefined) delete process.env.COHORT_API_KEY; else process.env.COHORT_API_KEY = pk;
+    if (po === undefined) delete process.env.COHORT_ORG_ID; else process.env.COHORT_ORG_ID = po;
+    if (pa === undefined) delete process.env.COHORT_AGENT_ID; else process.env.COHORT_AGENT_ID = pa;
+  }
+});