wangjunxiao/nanoclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Teams user-id prefix + defer cli:local owner grant

Browse Source 
parseUserId now falls back to user.kind when the id prefix isn't a
registered adapter — Teams uses `29:` rather than `teams:`, so the
literal prefix wouldn't resolve the channel adapter for cold DMs.

init-cli-agent no longer claims the first-owner slot on `cli:local`.
The CLI identity is scratch; owner promotion belongs to
init-first-agent once the real channel user is wired.
This commit is contained in:
gavrielc
2026-04-21 10:16:13 +03:00
parent 212fc1f1b5
commit d8d61d3695
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/init-cli-agent.ts
View File

@@ -30,7 +30,6 @@ import {
} from '../src/db/messaging-groups.js'; } from '../src/db/messaging-groups.js';
import { runMigrations } from '../src/db/migrations/index.js'; import { runMigrations } from '../src/db/migrations/index.js';
import { normalizeName } from '../src/modules/agent-to-agent/db/agent-destinations.js'; import { normalizeName } from '../src/modules/agent-to-agent/db/agent-destinations.js';
import { grantRole, hasAnyOwner } from '../src/modules/permissions/db/user-roles.js';
import { upsertUser } from '../src/modules/permissions/db/users.js'; import { upsertUser } from '../src/modules/permissions/db/users.js';
import { initGroupFilesystem } from '../src/group-init.js'; import { initGroupFilesystem } from '../src/group-init.js';
import type { AgentGroup, MessagingGroup } from '../src/types.js'; import type { AgentGroup, MessagingGroup } from '../src/types.js';
@@ -91,17 +90,9 @@ async function main(): Promise<void> {
created_at: now, created_at: now,
}); });
let promotedToOwner = false; // Owner grant deferred to init-first-agent when the real channel user is
if (!hasAnyOwner()) { // wired — cli:local is a scratch identity, not the operator.
grantRole({ const promotedToOwner = false;
user_id: CLI_SYNTHETIC_USER_ID,
role: 'owner',
agent_group_id: null,
granted_by: null,
granted_at: now,
});
promotedToOwner = true;
}
// 2. Agent group + filesystem. // 2. Agent group + filesystem.
const folder = `cli-with-${normalizeName(args.displayName)}`; const folder = `cli-with-${normalizeName(args.displayName)}`;

15
src/modules/permissions/user-dm.ts
View File

@@ -136,11 +136,14 @@ async function resolveDmPlatformId(channelType: string, handle: string): Promise
function parseUserId(user: User): { channelType: string; handle: string } | { channelType: null; handle: null } { function parseUserId(user: User): { channelType: string; handle: string } | { channelType: null; handle: null } {
const idx = user.id.indexOf(':'); const idx = user.id.indexOf(':');
if (idx < 0) return { channelType: null, handle: null }; if (idx < 0) return { channelType: null, handle: null };
const channelType = user.id.slice(0, idx); const prefix = user.id.slice(0, idx);
const handle = user.id.slice(idx + 1); const handle = user.id.slice(idx + 1);
if (!channelType || !handle) return { channelType: null, handle: null }; if (!prefix || !handle) return { channelType: null, handle: null };
// The `kind` on users mirrors the channel_type prefix in our current // Teams user IDs use a `29:` prefix, not `teams:`. When the id prefix
// scheme. Pull it from `user.kind` if we ever decouple them later, but // isn't a registered adapter, fall back to user.kind and treat the full
// today the id prefix is authoritative. // id as the handle.
return { channelType, handle }; if (!getChannelAdapter(prefix) && user.kind && getChannelAdapter(user.kind)) {
return { channelType: user.kind, handle: user.id };
}
return { channelType: prefix, handle };
} }