@devries-cameron20 / composio Mirror · read-only / commits / afa118c8f
Fork 0

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

Mirrored from https://github.com/Camo67/composio.git

Synced Nov 21, 21:00 UTC

fix(cli): make permission allows expire after one hour (#3449)

## Summary - Rename the permission prompt action from “Allow for session” to “Allow for 1 hr” in browser and native UI flows. - Cache allow decisions with a 1-hour expiry in `tool-permissions-cache.json`, with an in-memory fast path and stale-entry pruning. - Preserve existing permission snapshot cache behavior while keeping cached allow decisions across CLI invocations until expiry. ## Tests - `pnpm install --frozen-lockfile --ignore-scripts` - `pnpm build:packages` - `cd ts/packages/cli && pnpm run typecheck` ## Notes - The decision enum remains `allow_session` for compatibility with existing backend/native callback payloads; only the UX/caching semantics now expose and enforce a 1-hour duration.

Rahul Tarak committed May 19, 2026 at 00:19 UTC afa118c8fb61f8f0aa9a7f86d8be9621a8ee6893
6 files changed +233 -52
ts/packages/cli-local-tools/native/composio-native-ui/Sources/ComposioNativeUI/main.swift
+12 -5
@@ -11,7 +11,7 @@ struct Configuration {
11 var title: String? = nil // overrides the auto-built title
12 var subtitle: String? = nil // overrides the auto-built subtitle
13 var denyLabel: String = "Deny"
14 - var allowSessionLabel: String = "Allow for session"
14 + var allowSessionLabel: String = "Allow for 1 hr"
15 var allowOnceLabel: String = "Allow once"
16
17 // Window:
@@ -36,7 +36,7 @@ struct Configuration {
36
37 var resolvedSubtitle: String {
38 if let subtitle, !subtitle.isEmpty { return subtitle }
39 - return "Approve once, for the rest of this session, or deny."
39 + return "Approve once, for 1 hour, or deny."
40 }
41
42 init(arguments: [String]) {
@@ -281,6 +281,13 @@ struct Agent {
281 let svg: String
282
283 func makeImage() -> NSImage? {
284 + if svg.hasPrefix("data:image/png;base64,") {
285 + let encoded = String(svg.dropFirst("data:image/png;base64,".count))
286 + guard let data = Data(base64Encoded: encoded),
287 + let image = NSImage(data: data) else { return nil }
288 + return image
289 + }
290 +
291 guard let data = svg.data(using: .utf8),
292 let image = NSImage(data: data) else { return nil }
293 return image
@@ -306,10 +313,10 @@ enum Agents {
313 <svg preserveAspectRatio="xMidYMid" viewBox="0 0 256 257" xmlns="http://www.w3.org/2000/svg"><path fill="#D97757" d="m50.228 170.321 50.357-28.257.843-2.463-.843-1.361h-2.462l-8.426-.518-28.775-.778-24.952-1.037-24.175-1.296-6.092-1.297L0 125.796l.583-3.759 5.12-3.434 7.324.648 16.202 1.101 24.304 1.685 17.629 1.037 26.118 2.722h4.148l.583-1.685-1.426-1.037-1.101-1.037-25.147-17.045-27.22-18.017-14.258-10.37-7.713-5.25-3.888-4.925-1.685-10.758 7-7.713 9.397.649 2.398.648 9.527 7.323 20.35 15.75L94.817 91.9l3.889 3.24 1.555-1.102.195-.777-1.75-2.917-14.453-26.118-15.425-26.572-6.87-11.018-1.814-6.61c-.648-2.723-1.102-4.991-1.102-7.778l7.972-10.823L71.42 0 82.05 1.426l4.472 3.888 6.61 15.101 10.694 23.786 16.591 32.34 4.861 9.592 2.592 8.879.973 2.722h1.685v-1.556l1.36-18.211 2.528-22.36 2.463-28.776.843-8.1 4.018-9.722 7.971-5.25 6.222 2.981 5.12 7.324-.713 4.73-3.046 19.768-5.962 30.98-3.889 20.739h2.268l2.593-2.593 10.499-13.934 17.628-22.036 7.778-8.749 9.073-9.657 5.833-4.601h11.018l8.1 12.055-3.628 12.443-11.342 14.388-9.398 12.184-13.48 18.147-8.426 14.518.778 1.166 2.01-.194 30.46-6.481 16.462-2.982 19.637-3.37 8.88 4.148.971 4.213-3.5 8.62-20.998 5.184-24.628 4.926-36.682 8.685-.454.324.519.648 16.526 1.555 7.065.389h17.304l32.21 2.398 8.426 5.574 5.055 6.805-.843 5.184-12.962 6.611-17.498-4.148-40.83-9.721-14-3.5h-1.944v1.167l11.666 11.406 21.387 19.314 26.767 24.887 1.36 6.157-3.434 4.86-3.63-.518-23.526-17.693-9.073-7.972-20.545-17.304h-1.36v1.814l4.73 6.935 25.017 37.59 1.296 11.536-1.814 3.76-6.481 2.268-7.13-1.297-14.647-20.544-15.1-23.138-12.185-20.739-1.49.843-7.194 77.448-3.37 3.953-7.778 2.981-6.48-4.925-3.436-7.972 3.435-15.749 4.148-20.544 3.37-16.333 3.046-20.285 1.815-6.74-.13-.454-1.49.194-15.295 20.999-23.267 31.433-18.406 19.702-4.407 1.75-7.648-3.954.713-7.064 4.277-6.286 25.47-32.405 15.36-20.092 9.917-11.6-.065-1.686h-.583L44.07 198.125l-12.055 1.555-5.185-4.86.648-7.972 2.463-2.593 20.35-13.999-.064.065Z"/></svg>
314 """#
315
309 - // Codex glyph — original artwork is white-on-dark; we recolor to near-black
310 - // so it reads on the light card without a containing dark plate.
316 + // Codex icon from the dashboard asset, with the white app-tile background removed
317 + // so it renders cleanly on the native permission card.
318 static let codexSVG = #"""
312 - <svg fill="#0A0A0A" fill-rule="evenodd" style="flex:none;line-height:1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="M8.086.457a6.105 6.105 0 013.046-.415c1.333.153 2.521.72 3.564 1.7a.117.117 0 00.107.029c1.408-.346 2.762-.224 4.061.366l.063.03.154.076c1.357.703 2.33 1.77 2.918 3.198.278.679.418 1.388.421 2.126a5.655 5.655 0 01-.18 1.631.167.167 0 00.04.155 5.982 5.982 0 011.578 2.891c.385 1.901-.01 3.615-1.183 5.14l-.182.22a6.063 6.063 0 01-2.934 1.851.162.162 0 00-.108.102c-.255.736-.511 1.364-.987 1.992-1.199 1.582-2.962 2.462-4.948 2.451-1.583-.008-2.986-.587-4.21-1.736a.145.145 0 00-.14-.032c-.518.167-1.04.191-1.604.185a5.924 5.924 0 01-2.595-.622 6.058 6.058 0 01-2.146-1.781c-.203-.269-.404-.522-.551-.821a7.74 7.74 0 01-.495-1.283 6.11 6.11 0 01-.017-3.064.166.166 0 00.008-.074.115.115 0 00-.037-.064 5.958 5.958 0 01-1.38-2.202 5.196 5.196 0 01-.333-1.589 6.915 6.915 0 01.188-2.132c.45-1.484 1.309-2.648 2.577-3.493.282-.188.55-.334.802-.438.286-.12.573-.22.861-.304a.129.129 0 00.087-.087A6.016 6.016 0 015.635 2.31C6.315 1.464 7.132.846 8.086.457zm-.804 7.85a.848.848 0 00-1.473.842l1.694 2.965-1.688 2.848a.849.849 0 001.46.864l1.94-3.272a.849.849 0 00.007-.854l-1.94-3.393zm5.446 6.24a.849.849 0 000 1.695h4.848a.849.849 0 000-1.696h-4.848z"/></svg>
319 + <svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M9.064 3.344a4.578 4.578 0 012.285-.312c1 .115 1.891.54 2.673 1.275.01.01.024.017.037.021a.09.09 0 00.043 0 4.55 4.55 0 013.046.275l.047.022.116.057a4.581 4.581 0 012.188 2.399c.209.51.313 1.041.315 1.595a4.24 4.24 0 01-.134 1.223.123.123 0 00.03.115c.594.607.988 1.33 1.183 2.17.289 1.425-.007 2.71-.887 3.854l-.136.166a4.548 4.548 0 01-2.201 1.388.123.123 0 00-.081.076c-.191.551-.383 1.023-.74 1.494-.9 1.187-2.222 1.846-3.711 1.838-1.187-.006-2.239-.44-3.157-1.302a.107.107 0 00-.105-.024c-.388.125-.78.143-1.204.138a4.441 4.441 0 01-1.945-.466 4.544 4.544 0 01-1.61-1.335c-.152-.202-.303-.392-.414-.617a5.81 5.81 0 01-.37-.961 4.582 4.582 0 01-.014-2.298.124.124 0 00.006-.056.085.085 0 00-.027-.048 4.467 4.467 0 01-1.034-1.651 3.896 3.896 0 01-.251-1.192 5.189 5.189 0 01.141-1.6c.337-1.112.982-1.985 1.933-2.618.212-.141.413-.251.601-.33.215-.089.43-.164.646-.227a.098.098 0 00.065-.066 4.51 4.51 0 01.829-1.615 4.535 4.535 0 011.837-1.388zm3.482 10.565a.637.637 0 000 1.272h3.636a.637.637 0 100-1.272h-3.636zM8.462 9.23a.637.637 0 00-1.106.631l1.272 2.224-1.266 2.136a.636.636 0 101.095.649l1.454-2.455a.636.636 0 00.005-.64L8.462 9.23z" fill="url(#lobe-icons-codex-_R_0_)"></path><defs><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-codex-_R_0_" x1="12" x2="12" y1="3" y2="21"><stop stop-color="#B1A7FF"></stop><stop offset=".5" stop-color="#7A9DFF"></stop><stop offset="1" stop-color="#3941FF"></stop></linearGradient></defs></svg>
320 """#
321
322 static let openclawSVG = #"""
ts/packages/cli/src/commands/tools/commands/tools.execute.cmd.ts
+30 -9
@@ -299,6 +299,32 @@ type StoredExecuteOutputSummary = {
299 const serializeExecuteOutput = (result: unknown): string =>
300 JSON.stringify(result, ciRedactReplacer, 2);
301
302 +const permissionApprovalLabel = (approval?: string): string | undefined => {
303 + switch (approval) {
304 + case 'always_approved':
305 + return 'always approved';
306 + case 'cached_approved':
307 + return 'cached approved';
308 + case 'approved_once':
309 + return 'approved once';
310 + case 'approved_for_session':
311 + return 'approved for session';
312 + default:
313 + return undefined;
314 + }
315 +};
316 +
317 +const executionSuccessSuffix = (result: {
318 + readonly logId?: string;
319 + readonly permissionApproval?: string;
320 +}) => {
321 + const metadata = [
322 + permissionApprovalLabel(result.permissionApproval),
323 + result.logId ? `logId: ${redact({ value: result.logId, prefix: 'log_' })}` : undefined,
324 + ].filter((value): value is string => Boolean(value));
325 + return metadata.length > 0 ? ` (${metadata.join(', ')})` : '';
326 +};
327 +
328 const persistLargeExecuteOutput = (toolSlug: string, json: string, sharedDirectory?: string) =>
329 Effect.gen(function* () {
330 const outputFilePath = yield* storeCliSessionArtifact({
@@ -1426,10 +1452,7 @@ const runExecuteWithSpinner = (params: {
1452 return yield* Effect.fail(new ToolExecutionError(summary.error));
1453 }
1454
1429 - const logId = result.logId
1430 - ? ` (logId: ${redact({ value: result.logId, prefix: 'log_' })})`
1431 - : '';
1432 - yield* spinner.stop(`Execution successful${logId}`);
1455 + yield* spinner.stop(`Execution successful${executionSuccessSuffix(result)}`);
1456 const inBandWarning = detectInBandWarning(result.data);
1457 if (inBandWarning) {
1458 yield* params.ui.log.warn(
@@ -2004,11 +2027,9 @@ const runParallelToolsExecuteFromParsed = (params: ParsedParallelExecuteArgs) =>
2027 continue;
2028 }
2029
2007 - const logId =
2008 - 'logId' in result && typeof result.logId === 'string' && result.logId.length > 0
2009 - ? ` (logId: ${redact({ value: result.logId, prefix: 'log_' })})`
2010 - : '';
2011 - yield* ui.log.step(`[${result.slug}] Execution successful${logId}`);
2030 + yield* ui.log.step(
2031 + `[${result.slug}] Execution successful${executionSuccessSuffix(result)}`
2032 + );
2033 if ('data' in result) {
2034 yield* ui.note(serializeExecuteOutput(result), `Response: ${result.slug}`);
2035 }
ts/packages/cli/src/services/native-ui-sidecar.ts
+3 -1
@@ -147,7 +147,9 @@ export const requestNativeUiPermissionDecision = async (params: {
147 '--caller-agent',
148 detectNativeUiCallerAgent(),
149 '--subtitle',
150 - 'Composio CLI is requesting permission to execute this tool.',
150 + 'Approve once, allow for 1 hour, or deny.',
151 + '--allow-session-label',
152 + 'Allow for 1 hr',
153 '--callback-file',
154 callbackFile,
155 '--timeout',
ts/packages/cli/src/services/tool-permissions.ts
+142 -33
@@ -20,12 +20,22 @@ const isEnhancedControlsPlatformSupported = (): boolean =>
20 export const ENHANCED_LINK_URL_OVERWRITE = 'https://connect.composio.dev/enhanced';
21
22 const CACHE_FILE_NAME = 'tool-permissions-cache.json';
23 -const CACHE_TTL_MS = 5 * 60 * 1000;
23 +const PERMISSION_SNAPSHOT_CACHE_TTL_MS = 5 * 60 * 1000;
24 +const ALLOW_FOR_DURATION_LABEL = '1 hr';
25 +const ALLOW_FOR_DURATION_MS = 60 * 60 * 1000;
26 const NO_CONNECTED_ACCOUNT = '__none__';
27
28 export type PermissionDefaultMode = 'allow_all' | 'ask_every_call' | 'ask_once_per_session';
29 export type PermissionOverrideState = 'always_allow' | 'always_deny' | 'ask_once' | 'ask_always';
30 export type PermissionDecision = 'allow_once' | 'allow_session' | 'deny';
31 +export type PermissionApprovalStatus =
32 + | 'always_approved'
33 + | 'cached_approved'
34 + | 'approved_once'
35 + | 'approved_for_session';
36 +export type PermissionGateResult =
37 + | { readonly approvalStatus: PermissionApprovalStatus }
38 + | undefined;
39
40 export interface ToolRouterPermissionsConfig {
41 readonly default: PermissionDefaultMode;
@@ -42,8 +52,13 @@ export interface ConsumerPermissionSnapshot {
52 readonly fetchedAt: number;
53 }
54
55 +interface CachedAllowDecision {
56 + readonly expiresAt: number;
57 +}
58 +
59 interface CacheFile {
60 readonly entries: Readonly<Record<string, ConsumerPermissionSnapshot>>;
61 + readonly allowEntries?: Readonly<Record<string, CachedAllowDecision>>;
62 }
63
64 interface PermissionResolveResponse {
@@ -64,7 +79,7 @@ interface GateParams {
79 readonly snapshot?: ConsumerPermissionSnapshot;
80 }
81
67 -const sessionAllowCache = new Set<string>();
82 +const allowDecisionMemoryCache = new Map<string, number>();
83
84 const cachePath = () => path.join(resolveCliConfigDirectorySync(), CACHE_FILE_NAME);
85 const cacheKey = (params: { orgId: string; projectId: string; consumerUserId: string }) =>
@@ -75,35 +90,80 @@ const uniq = (values: ReadonlyArray<string | undefined>) => [
90 ...new Set(values.filter((value): value is string => Boolean(value))),
91 ];
92
93 +const pruneAllowEntries = (
94 + entries: Readonly<Record<string, CachedAllowDecision>> | undefined,
95 + now = Date.now()
96 +): Record<string, CachedAllowDecision> => {
97 + const freshEntries: Record<string, CachedAllowDecision> = {};
98 + for (const [key, entry] of Object.entries(entries ?? {})) {
99 + if (typeof entry.expiresAt === 'number' && entry.expiresAt > now) {
100 + freshEntries[key] = entry;
101 + }
102 + }
103 + return freshEntries;
104 +};
105 +
106 const readCacheFile = async (): Promise<CacheFile> => {
107 try {
108 const raw = await fs.readFile(cachePath(), 'utf8');
109 const parsed = JSON.parse(raw) as CacheFile;
82 - return parsed && typeof parsed === 'object' && parsed.entries ? parsed : { entries: {} };
110 + return parsed && typeof parsed === 'object' && parsed.entries
111 + ? { entries: parsed.entries, allowEntries: pruneAllowEntries(parsed.allowEntries) }
112 + : { entries: {} };
113 } catch {
114 return { entries: {} };
115 }
116 };
117
88 -const writeCacheEntry = async (entry: ConsumerPermissionSnapshot): Promise<void> => {
89 - await fs.mkdir(path.dirname(cachePath()), { recursive: true });
90 - const current = await readCacheFile();
91 - await fs.writeFile(
92 - cachePath(),
93 - `${JSON.stringify(
94 - {
95 - entries: {
96 - ...current.entries,
97 - [cacheKey(entry)]: entry,
98 - },
99 - } satisfies CacheFile,
100 - null,
101 - 2
102 - )}\n`,
103 - 'utf8'
104 - );
118 +const writeCacheFile = async (cache: CacheFile): Promise<void> => {
119 + const targetPath = cachePath();
120 + await fs.mkdir(path.dirname(targetPath), { recursive: true });
121 +
122 + const tempPath = `${targetPath}.${process.pid}.${Date.now()}.${crypto.randomUUID()}.tmp`;
123 + try {
124 + await fs.writeFile(
125 + tempPath,
126 + `${JSON.stringify(
127 + {
128 + entries: cache.entries,
129 + allowEntries: pruneAllowEntries(cache.allowEntries),
130 + } satisfies CacheFile,
131 + null,
132 + 2
133 + )}\n`,
134 + 'utf8'
135 + );
136 + await fs.rename(tempPath, targetPath);
137 + } catch (error) {
138 + await fs.rm(tempPath, { force: true }).catch(() => undefined);
139 + throw error;
140 + }
141 };
142
143 +let cacheWriteQueue: Promise<void> = Promise.resolve();
144 +
145 +const updateCacheFile = async (
146 + update: (current: CacheFile) => CacheFile | Promise<CacheFile>
147 +): Promise<void> => {
148 + const previous = cacheWriteQueue.catch(() => undefined);
149 + const next = previous.then(async () => {
150 + const current = await readCacheFile();
151 + await writeCacheFile(await update(current));
152 + });
153 +
154 + cacheWriteQueue = next.catch(() => undefined);
155 + await next;
156 +};
157 +
158 +const writeCacheEntry = async (entry: ConsumerPermissionSnapshot): Promise<void> =>
159 + updateCacheFile(current => ({
160 + entries: {
161 + ...current.entries,
162 + [cacheKey(entry)]: entry,
163 + },
164 + allowEntries: current.allowEntries,
165 + }));
166 +
167 const readCachedEntry = async (params: {
168 orgId: string;
169 projectId: string;
@@ -118,7 +178,7 @@ const isFreshForAccounts = (
178 connectedAccountIds: ReadonlyArray<string>
179 ): entry is ConsumerPermissionSnapshot => {
180 if (!entry) return false;
121 - if (Date.now() - entry.fetchedAt > CACHE_TTL_MS) return false;
181 + if (Date.now() - entry.fetchedAt > PERMISSION_SNAPSHOT_CACHE_TTL_MS) return false;
182 const cachedIds = new Set(entry.connectedAccountIds);
183 return connectedAccountIds.every(id => cachedIds.has(id));
184 };
@@ -269,9 +329,43 @@ const resolvePermissionState = (
329 return override ?? permissions?.default ?? 'allow_all';
330 };
331
272 -const sessionCacheKey = (params: GateParams) =>
332 +const allowCacheKey = (params: GateParams) =>
333 `${params.snapshot?.orgId ?? 'unknown'}:${params.snapshot?.projectId ?? 'unknown'}:${params.snapshot?.consumerUserId ?? 'unknown'}:${permissionField(params.toolSlug, params.connectedAccountId)}`;
334
335 +const isAllowCachedInMemory = (cacheKey: string, now = Date.now()): boolean => {
336 + const expiresAt = allowDecisionMemoryCache.get(cacheKey);
337 + if (expiresAt === undefined) return false;
338 + if (expiresAt <= now) {
339 + allowDecisionMemoryCache.delete(cacheKey);
340 + return false;
341 + }
342 + return true;
343 +};
344 +
345 +const isAllowCached = async (cacheKey: string, now = Date.now()): Promise<boolean> => {
346 + if (isAllowCachedInMemory(cacheKey, now)) return true;
347 +
348 + const cache = await readCacheFile();
349 + const expiresAt = cache.allowEntries?.[cacheKey]?.expiresAt;
350 + if (expiresAt === undefined || expiresAt <= now) return false;
351 +
352 + allowDecisionMemoryCache.set(cacheKey, expiresAt);
353 + return true;
354 +};
355 +
356 +const cacheAllowDecision = async (cacheKey: string, now = Date.now()): Promise<void> => {
357 + const expiresAt = now + ALLOW_FOR_DURATION_MS;
358 + allowDecisionMemoryCache.set(cacheKey, expiresAt);
359 +
360 + await updateCacheFile(current => ({
361 + entries: current.entries,
362 + allowEntries: {
363 + ...current.allowEntries,
364 + [cacheKey]: { expiresAt },
365 + },
366 + }));
367 +};
368 +
369 const escapeHtml = (value: string): string =>
370 value.replace(/[&<>"']/g, char => {
371 switch (char) {
@@ -294,7 +388,7 @@ const escapeHtml = (value: string): string =>
388 const AGENT_SVGS: Readonly<Record<NativeUiCallerAgent, string>> = {
389 composio: `<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_2367_5)"><path d="M91.7032 28.1801L35.3611 16.6572C31.6669 15.8988 28.1929 18.7367 28.1929 22.5043V49.1954V50.6144V77.3052C28.1929 81.0729 31.6669 83.9112 35.3611 83.1526L91.7032 71.6296" stroke="black" stroke-width="2.8556" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/><path d="M48.1992 7.38531C48.1993 2.09223 53.6097 -1.44765 58.4546 0.57874L58.6851 0.679333L58.6902 0.68227L88.8308 14.6023C91.4759 15.7947 93.1338 18.4366 93.1346 21.3053V33.0975C93.1346 37.3994 89.4707 40.797 85.1902 40.4658L51.0547 37.918V61.8914L85.185 59.3435L85.585 59.323C89.6842 59.2231 93.1331 62.5334 93.109 66.6876V78.4797C93.109 81.3707 91.4075 83.9737 88.8105 85.1812L88.806 85.1827L58.691 99.0774L58.6917 99.0782C53.7808 101.351 48.1992 97.7714 48.1992 92.3759V81.1383C47.9779 81.2256 47.741 81.2834 47.4921 81.3015L30.8347 82.5007C29.4429 82.6007 28.2584 81.4977 28.2582 80.1023V67.7354C28.2583 67.256 28.4014 66.8063 28.6474 66.4277L14.9439 67.4513H14.9388C10.6701 67.7539 7.00001 64.3671 7 60.0823V39.7271C7.00031 35.4239 10.6671 32.0248 14.9491 32.3589H14.9483L28.3486 33.3589C28.2905 33.152 28.2583 32.9345 28.2582 32.7099V19.6826C28.2582 17.7807 29.9597 16.3299 31.8377 16.6304L47.6992 19.168C47.8735 19.1959 48.0404 19.2435 48.1992 19.3059V7.38531ZM85.4075 62.191H85.4023L51.0547 64.755V79.6601L90.2541 71.4669V66.6774L90.2496 66.435C90.1323 63.9438 87.9489 61.9928 85.4075 62.191ZM27.7075 36.1748C27.9471 36.5495 28.0863 36.9936 28.0864 37.4678V62.7813C28.0864 63.0748 28.0314 63.3559 27.9344 63.6169L48.1992 62.1044V37.7043L27.7075 36.1748ZM51.0547 35.0544L85.4023 37.6183L85.4075 37.6191L85.6511 37.6316C88.1632 37.6928 90.279 35.6595 90.279 33.0975V28.1405L51.0547 19.9411V35.0544Z" fill="black"/></g><defs><clipPath id="clip0_2367_5"><rect width="86.4662" height="100" fill="white" transform="translate(7)"/></clipPath></defs></svg>`,
390 claude: `<svg preserveAspectRatio="xMidYMid" viewBox="0 0 256 257" xmlns="http://www.w3.org/2000/svg"><path fill="#D97757" d="m50.228 170.321 50.357-28.257.843-2.463-.843-1.361h-2.462l-8.426-.518-28.775-.778-24.952-1.037-24.175-1.296-6.092-1.297L0 125.796l.583-3.759 5.12-3.434 7.324.648 16.202 1.101 24.304 1.685 17.629 1.037 26.118 2.722h4.148l.583-1.685-1.426-1.037-1.101-1.037-25.147-17.045-27.22-18.017-14.258-10.37-7.713-5.25-3.888-4.925-1.685-10.758 7-7.713 9.397.649 2.398.648 9.527 7.323 20.35 15.75L94.817 91.9l3.889 3.24 1.555-1.102.195-.777-1.75-2.917-14.453-26.118-15.425-26.572-6.87-11.018-1.814-6.61c-.648-2.723-1.102-4.991-1.102-7.778l7.972-10.823L71.42 0 82.05 1.426l4.472 3.888 6.61 15.101 10.694 23.786 16.591 32.34 4.861 9.592 2.592 8.879.973 2.722h1.685v-1.556l1.36-18.211 2.528-22.36 2.463-28.776.843-8.1 4.018-9.722 7.971-5.25 6.222 2.981 5.12 7.324-.713 4.73-3.046 19.768-5.962 30.98-3.889 20.739h2.268l2.593-2.593 10.499-13.934 17.628-22.036 7.778-8.749 9.073-9.657 5.833-4.601h11.018l8.1 12.055-3.628 12.443-11.342 14.388-9.398 12.184-13.48 18.147-8.426 14.518.778 1.166 2.01-.194 30.46-6.481 16.462-2.982 19.637-3.37 8.88 4.148.971 4.213-3.5 8.62-20.998 5.184-24.628 4.926-36.682 8.685-.454.324.519.648 16.526 1.555 7.065.389h17.304l32.21 2.398 8.426 5.574 5.055 6.805-.843 5.184-12.962 6.611-17.498-4.148-40.83-9.721-14-3.5h-1.944v1.167l11.666 11.406 21.387 19.314 26.767 24.887 1.36 6.157-3.434 4.86-3.63-.518-23.526-17.693-9.073-7.972-20.545-17.304h-1.36v1.814l4.73 6.935 25.017 37.59 1.296 11.536-1.814 3.76-6.481 2.268-7.13-1.297-14.647-20.544-15.1-23.138-12.185-20.739-1.49.843-7.194 77.448-3.37 3.953-7.778 2.981-6.48-4.925-3.436-7.972 3.435-15.749 4.148-20.544 3.37-16.333 3.046-20.285 1.815-6.74-.13-.454-1.49.194-15.295 20.999-23.267 31.433-18.406 19.702-4.407 1.75-7.648-3.954.713-7.064 4.277-6.286 25.47-32.405 15.36-20.092 9.917-11.6-.065-1.686h-.583L44.07 198.125l-12.055 1.555-5.185-4.86.648-7.972 2.463-2.593 20.35-13.999-.064.065Z"/></svg>`,
297 - codex: `<svg fill="#0A0A0A" fill-rule="evenodd" style="flex:none;line-height:1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="M8.086.457a6.105 6.105 0 013.046-.415c1.333.153 2.521.72 3.564 1.7a.117.117 0 00.107.029c1.408-.346 2.762-.224 4.061.366l.063.03.154.076c1.357.703 2.33 1.77 2.918 3.198.278.679.418 1.388.421 2.126a5.655 5.655 0 01-.18 1.631.167.167 0 00.04.155 5.982 5.982 0 011.578 2.891c.385 1.901-.01 3.615-1.183 5.14l-.182.22a6.063 6.063 0 01-2.934 1.851.162.162 0 00-.108.102c-.255.736-.511 1.364-.987 1.992-1.199 1.582-2.962 2.462-4.948 2.451-1.583-.008-2.986-.587-4.21-1.736a.145.145 0 00-.14-.032c-.518.167-1.04.191-1.604.185a5.924 5.924 0 01-2.595-.622 6.058 6.058 0 01-2.146-1.781c-.203-.269-.404-.522-.551-.821a7.74 7.74 0 01-.495-1.283 6.11 6.11 0 01-.017-3.064.166.166 0 00.008-.074.115.115 0 00-.037-.064 5.958 5.958 0 01-1.38-2.202 5.196 5.196 0 01-.333-1.589 6.915 6.915 0 01.188-2.132c.45-1.484 1.309-2.648 2.577-3.493.282-.188.55-.334.802-.438.286-.12.573-.22.861-.304a.129.129 0 00.087-.087A6.016 6.016 0 015.635 2.31C6.315 1.464 7.132.846 8.086.457zm-.804 7.85a.848.848 0 00-1.473.842l1.694 2.965-1.688 2.848a.849.849 0 001.46.864l1.94-3.272a.849.849 0 00.007-.854l-1.94-3.393zm5.446 6.24a.849.849 0 000 1.695h4.848a.849.849 0 000-1.696h-4.848z"/></svg>`,
391 + codex: `<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M9.064 3.344a4.578 4.578 0 012.285-.312c1 .115 1.891.54 2.673 1.275.01.01.024.017.037.021a.09.09 0 00.043 0 4.55 4.55 0 013.046.275l.047.022.116.057a4.581 4.581 0 012.188 2.399c.209.51.313 1.041.315 1.595a4.24 4.24 0 01-.134 1.223.123.123 0 00.03.115c.594.607.988 1.33 1.183 2.17.289 1.425-.007 2.71-.887 3.854l-.136.166a4.548 4.548 0 01-2.201 1.388.123.123 0 00-.081.076c-.191.551-.383 1.023-.74 1.494-.9 1.187-2.222 1.846-3.711 1.838-1.187-.006-2.239-.44-3.157-1.302a.107.107 0 00-.105-.024c-.388.125-.78.143-1.204.138a4.441 4.441 0 01-1.945-.466 4.544 4.544 0 01-1.61-1.335c-.152-.202-.303-.392-.414-.617a5.81 5.81 0 01-.37-.961 4.582 4.582 0 01-.014-2.298.124.124 0 00.006-.056.085.085 0 00-.027-.048 4.467 4.467 0 01-1.034-1.651 3.896 3.896 0 01-.251-1.192 5.189 5.189 0 01.141-1.6c.337-1.112.982-1.985 1.933-2.618.212-.141.413-.251.601-.33.215-.089.43-.164.646-.227a.098.098 0 00.065-.066 4.51 4.51 0 01.829-1.615 4.535 4.535 0 011.837-1.388zm3.482 10.565a.637.637 0 000 1.272h3.636a.637.637 0 100-1.272h-3.636zM8.462 9.23a.637.637 0 00-1.106.631l1.272 2.224-1.266 2.136a.636.636 0 101.095.649l1.454-2.455a.636.636 0 00.005-.64L8.462 9.23z" fill="url(#lobe-icons-codex-_R_0_)"></path><defs><linearGradient gradientUnits="userSpaceOnUse" id="lobe-icons-codex-_R_0_" x1="12" x2="12" y1="3" y2="21"><stop stop-color="#B1A7FF"></stop><stop offset=".5" stop-color="#7A9DFF"></stop><stop offset="1" stop-color="#3941FF"></stop></linearGradient></defs></svg>`,
392 openclaw: `<svg viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="openclaw__lobster-gradient" x1="0%" y1="0%" x2="100%" y2="100%"><stop offset="0%" stop-color="#ff4d4d"/><stop offset="100%" stop-color="#991b1b"/></linearGradient></defs><path d="M60 10 C30 10 15 35 15 55 C15 75 30 95 45 100 L45 110 L55 110 L55 100 C55 100 60 102 65 100 L65 110 L75 110 L75 100 C90 95 105 75 105 55 C105 35 90 10 60 10Z" fill="url(#openclaw__lobster-gradient)"/><path d="M20 45 C5 40 0 50 5 60 C10 70 20 65 25 55 C28 48 25 45 20 45Z" fill="url(#openclaw__lobster-gradient)"/><path d="M100 45 C115 40 120 50 115 60 C110 70 100 65 95 55 C92 48 95 45 100 45Z" fill="url(#openclaw__lobster-gradient)"/><path d="M45 15 Q35 5 30 8" stroke="#ff4d4d" stroke-width="3" stroke-linecap="round"/><path d="M75 15 Q85 5 90 8" stroke="#ff4d4d" stroke-width="3" stroke-linecap="round"/><circle cx="45" cy="35" r="6" fill="#050810"/><circle cx="75" cy="35" r="6" fill="#050810"/><circle cx="46" cy="34" r="2.5" fill="#00e5cc"/><circle cx="76" cy="34" r="2.5" fill="#00e5cc"/></svg>`,
393 };
394
@@ -464,7 +558,7 @@ const approvalHtml = (params: {
558 align-items: center;
559 justify-content: center;
560 }
467 - .agent-mark svg { width: 100%; height: 100%; }
561 + .agent-mark svg, .agent-mark img { width: 100%; height: 100%; display: block; }
562 .agent-name { font-weight: 600; }
563 .title code, .account code {
564 font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
@@ -547,7 +641,7 @@ const approvalHtml = (params: {
641 <span class="logo" aria-hidden="true">${AGENT_SVGS.composio}</span>
642 <div class="actions">
643 <a class="btn" href="/deny?token=${token}">Deny</a>
550 - <a class="btn" href="/allow-session?token=${token}">Allow for session</a>
644 + <a class="btn" href="/allow-session?token=${token}">Allow for ${ALLOW_FOR_DURATION_LABEL}</a>
645 <a class="btn primary" href="/allow-once?token=${token}">Allow once</a>
646 </div>
647 </div>
@@ -565,8 +659,8 @@ const COMPLETION_COPY: Readonly<
659 body: 'This tool call is going through now. We’ll ask again next time it’s used.',
660 },
661 allow_session: {
568 - title: 'Allowed for this session',
569 - body: 'This tool can run again for the rest of this CLI session without asking.',
662 + title: `Allowed for ${ALLOW_FOR_DURATION_LABEL}`,
663 + body: 'This tool can run again for the next hour without asking.',
664 },
665 deny: {
666 title: 'Denied',
@@ -717,16 +811,22 @@ export const gateToolExecution = (params: GateParams) =>
811 if (!params.snapshot?.enhancedControlsEnabled || !params.snapshot.permissions) return;
812
813 const state = resolvePermissionState(params);
720 - if (state === 'allow_all' || state === 'always_allow') return;
814 + if (state === 'allow_all' || state === 'always_allow') {
815 + return { approvalStatus: 'always_approved' } satisfies PermissionGateResult;
816 + }
817 if (state === 'always_deny') {
818 return yield* Effect.fail(
819 new Error(`Tool execution denied by permissions: ${params.toolSlug}`)
820 );
821 }
822
727 - const cacheKey = sessionCacheKey(params);
728 - const readsSessionCache = state === 'ask_once' || state === 'ask_once_per_session';
729 - if (readsSessionCache && sessionAllowCache.has(cacheKey)) return;
823 + const cacheKey = allowCacheKey(params);
824 + const hasCachedAllow = yield* Effect.tryPromise(() => isAllowCached(cacheKey)).pipe(
825 + Effect.catchAll(() => Effect.succeed(false))
826 + );
827 + if (hasCachedAllow) {
828 + return { approvalStatus: 'cached_approved' } satisfies PermissionGateResult;
829 + }
830
831 const decision = yield* Effect.tryPromise(() =>
832 requestPermissionDecision({
@@ -738,7 +838,16 @@ export const gateToolExecution = (params: GateParams) =>
838 if (decision === 'deny') {
839 return yield* Effect.fail(new Error(`Tool execution denied by user: ${params.toolSlug}`));
840 }
741 - if (decision === 'allow_session' || (readsSessionCache && decision === 'allow_once')) {
742 - sessionAllowCache.add(cacheKey);
841 + const cachesAllowOnce = state === 'ask_once' || state === 'ask_once_per_session';
842 + if (decision === 'allow_session' || (cachesAllowOnce && decision === 'allow_once')) {
843 + yield* Effect.tryPromise(() => cacheAllowDecision(cacheKey)).pipe(
844 + Effect.catchAll(error =>
845 + Effect.logDebug('Failed to cache tool permission allow decision', error)
846 + )
847 + );
848 }
849 +
850 + return {
851 + approvalStatus: decision === 'allow_session' ? 'approved_for_session' : 'approved_once',
852 + } satisfies PermissionGateResult;
853 });
ts/packages/cli/src/services/tools-executor.ts
+9 -4
@@ -9,7 +9,7 @@ import type {
9 } from '@composio/client/resources/tool-router';
10 import { ComposioClientSingleton } from 'src/services/composio-clients';
11 import { createToolRouterSessionContext } from 'src/effects/create-tool-router-session';
12 -import { gateToolExecution } from 'src/services/tool-permissions';
12 +import { gateToolExecution, type PermissionGateResult } from 'src/services/tool-permissions';
13 import {
14 ComposioNoActiveConnectionError,
15 mapComposioError,
@@ -46,6 +46,7 @@ export interface ToolExecuteResponse {
46 readonly data: Record<string, unknown>;
47 readonly error: string | null;
48 readonly logId: string;
49 + readonly permissionApproval?: NonNullable<PermissionGateResult>['approvalStatus'];
50 }
51
52 export interface ToolsExecutor {
@@ -94,12 +95,16 @@ const isMetaToolSlug = (slug: string): slug is SessionExecuteMetaParams['slug']
95 * Normalize the raw Tool Router response into the shape the CLI commands expect.
96 */
97 const normalizeResponse = (
97 - raw: SessionExecuteResponse | SessionExecuteMetaResponse
98 + raw: SessionExecuteResponse | SessionExecuteMetaResponse,
99 + permissionGateResult?: PermissionGateResult
100 ): ToolExecuteResponse => ({
101 successful: raw.error === null,
102 data: raw.data,
103 error: raw.error,
104 logId: raw.log_id,
105 + ...(permissionGateResult?.approvalStatus
106 + ? { permissionApproval: permissionGateResult.approvalStatus }
107 + : {}),
108 });
109
110 /**
@@ -185,7 +190,7 @@ export const ToolsExecutorLive = Layer.effect(
190 cacheScope: params.cacheScope,
191 });
192 const toolkitSlug = slug.split('_')[0]?.toLowerCase();
188 - yield* gateToolExecution({
193 + const permissionGateResult = yield* gateToolExecution({
194 toolSlug: slug,
195 connectedAccountId: toolkitSlug ? connectedAccounts?.[toolkitSlug] : undefined,
196 connectedAccountWordId: toolkitSlug
@@ -230,7 +235,7 @@ export const ToolsExecutorLive = Layer.effect(
235 }
236 );
237
233 - return normalizeResponse(raw);
238 + return normalizeResponse(raw, permissionGateResult);
239 }).pipe(
240 Effect.catchAll((error): Effect.Effect<never, unknown> => {
241 const mapped = mapComposioError({ error, toolSlug: slug });
ts/packages/cli/test/src/commands/tools/tools.execute.cmd.test.ts
+37
@@ -93,6 +93,43 @@ describe('CLI: composio execute', () => {
93 );
94 });
95
96 + layer(
97 + TestLive({
98 + baseConfigProvider: testConfigProvider,
99 + fixture: 'global-test-user-id',
100 + stdin: { isTTY: true, data: '' },
101 + toolsExecutor: {
102 + respondWith: {
103 + successful: true,
104 + data: { ok: true },
105 + error: null,
106 + logId: 'log_approval_status',
107 + permissionApproval: 'approved_once',
108 + },
109 + },
110 + })
111 + )('[Given] an approval status [Then] execute includes it in the success line', it => {
112 + it.scoped('prints approval status before the log id', () =>
113 + Effect.gen(function* () {
114 + yield* cli([
115 + 'execute',
116 + 'GMAIL_SEND_EMAIL',
117 + '--skip-connection-check',
118 + '-d',
119 + '{"recipient":"a"}',
120 + ]);
121 + const lines = yield* MockConsole.getLines({ stripAnsi: true });
122 + const text = lines.join('\n');
123 + const output = parseLastJson(lines) as ReturnType<typeof parseLastJson> & {
124 + readonly permissionApproval?: string;
125 + };
126 +
127 + expect(text).toContain('Execution successful (approved once, logId: log_approval_status)');
128 + expect(output.permissionApproval).toBe('approved_once');
129 + })
130 + );
131 + });
132 +
133 layer(
134 TestLive({
135 baseConfigProvider: testConfigProvider,