@m1a0rz/agent-identity 0.2.4 → 0.3.1

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA8D7D,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAG,EAAE,iBAAiB,QAuWtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmE7D,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAG,EAAE,iBAAiB,QA0YtD"}

package/dist/index.js

@@ -19,6 +19,8 @@ import { createLlmInputHandler } from "./src/hooks/llm-input.js";
 import { createSessionsSendPropagationHandler } from "./src/hooks/sessions-send-propagation.js";
 import { createSessionsSpawnPropagationHandler } from "./src/hooks/sessions-spawn-propagation.js";
 import { createSubagentEndedCleanupHandler } from "./src/hooks/subagent-ended-cleanup.js";
+import { setSender, clearSender } from "./src/store/group-sender-store.js";
+import { deriveSessionKey, isGroupOrChannelSessionKey, } from "./src/utils/derive-session-key.js";
 import { createBeforeToolCallHandler } from "./src/hooks/before-tool-call.js";
 import * as skillPathStore from "./src/store/skill-path-store.js";
 import { createOIDCCallbackHandler, createOIDCCallbackHandlerLazy, } from "./src/routes/oidc-login.js";
@@ -293,10 +295,47 @@ export default function register(api) {
     api.registerTool(createIdentityListRiskPatternsTool(), { optional: true });
     const authz = pluginConfig.authz;
     const approvalTtlMs = (authz?.approvalTtlSeconds ?? 300) * 1000;
-    // Optional: agent must NOT have this (would self-approve). Use /identity approve for human approval.
     api.registerTool(createIdentityApproveTool({ approvalTtlMs, logger: api.logger }), {
         optional: true,
     });
+    // Capture group sender on every inbound message so before_tool_call can
+    // identify which user triggered the current run.
+    api.on("message_received", (event, ctx) => {
+        const channel = ctx.channelId ??
+            event.metadata?.provider;
+        if (!channel)
+            return;
+        const to = ctx.conversationId ??
+            event.metadata?.to;
+        const from = event.from;
+        const metadata = event.metadata;
+        const senderId = metadata?.senderId;
+        if (!senderId)
+            return;
+        const sessionKey = deriveSessionKey({
+            channel,
+            senderId,
+            from,
+            to,
+            accountId: ctx.accountId,
+            config: api.runtime.config.loadConfig(),
+        });
+        if (!sessionKey || !isGroupOrChannelSessionKey(sessionKey))
+            return;
+        setSender(sessionKey, {
+            senderId,
+            senderName: metadata?.senderName,
+            from,
+            channelId: channel,
+            messageId: metadata?.messageId,
+            capturedAt: Date.now(),
+        });
+        logInfo(api.logger, `group sender captured session=${sessionKey} sender=${senderId}`);
+    }, { priority: 200 });
+    api.on("session_end", (_event, ctx) => {
+        if (ctx.sessionKey)
+            clearSender(ctx.sessionKey);
+    });
     // Hooks
     if (hasIdentity) {
         api.on("before_agent_start", createBeforeAgentStartHandler({
@@ -331,11 +370,11 @@ export default function register(api) {
     const skillReadCheck = authz?.skillReadCheck ?? false;
     const requireRiskApproval = authz?.requireRiskApproval ?? false;
     const hasAuthz = toolCheck || skillReadCheck || requireRiskApproval;
+    api.on("llm_input", createLlmInputHandler({
+        enabled: skillReadCheck,
+        logger: api.logger,
+    }));
     if (skillReadCheck) {
-        api.on("llm_input", createLlmInputHandler({
-            enabled: true,
-            logger: api.logger,
-        }));
         api.on("session_end", (_event, ctx) => {
             if (ctx.sessionId)
                 skillPathStore.clearSessionById(ctx.sessionId);

package/dist/src/commands/identity-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-commands.d.ts","sourceRoot":"","sources":["../../../src/commands/identity-commands.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAUL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACf,MAAM,gCAAgC,CAAC;AAWxC,YAAY,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;AAEhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAioBvD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB;;;;;mBA9e3C,oBAAoB,KAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EAufpE;AAED,0CAA0C;AAC1C,wBAAgB,eAAe,CAAC,IAAI,EAAE,oBAAoB;;;;;mBA1frC,oBAAoB,KAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EAmgBpE"}
+{"version":3,"file":"identity-commands.d.ts","sourceRoot":"","sources":["../../../src/commands/identity-commands.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAUL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACf,MAAM,gCAAgC,CAAC;AAYxC,YAAY,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;AAEhD,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAooBvD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,oBAAoB;;;;;mBAjf3C,oBAAoB,KAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EA0fpE;AAED,0CAA0C;AAC1C,wBAAgB,eAAe,CAAC,IAAI,EAAE,oBAAoB;;;;;mBA7frC,oBAAoB,KAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EAsgBpE"}

package/dist/src/commands/identity-commands.js

@@ -15,6 +15,7 @@
  */
 import { runStatus, runLogin, runLogout, runListCredentials, runListTips, runConfig, runFetch, runSetBinding, runUnsetBinding, } from "../actions/identity-actions.js";
 import { deriveSessionKey, deriveDeliveryTargetFromContext, } from "../utils/derive-session-key.js";
+import { buildEffectiveSessionKey } from "../store/group-sender-store.js";
 import { logDebug } from "../utils/logger.js";
 import { diagnoseRisk } from "../risk/diagnose-risk.js";
 import { getRiskPatterns } from "../risk/classify-risk.js";
@@ -155,7 +156,7 @@ function createIdentityHandler(deps) {
     return async (ctx) => {
         const { sub, rest } = parseSubcommand(ctx.args);
         logDebug(logger, `command sub=${sub} rest=${rest.slice(0, 40)}...`);
-        const sessionKey = deriveSessionKey({
+        const baseSessionKey = deriveSessionKey({
             channel: ctx.channel,
             senderId: ctx.senderId,
             from: ctx.from,
@@ -163,6 +164,9 @@ function createIdentityHandler(deps) {
             accountId: ctx.accountId,
             config: ctx.config,
         });
+        const sessionKey = baseSessionKey
+            ? buildEffectiveSessionKey(baseSessionKey, ctx.senderId)
+            : null;
         const needsSession = [
             "login",
             "logout",

package/dist/src/hooks/before-agent-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"before-agent-start.d.ts","sourceRoot":"","sources":["../../../src/hooks/before-agent-start.ts"],"names":[],"mappings":"AAgBA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAO3E,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACxE,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,oBAAoB,IAapE,QAAQ;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;CAAE,EAChD,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KAC7C,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA4B/C"}
+{"version":3,"file":"before-agent-start.d.ts","sourceRoot":"","sources":["../../../src/hooks/before-agent-start.ts"],"names":[],"mappings":"AAgBA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAQ3E,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACxE,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,oBAAoB,IAapE,QAAQ;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;CAAE,EAChD,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KAC7C,OAAO,CAAC;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA8B/C"}

package/dist/src/hooks/before-agent-start.js

@@ -18,6 +18,7 @@ import { logWarn } from "../utils/logger.js";
 import { loadCredentialEnvBindings } from "../store/credential-env-bindings.js";
 import { getCredential, resolveCredentialValue } from "../store/credential-store.js";
 import { isSubagentSessionKey } from "../utils/derive-session-key.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createBeforeAgentStartHandler(deps) {
     const { storeDir, identityService, configWorkloadName, getOidcConfigForRefresh, logger } = deps;
     // Always pass identityService so we can try fetch with session.userToken when TIP is missing/expired.
@@ -34,10 +35,11 @@ export function createBeforeAgentStartHandler(deps) {
             return;
         if (isSubagentSessionKey(sessionKey))
             return;
+        const effectiveKey = resolveEffectiveSessionKey(sessionKey);
         try {
-            const bindings = await loadCredentialEnvBindings(storeDir, sessionKey);
+            const bindings = await loadCredentialEnvBindings(storeDir, effectiveKey);
             for (const [provider, envVar] of Object.entries(bindings)) {
-                const cred = await getCredential(storeDir, sessionKey, provider);
+                const cred = await getCredential(storeDir, effectiveKey, provider);
                 const value = cred ? resolveCredentialValue(cred) : undefined;
                 if (value)
                     process.env[envVar] = value;
@@ -49,7 +51,7 @@ export function createBeforeAgentStartHandler(deps) {
             /* best-effort */
         }
         try {
-            const tip = await getOrRefreshTIPToken(storeDir, sessionKey, {
+            const tip = await getOrRefreshTIPToken(storeDir, effectiveKey, {
                 ...tipRefreshOptions,
                 ctxAgentId: ctx.agentId,
             });
@@ -57,7 +59,7 @@ export function createBeforeAgentStartHandler(deps) {
                 return;
         }
         catch (err) {
-            logWarn(logger, `failed to get TIP for ${sessionKey}: ${String(err)}`);
+            logWarn(logger, `failed to get TIP for ${effectiveKey}: ${String(err)}`);
         }
     };
 }

package/dist/src/hooks/before-tool-call.d.ts

@@ -32,6 +32,7 @@ export type BeforeToolCallDeps = {
 };
 export declare function createBeforeToolCallHandler(deps: BeforeToolCallDeps): (event: {
     toolName: string;
+    runId?: string;
     params: Record<string, unknown>;
 }, ctx: {
     agentId?: string;

package/dist/src/hooks/before-tool-call.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"before-tool-call.d.ts","sourceRoot":"","sources":["../../../src/hooks/before-tool-call.ts"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAUhD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,uGAAuG;IACvG,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,kFAAkF;IAClF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;IACxE,sEAAsE;IACtE,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,oBAAoB;IACpB,KAAK,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAwCF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,kBAAkB,IA8BhE,OAAO;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC5D,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAC/D,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAyK7D"}
+{"version":3,"file":"before-tool-call.d.ts","sourceRoot":"","sources":["../../../src/hooks/before-tool-call.ts"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAYhD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,uGAAuG;IACvG,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,kFAAkF;IAClF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;IACxE,sEAAsE;IACtE,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,oBAAoB;IACpB,KAAK,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,+EAA+E;IAC/E,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAwCF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,kBAAkB,IA8BhE,OAAO;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC5E,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAC/D,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CA2L7D"}

package/dist/src/hooks/before-tool-call.js

@@ -21,6 +21,8 @@ import { getOrRefreshTIPToken } from "../services/tip-with-refresh.js";
 import { supportsSyncApproval } from "../utils/approval-channel.js";
 import { extractDelegationChainFromJwt } from "../utils/auth.js";
 import { logDebug } from "../utils/logger.js";
+import { getSender, resolveEffectiveSessionKeyForRun } from "../store/group-sender-store.js";
+import { isGroupOrChannelSessionKey } from "../utils/derive-session-key.js";
 function resolveAuthzFlags(authz) {
     return {
         toolCheck: authz?.toolCheck ?? false,
@@ -65,6 +67,22 @@ export function createBeforeToolCallHandler(deps) {
         logDebug(logger, `before_tool_call toolName=${toolName}`);
         if (!sessionKey)
             return;
+        const effectiveKey = resolveEffectiveSessionKeyForRun(sessionKey, event.runId);
+        if (isGroupOrChannelSessionKey(sessionKey)) {
+            const groupSender = getSender(sessionKey);
+            if (groupSender) {
+                params._enhancedContext = {
+                    senderId: groupSender.senderId,
+                    senderName: groupSender.senderName,
+                    from: groupSender.from,
+                    channelId: groupSender.channelId,
+                    messageId: groupSender.messageId,
+                    sourceSessionKey: sessionKey,
+                    source: "group-latest",
+                    capturedAt: groupSender.capturedAt,
+                };
+            }
+        }
         const pathStr = params?.path ?? params?.file_path;
         const isSkillRead = flags.skillReadCheck &&
             toolName.toLowerCase() === "read" &&
@@ -80,7 +98,7 @@ export function createBeforeToolCallHandler(deps) {
             logDebug(logger, `low-risk bypass for ${toolName}`);
             return;
         }
-        const tip = await getOrRefreshTIPToken(storeDir, sessionKey, tipRefreshOptions
+        const tip = await getOrRefreshTIPToken(storeDir, effectiveKey, tipRefreshOptions
             ? { ...tipRefreshOptions, ctxAgentId: ctx.agentId }
             : undefined);
         if (!tip) {
@@ -146,18 +164,18 @@ export function createBeforeToolCallHandler(deps) {
             logDebug(logger, `AuthZ ok for ${toolName} (risk=${risk})`);
             return;
         }
-        if (toolApprovalStore.hasRecentApproval(sessionKey, toolName, paramsRecord)) {
-            toolApprovalStore.consumeApproval(sessionKey, toolName, paramsRecord);
+        if (toolApprovalStore.hasRecentApproval(effectiveKey, toolName, paramsRecord)) {
+            toolApprovalStore.consumeApproval(effectiveKey, toolName, paramsRecord);
             logDebug(logger, `AuthZ ok for ${toolName} (recent approval)`);
             return;
         }
         const fullHash = toolApprovalStore.hashToolParams(toolName, paramsRecord);
-        const approvalId = toolApprovalStore.shortApprovalId(fullHash + sessionKey + Date.now());
+        const approvalId = toolApprovalStore.shortApprovalId(fullHash + effectiveKey + Date.now());
         const ttlSeconds = Math.floor(approvalTtlMs / 1000);
         if (supportsSyncApproval(sessionKey) && sendToSession) {
             toolApprovalStore.createPending({
                 approvalId,
-                sessionKey,
+                sessionKey: effectiveKey,
                 toolName,
                 params: paramsRecord,
                 ttlMs: approvalTtlMs,
@@ -177,7 +195,7 @@ export function createBeforeToolCallHandler(deps) {
         }
         toolApprovalStore.createPending({
             approvalId,
-            sessionKey,
+            sessionKey: effectiveKey,
             toolName,
             params: paramsRecord,
             ttlMs: approvalTtlMs,

package/dist/src/hooks/llm-input.d.ts

@@ -1,10 +1,12 @@
 export type LlmInputHandlerDeps = {
+    /** Enable skill path parsing for authz.skillReadCheck. */
     enabled: boolean;
     logger?: {
         debug?: (msg: string) => void;
     };
 };
 export declare function createLlmInputHandler(deps: LlmInputHandlerDeps): (event: {
+    runId?: string;
     systemPrompt?: string;
 }, ctx: {
     sessionKey?: string;

package/dist/src/hooks/llm-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"llm-input.d.ts","sourceRoot":"","sources":["../../../src/hooks/llm-input.ts"],"names":[],"mappings":"AA0BA,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC5C,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,IAI3D,OAAO;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EAChC,KAAK;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,KACtE,IAAI,CAcR"}
+{"version":3,"file":"llm-input.d.ts","sourceRoot":"","sources":["../../../src/hooks/llm-input.ts"],"names":[],"mappings":"AA4BA,MAAM,MAAM,mBAAmB,GAAG;IAChC,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC5C,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,IAI3D,OAAO;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EAChD,KAAK;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,KACtE,IAAI,CAwBR"}

package/dist/src/hooks/llm-input.js

@@ -14,17 +14,28 @@
  * limitations under the License.
  */
 /**
- * llm_input hook: parse <available_skills> from system prompt and store
- * path -> skill name mapping for skill read permission checks in before_tool_call.
- * Only runs when authz.skillReadCheck is enabled.
+ * llm_input hook:
+ * 1. Freeze effective sessionKey per runId for group-chat user isolation.
+ * 2. Parse <available_skills> from system prompt (when skillReadCheck enabled).
  */
 import { parseAvailableSkills } from "../utils/parse-available-skills.js";
 import * as skillPathStore from "../store/skill-path-store.js";
+import { freezeRun, resolveEffectiveSessionKey } from "../store/group-sender-store.js";
+import { isGroupOrChannelSessionKey } from "../utils/derive-session-key.js";
 import { logDebug } from "../utils/logger.js";
 export function createLlmInputHandler(deps) {
     const { enabled, logger } = deps;
     return (event, ctx) => {
-        if (!enabled || !ctx.sessionKey)
+        if (!ctx.sessionKey)
+            return;
+        if (event.runId && isGroupOrChannelSessionKey(ctx.sessionKey)) {
+            const effectiveKey = resolveEffectiveSessionKey(ctx.sessionKey);
+            if (effectiveKey !== ctx.sessionKey) {
+                freezeRun(event.runId, effectiveKey);
+                logDebug(logger, `frozen run=${event.runId} → ${effectiveKey}`);
+            }
+        }
+        if (!enabled)
             return;
         const pathToName = parseAvailableSkills(event.systemPrompt);
         if (pathToName.size === 0)

package/dist/src/hooks/sessions-send-propagation.d.ts

@@ -21,6 +21,7 @@ export type SessionsSendPropagationDeps = {
 };
 export declare function createSessionsSendPropagationHandler(deps: SessionsSendPropagationDeps): (event: {
     toolName: string;
+    runId?: string;
     params: Record<string, unknown>;
 }, ctx: {
     agentId?: string;

package/dist/src/hooks/sessions-send-propagation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions-send-propagation.d.ts","sourceRoot":"","sources":["../../../src/hooks/sessions-send-propagation.ts"],"names":[],"mappings":"AAgBA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAK3E,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACzE,CAAC;AAEF,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,2BAA2B,IAWlF,OAAO;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC5D,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAC/D,OAAO,CAAC,IAAI,CAAC,CAoCjB"}
+{"version":3,"file":"sessions-send-propagation.d.ts","sourceRoot":"","sources":["../../../src/hooks/sessions-send-propagation.ts"],"names":[],"mappings":"AAgBA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAM3E,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACzE,CAAC;AAEF,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,2BAA2B,IAWlF,OAAO;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAC5E,KAAK;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAC/D,OAAO,CAAC,IAAI,CAAC,CAsCjB"}

package/dist/src/hooks/sessions-send-propagation.js

@@ -16,6 +16,7 @@
 import { getOrRefreshTIPToken } from "../services/tip-with-refresh.js";
 import { propagateTIPToTarget } from "../services/tip-propagation.js";
 import { logWarn } from "../utils/logger.js";
+import { resolveEffectiveSessionKeyForRun } from "../store/group-sender-store.js";
 export function createSessionsSendPropagationHandler(deps) {
     const { storeDir, identityService, configWorkloadName, getOidcConfigForRefresh, subagentTipPropagation, logger, } = deps;
     return async (event, ctx) => {
@@ -28,16 +29,17 @@ export function createSessionsSendPropagationHandler(deps) {
         if (!callerSessionKey || !targetSessionKey || callerSessionKey === targetSessionKey) {
             return;
         }
+        const effectiveCallerKey = resolveEffectiveSessionKeyForRun(callerSessionKey, event.runId);
         try {
             await propagateTIPToTarget({
                 storeDir,
-                callerSessionKey,
+                callerSessionKey: effectiveCallerKey,
                 targetSessionKey,
                 identityService,
                 configWorkloadName,
                 subagentTipPropagation,
                 ctxAgentId: ctx.agentId,
-                getCallerTIP: () => getOrRefreshTIPToken(storeDir, callerSessionKey, {
+                getCallerTIP: () => getOrRefreshTIPToken(storeDir, effectiveCallerKey, {
                     identityService,
                     getOidcConfigForRefresh,
                     configWorkloadName,

package/dist/src/hooks/sessions-spawn-propagation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions-spawn-propagation.d.ts","sourceRoot":"","sources":["../../../src/hooks/sessions-spawn-propagation.ts"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAK3E,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACzE,CAAC;AAEF,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,4BAA4B,IAWpF,OAAO;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAClE,KAAK;IAAE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,KAC9D,OAAO,CAAC,IAAI,CAAC,CA+BjB"}
+{"version":3,"file":"sessions-spawn-propagation.d.ts","sourceRoot":"","sources":["../../../src/hooks/sessions-spawn-propagation.ts"],"names":[],"mappings":"AAgBA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAM3E,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACzE,CAAC;AAEF,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,4BAA4B,IAWpF,OAAO;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAClE,KAAK;IAAE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,KAC9D,OAAO,CAAC,IAAI,CAAC,CAiCjB"}

package/dist/src/hooks/sessions-spawn-propagation.js

@@ -16,6 +16,7 @@
 import { getOrRefreshTIPToken } from "../services/tip-with-refresh.js";
 import { propagateTIPToTarget } from "../services/tip-propagation.js";
 import { logWarn } from "../utils/logger.js";
+import { resolveEffectiveSessionKeyForRun } from "../store/group-sender-store.js";
 export function createSessionsSpawnPropagationHandler(deps) {
     const { storeDir, identityService, configWorkloadName, getOidcConfigForRefresh, subagentTipPropagation, logger, } = deps;
     return async (event, ctx) => {
@@ -24,16 +25,17 @@ export function createSessionsSpawnPropagationHandler(deps) {
         if (!callerSessionKey || !targetSessionKey || callerSessionKey === targetSessionKey) {
             return;
         }
+        const effectiveCallerKey = resolveEffectiveSessionKeyForRun(callerSessionKey, event.runId);
         try {
             await propagateTIPToTarget({
                 storeDir,
-                callerSessionKey,
+                callerSessionKey: effectiveCallerKey,
                 targetSessionKey,
                 identityService,
                 configWorkloadName,
                 subagentTipPropagation,
                 ctxAgentId: event.agentId,
-                getCallerTIP: () => getOrRefreshTIPToken(storeDir, callerSessionKey, {
+                getCallerTIP: () => getOrRefreshTIPToken(storeDir, effectiveCallerKey, {
                     identityService,
                     getOidcConfigForRefresh,
                     configWorkloadName,

package/dist/src/hooks/subagent-ended-cleanup.d.ts

@@ -9,5 +9,6 @@ export type SubagentEndedCleanupDeps = {
 export declare function createSubagentEndedCleanupHandler(deps: SubagentEndedCleanupDeps): (event: {
     targetSessionKey: string;
     targetKind: string;
+    runId?: string;
 }) => Promise<void>;
 //# sourceMappingURL=subagent-ended-cleanup.d.ts.map

package/dist/src/hooks/subagent-ended-cleanup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-ended-cleanup.d.ts","sourceRoot":"","sources":["../../../src/hooks/subagent-ended-cleanup.ts"],"names":[],"mappings":"AA2BA,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACvG,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,wBAAwB,IAI5E,OAAO;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,KACtD,OAAO,CAAC,IAAI,CAAC,CAcjB"}
+{"version":3,"file":"subagent-ended-cleanup.d.ts","sourceRoot":"","sources":["../../../src/hooks/subagent-ended-cleanup.ts"],"names":[],"mappings":"AA4BA,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CACvG,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,wBAAwB,IAI5E,OAAO;IAAE,gBAAgB,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,KACtE,OAAO,CAAC,IAAI,CAAC,CAgBjB"}

package/dist/src/hooks/subagent-ended-cleanup.js

@@ -21,12 +21,15 @@
  */
 import { deleteSession } from "../store/session-store.js";
 import { deleteTIPToken } from "../store/tip-store.js";
+import { clearFrozenRun } from "../store/group-sender-store.js";
 import { logDebug, logWarn } from "../utils/logger.js";
 export function createSubagentEndedCleanupHandler(deps) {
     const { storeDir, logger } = deps;
     return async (event) => {
         if (event.targetKind !== "subagent")
             return;
+        if (event.runId)
+            clearFrozenRun(event.runId);
         const targetSessionKey = event.targetSessionKey?.trim();
         if (!targetSessionKey)
             return;

package/dist/src/store/group-sender-store.d.ts

@@ -0,0 +1,35 @@
+export type SenderInfo = {
+    senderId: string;
+    senderName?: string;
+    from?: string;
+    channelId?: string;
+    messageId?: string;
+    capturedAt: number;
+};
+export declare function setSender(sessionKey: string, info: SenderInfo): void;
+export declare function getSender(sessionKey: string): SenderInfo | undefined;
+export declare function clearSender(sessionKey: string): void;
+/**
+ * For group sessions, append :user:<senderId> so each member gets isolated
+ * TIP tokens, credentials and session state.
+ * For non-group sessions the key is returned unchanged.
+ */
+export declare function resolveEffectiveSessionKey(sessionKey: string): string;
+/**
+ * Same as resolveEffectiveSessionKey but takes an explicit senderId
+ * (used by commands where ctx.senderId is already available).
+ */
+export declare function buildEffectiveSessionKey(sessionKey: string, senderId?: string): string;
+/**
+ * Freeze the effective sessionKey for a runId.
+ * Once frozen, all hooks in this run use the same user-scoped key
+ * regardless of later message_received overwrites.
+ */
+export declare function freezeRun(runId: string, effectiveKey: string): void;
+/**
+ * Resolve effective sessionKey with run-level freeze support.
+ * Priority: frozen[runId] > store lookup > original key.
+ */
+export declare function resolveEffectiveSessionKeyForRun(sessionKey: string, runId?: string): string;
+export declare function clearFrozenRun(runId: string): void;
+//# sourceMappingURL=group-sender-store.d.ts.map

package/dist/src/store/group-sender-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"group-sender-store.d.ts","sourceRoot":"","sources":["../../../src/store/group-sender-store.ts"],"names":[],"mappings":"AA0BA,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAIF,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAGpE;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAQpE;AAED,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEpD;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAKrE;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAGtF;AASD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAInE;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ3F;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAElD"}

package/dist/src/store/group-sender-store.js

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2026 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Lightweight in-memory store that maps group sessionKey → latest sender info.
+ * Written by the message_received handler, read by before_tool_call to inject
+ * sender identity into tool params so group-chat users can be distinguished.
+ */
+import { isGroupOrChannelSessionKey } from "../utils/derive-session-key.js";
+const SESSION_TTL_MS = 2 * 60 * 60 * 1000;
+const store = new Map();
+export function setSender(sessionKey, info) {
+    store.set(sessionKey, info);
+    pruneExpired();
+}
+export function getSender(sessionKey) {
+    const info = store.get(sessionKey);
+    if (!info)
+        return undefined;
+    if (Date.now() - info.capturedAt > SESSION_TTL_MS) {
+        store.delete(sessionKey);
+        return undefined;
+    }
+    return info;
+}
+export function clearSender(sessionKey) {
+    store.delete(sessionKey);
+}
+/**
+ * For group sessions, append :user:<senderId> so each member gets isolated
+ * TIP tokens, credentials and session state.
+ * For non-group sessions the key is returned unchanged.
+ */
+export function resolveEffectiveSessionKey(sessionKey) {
+    if (!isGroupOrChannelSessionKey(sessionKey))
+        return sessionKey;
+    const sender = getSender(sessionKey);
+    if (!sender?.senderId)
+        return sessionKey;
+    return `${sessionKey}:user:${sender.senderId}`;
+}
+/**
+ * Same as resolveEffectiveSessionKey but takes an explicit senderId
+ * (used by commands where ctx.senderId is already available).
+ */
+export function buildEffectiveSessionKey(sessionKey, senderId) {
+    if (!senderId || !isGroupOrChannelSessionKey(sessionKey))
+        return sessionKey;
+    return `${sessionKey}:user:${senderId}`;
+}
+// --------------- freeze-by-runId ---------------
+const RUN_TTL_MS = 2 * 60 * 60 * 1000;
+const frozenByRun = new Map();
+/**
+ * Freeze the effective sessionKey for a runId.
+ * Once frozen, all hooks in this run use the same user-scoped key
+ * regardless of later message_received overwrites.
+ */
+export function freezeRun(runId, effectiveKey) {
+    if (frozenByRun.has(runId))
+        return;
+    frozenByRun.set(runId, { effectiveKey, frozenAt: Date.now() });
+    pruneExpiredRuns();
+}
+/**
+ * Resolve effective sessionKey with run-level freeze support.
+ * Priority: frozen[runId] > store lookup > original key.
+ */
+export function resolveEffectiveSessionKeyForRun(sessionKey, runId) {
+    if (runId) {
+        const frozen = frozenByRun.get(runId);
+        if (frozen && Date.now() - frozen.frozenAt <= RUN_TTL_MS) {
+            return frozen.effectiveKey;
+        }
+    }
+    return resolveEffectiveSessionKey(sessionKey);
+}
+export function clearFrozenRun(runId) {
+    frozenByRun.delete(runId);
+}
+function pruneExpired() {
+    if (store.size < 128)
+        return;
+    const now = Date.now();
+    for (const [key, info] of store) {
+        if (now - info.capturedAt > SESSION_TTL_MS) {
+            store.delete(key);
+        }
+    }
+}
+function pruneExpiredRuns() {
+    if (frozenByRun.size < 256)
+        return;
+    const now = Date.now();
+    for (const [runId, entry] of frozenByRun) {
+        if (now - entry.frozenAt > RUN_TTL_MS) {
+            frozenByRun.delete(runId);
+        }
+    }
+}

package/dist/src/store/session-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/store/session-store.ts"],"names":[],"mappings":"AAyBA,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAMF,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;AAeD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAc1F;AAED,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAU9B;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvF"}
+{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/store/session-store.ts"],"names":[],"mappings":"AAyBA,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,mDAAmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAQF,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;AAoBD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAc1F;AAED,wBAAsB,YAAY,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GACrC,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAgB9B;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIvF"}

package/dist/src/store/session-store.js

@@ -23,6 +23,8 @@ import path from "node:path";
 const SESSIONS_FILENAME = "sessions.json";
 /** Max session age when no expiresAt (e.g. legacy entries). Default 30 days. */
 const MAX_SESSION_AGE_MS = 30 * 24 * 60 * 60 * 1000;
+/** Absolute max session lifetime regardless of refresh token. Default 30 days. */
+const MAX_SESSION_ABSOLUTE_AGE_MS = 30 * 24 * 60 * 60 * 1000;
 export async function ensureStoreDir(storeDir) {
     await fs.mkdir(storeDir, { recursive: true });
 }
@@ -30,6 +32,12 @@ function pruneExpiredSessions(sessions) {
     const now = Date.now();
     const pruned = {};
     for (const [k, v] of Object.entries(sessions)) {
+        if (now - v.loginAt > MAX_SESSION_ABSOLUTE_AGE_MS)
+            continue;
+        if (v.refreshToken) {
+            pruned[k] = v;
+            continue;
+        }
         if (v.expiresAt != null && v.expiresAt < now)
             continue;
         if (v.expiresAt == null && now - v.loginAt > MAX_SESSION_AGE_MS)
@@ -65,7 +73,13 @@ export async function getSession(storeDir, sessionKey) {
     const entry = sessions[sessionKey];
     if (!entry)
         return null;
-    if (entry.expiresAt && entry.expiresAt < Date.now()) {
+    const now = Date.now();
+    if (now - entry.loginAt > MAX_SESSION_ABSOLUTE_AGE_MS) {
+        delete sessions[sessionKey];
+        await saveSessions(storeDir, sessions);
+        return null;
+    }
+    if (entry.expiresAt && entry.expiresAt < now && !entry.refreshToken) {
         delete sessions[sessionKey];
         await saveSessions(storeDir, sessions);
         return null;

package/dist/src/tools/identity-approve-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-approve-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-approve-tool.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAMrD,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC1E,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,uBAAuB,IAC7D,KAAK,iBAAiB;;;;;;;2BAOC,MAAM,UAAU;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;EAsBxE"}
+{"version":3,"file":"identity-approve-tool.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-approve-tool.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAOrD,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC1E,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,uBAAuB,IAC7D,KAAK,iBAAiB;;;;;;;2BAOC,MAAM,UAAU;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;EAuBxE"}

package/dist/src/tools/identity-approve-tool.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import * as toolApprovalStore from "../store/tool-approval-store.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 import { logDebug, logWarn } from "../utils/logger.js";
 export function createIdentityApproveTool(deps) {
     return (ctx) => ({
@@ -33,7 +34,8 @@ export function createIdentityApproveTool(deps) {
                     error: "approval_id is required",
                 });
             }
-            const ok = toolApprovalStore.approve(approvalId, deps.approvalTtlMs, ctx.sessionKey);
+            const approverKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : ctx.sessionKey;
+            const ok = toolApprovalStore.approve(approvalId, deps.approvalTtlMs, approverKey);
             if (ok) {
                 logDebug(deps.logger, `approved tool call ${approvalId}`);
                 return jsonResult({ ok: true, message: "Tool call approved" });

package/dist/src/tools/identity-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-fetch.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-fetch.ts"],"names":[],"mappings":"AAgBA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAM1E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,IACvD,KAAK,iBAAiB;;;;;;;;;;;;EA6D/B"}
+{"version":3,"file":"identity-fetch.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-fetch.ts"],"names":[],"mappings":"AAgBA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAO1E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,IACvD,KAAK,iBAAiB;;;;;;;;;;;;EA6D/B"}

package/dist/src/tools/identity-fetch.js

@@ -18,6 +18,7 @@ import { optionalStringEnum } from "openclaw/plugin-sdk";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runFetch } from "../actions/identity-actions.js";
 import { getCredential, resolveCredentialValue } from "../store/credential-store.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 const FETCH_FLOWS = ["oauth2-user", "oauth2-m2m", "apikey"];
 export function createIdentityFetchTool(deps) {
     return (ctx) => ({
@@ -36,7 +37,7 @@ export function createIdentityFetchTool(deps) {
             })),
         }),
         execute: async (_toolCallId, params) => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ error: "No session context", success: false });
             }

package/dist/src/tools/identity-list-credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-list-credentials.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-list-credentials.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,mBAAmB,IACjE,KAAK,iBAAiB;;;;;;;;EAsB/B"}
+{"version":3,"file":"identity-list-credentials.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-list-credentials.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,mBAAmB,IACjE,KAAK,iBAAiB;;;;;;;;EAsB/B"}

package/dist/src/tools/identity-list-credentials.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runListCredentials } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityListCredentialsTool(deps) {
     return (ctx) => ({
         name: "identity_list_credentials",
@@ -25,7 +26,7 @@ export function createIdentityListCredentialsTool(deps) {
             page: Type.Optional(Type.Number({ minimum: 1, default: 1 })),
         }),
         execute: async (_toolCallId, params) => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ error: "No session context", providers: [], storedOnly: [] });
             }

package/dist/src/tools/identity-login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-login.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-login.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,IACvD,KAAK,iBAAiB;;;;;;EAiC/B"}
+{"version":3,"file":"identity-login.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-login.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,IACvD,KAAK,iBAAiB;;;;;;EAiC/B"}

package/dist/src/tools/identity-login.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runLogin } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityLoginTool(deps) {
     return (ctx) => ({
         name: "identity_login",
@@ -23,7 +24,7 @@ export function createIdentityLoginTool(deps) {
         description: "Start OIDC login (returns auth URL to open) or refresh TIP when already logged in. User must open the URL in a browser.",
         parameters: Type.Object({}),
         execute: async () => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ error: "No session context", authUrl: null });
             }

package/dist/src/tools/identity-logout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-logout.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-logout.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EAgB/B"}
+{"version":3,"file":"identity-logout.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-logout.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EAgB/B"}

package/dist/src/tools/identity-logout.js

@@ -16,9 +16,10 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runLogout } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityLogoutTool(deps) {
     return (ctx) => {
-        const sessionKey = ctx.sessionKey;
+        const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
         return {
             name: "identity_logout",
             label: "Identity Logout",

package/dist/src/tools/identity-set-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-set-binding.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-set-binding.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,mBAAmB,IAC5D,KAAK,iBAAiB;;;;;;;;;EAwB/B"}
+{"version":3,"file":"identity-set-binding.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-set-binding.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,mBAAmB,IAC5D,KAAK,iBAAiB;;;;;;;;;EAwB/B"}

package/dist/src/tools/identity-set-binding.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runSetBinding } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentitySetBindingTool(deps) {
     return (ctx) => ({
         name: "identity_set_binding",
@@ -28,7 +29,7 @@ export function createIdentitySetBindingTool(deps) {
             }),
         }),
         execute: async (_toolCallId, params) => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ ok: false, error: "No session context" });
             }

package/dist/src/tools/identity-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-status.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-status.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EAiC/B"}
+{"version":3,"file":"identity-status.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-status.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EAiC/B"}

package/dist/src/tools/identity-status.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runStatus } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityStatusTool(deps) {
     return (ctx) => ({
         name: "identity_status",
@@ -23,7 +24,7 @@ export function createIdentityStatusTool(deps) {
         description: "Show login status, credentials, and env bindings for the current session.",
         parameters: Type.Object({}),
         execute: async () => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ error: "No session context", loggedIn: false });
             }

package/dist/src/tools/identity-unset-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-unset-binding.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-unset-binding.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,IAC9D,KAAK,iBAAiB;;;;;;;;EAiB/B"}
+{"version":3,"file":"identity-unset-binding.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-unset-binding.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,IAC9D,KAAK,iBAAiB;;;;;;;;EAiB/B"}

package/dist/src/tools/identity-unset-binding.js

@@ -16,6 +16,7 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runUnsetBinding } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityUnsetBindingTool(deps) {
     return (ctx) => ({
         name: "identity_unset_binding",
@@ -25,7 +26,7 @@ export function createIdentityUnsetBindingTool(deps) {
             provider: Type.String({ description: "Provider name (e.g. google)" }),
         }),
         execute: async (_toolCallId, params) => {
-            const sessionKey = ctx.sessionKey;
+            const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
             if (!sessionKey) {
                 return jsonResult({ ok: false, error: "No session context" });
             }

package/dist/src/tools/identity-whoami.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-whoami.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-whoami.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EA+B/B"}
+{"version":3,"file":"identity-whoami.d.ts","sourceRoot":"","sources":["../../../src/tools/identity-whoami.ts"],"names":[],"mappings":"AAgBA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,mBAAmB,IACxD,KAAK,iBAAiB;;;;;;EA+B/B"}

package/dist/src/tools/identity-whoami.js

@@ -16,9 +16,10 @@
 import { Type } from "@sinclair/typebox";
 import { jsonResult } from "openclaw/plugin-sdk";
 import { runStatus } from "../actions/identity-actions.js";
+import { resolveEffectiveSessionKey } from "../store/group-sender-store.js";
 export function createIdentityWhoamiTool(deps) {
     return (ctx) => {
-        const sessionKey = ctx.sessionKey;
+        const sessionKey = ctx.sessionKey ? resolveEffectiveSessionKey(ctx.sessionKey) : undefined;
         return {
             name: "identity_whoami",
             label: "Identity Whoami",

package/dist/src/utils/derive-session-key.d.ts

@@ -48,6 +48,13 @@ export declare function resolveAgentId(params: ResolveAgentIdParams): string;
  * Check if sessionKey is in subagent format (agent:X:subagent:uuid or nested).
  */
 export declare function isSubagentSessionKey(sessionKey: string | undefined | null): boolean;
+/**
+ * Check whether sessionKey represents a group/channel conversation.
+ * Examples:
+ * - agent:main:telegram:group:-1001
+ * - agent:main:slack:channel:C123456
+ */
+export declare function isGroupOrChannelSessionKey(sessionKey: string | undefined | null): boolean;
 export type ResolveWorkloadNameParams = {
     sessionKey?: string;
     agentId?: string;

package/dist/src/utils/derive-session-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derive-session-key.d.ts","sourceRoot":"","sources":["../../../src/utils/derive-session-key.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,yFAAyF;AACzF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE;YAAE,EAAE,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC3D,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAUF;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAE/D;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAM/F;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,qFAAqF;IACrF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CASnE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAKnF;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAiBvF;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAiC9E;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAaF,8DAA8D;AAC9D,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,yBAAyB,GAC7B,wBAAwB,GAAG,IAAI,CAmBjC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GACpC,wBAAwB,GAAG,IAAI,CAyDjC"}
+{"version":3,"file":"derive-session-key.d.ts","sourceRoot":"","sources":["../../../src/utils/derive-session-key.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AAEH,yFAAyF;AACzF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/B,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE;YAAE,EAAE,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC3D,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAUF;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAE/D;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAM/F;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,qFAAqF;IACrF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CASnE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAIzF;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAiBvF;AAsGD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,GAAG,IAAI,CAiC9E;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAaF,8DAA8D;AAC9D,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,yBAAyB,GAC7B,wBAAwB,GAAG,IAAI,CAmBjC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GACpC,wBAAwB,GAAG,IAAI,CAyDjC"}

package/dist/src/utils/derive-session-key.js

@@ -64,6 +64,18 @@ export function isSubagentSessionKey(sessionKey) {
         return true;
     return raw.includes(":subagent:");
 }
+/**
+ * Check whether sessionKey represents a group/channel conversation.
+ * Examples:
+ * - agent:main:telegram:group:-1001
+ * - agent:main:slack:channel:C123456
+ */
+export function isGroupOrChannelSessionKey(sessionKey) {
+    const raw = (sessionKey ?? "").trim().toLowerCase();
+    if (!raw)
+        return false;
+    return raw.includes(":group:") || raw.includes(":channel:");
+}
 /**
  * Resolve workload name for GetWorkloadAccessToken when roleTrn is not set.
  * For subagent keys (agent:X:subagent:uuid or nested): use last segment (uuid) as workload name.
@@ -92,24 +104,81 @@ function normalizeAccountId(value) {
     return trimmed || DEFAULT_ACCOUNT_ID;
 }
 /**
- * Extract peer/chat id from from/to for group sessions.
- * Channel-specific heuristics (e.g. telegram:group:123 or telegram:123 for group chat).
- */
+   * Extract group peer id from channel-specific "from/to" shapes.
+   * Return null for direct messages.
+   */
 function extractGroupPeerId(channel, from, to) {
-    const raw = (to ?? from ?? "").trim();
-    if (!raw)
+    const ch = (channel ?? "").trim().toLowerCase();
+    if (!ch)
         return null;
-    const lower = raw.toLowerCase();
-    const channelPrefix = `${channel}:`;
-    if (lower.startsWith(channelPrefix)) {
-        const rest = raw.slice(channelPrefix.length);
-        const parts = rest.split(":");
-        if (parts[0] === "group" && parts[1])
-            return parts[1];
-        if (parts.length >= 1)
-            return parts[0];
+    const fromRaw = (from ?? "").trim();
+    const toRaw = (to ?? "").trim();
+    const pickByPrefix = (value, prefix) => {
+        if (!value)
+            return null;
+        if (!value.toLowerCase().startsWith(prefix.toLowerCase()))
+            return null;
+        const id = value.slice(prefix.length).trim();
+        return id || null;
+    };
+    const pickFirst = (...values) => {
+        for (const v of values) {
+            if (v)
+                return v;
+        }
+        return null;
+    };
+    switch (ch) {
+        case "feishu":
+            // Group: to="chat:oc_xxx"; DM: to="user:ou_xxx"
+            return pickByPrefix(toRaw, "chat:");
+        case "telegram": {
+            // Group/topic: telegram:group:<chatId>[:topic:<threadId>]
+            const g1 = pickByPrefix(fromRaw, "telegram:group:");
+            if (g1)
+                return g1;
+            const g2 = pickByPrefix(toRaw, "telegram:group:");
+            if (g2)
+                return g2;
+            // Legacy fallback: telegram:-100... is usually group/supergroup
+            const f = pickByPrefix(fromRaw, "telegram:");
+            if (f && f.startsWith("-"))
+                return f;
+            const t = pickByPrefix(toRaw, "telegram:");
+            if (t && t.startsWith("-"))
+                return t;
+            return null;
+        }
+        case "slack":
+            // Group/channel: slack:channel:<id> / slack:group:<id>, to=channel:<id>
+            return pickFirst(pickByPrefix(fromRaw, "slack:channel:"), pickByPrefix(fromRaw, "slack:group:"), pickByPrefix(toRaw, "channel:"));
+        case "discord":
+            // Guild/thread channel: discord:channel:<id>, to=channel:<id>; DM uses user:<id>
+            return pickFirst(pickByPrefix(fromRaw, "discord:channel:"), pickByPrefix(toRaw, "channel:"));
+        case "signal":
+            // Group: group:<id>; DM: signal:<recipient>
+            return pickFirst(pickByPrefix(fromRaw, "group:"), pickByPrefix(toRaw, "group:"));
+        case "imessage":
+            // Group: imessage:group:<id>, to=chat_id:<id>; DM: imessage:<sender>
+            return pickFirst(pickByPrefix(fromRaw, "imessage:group:"), pickByPrefix(toRaw, "chat_id:"));
+        case "whatsapp":
+            // Group JID ends with @g.us; DM is E.164-like
+            if (/@g\.us$/i.test(fromRaw))
+                return fromRaw;
+            return null;
+        case "line":
+            // Group/room: line:group:<id> / line:room:<id>
+            return pickFirst(pickByPrefix(fromRaw, "line:group:"), pickByPrefix(fromRaw, "line:room:"), pickByPrefix(toRaw, "line:group:"), pickByPrefix(toRaw, "line:room:"));
+        case "matrix":
+            // Group/channel: matrix:channel:<roomId>; DM: matrix:<userId>
+            return pickByPrefix(fromRaw, "matrix:channel:");
+        case "msteams":
+            // Group/channel: msteams:channel:<id> / msteams:group:<id>, to=conversation:<id>
+            return pickFirst(pickByPrefix(fromRaw, "msteams:channel:"), pickByPrefix(fromRaw, "msteams:group:"), pickByPrefix(toRaw, "conversation:"));
+        default:
+            // Safe generic fallback: only explicit group/channel markers.
+            return pickFirst(pickByPrefix(fromRaw, `${ch}:group:`), pickByPrefix(fromRaw, `${ch}:channel:`), pickByPrefix(toRaw, `${ch}:group:`), pickByPrefix(toRaw, `${ch}:channel:`));
     }
-    return null;
 }
 /**
  * Derive sessionKey from command context.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m1a0rz/agent-identity",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "description": "Agent Identity: UserPool (用户池) login, TIP token (工作负载令牌), credential hosting (凭据托管 OAuth2/API key), optional tool/skill permission control (CheckPermission) and risk approval. Integrates with Volcengine 智能体身份和权限管理平台.",
   "type": "module",
   "main": "dist/index.js",