Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(codex): show app access approval prompts by t3dotgg · Pull Request #8058 · pingdotgg/t3code · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions apps/mobile/src/features/threads/PendingApprovalCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
import type { ApprovalRequestId, ProviderApprovalDecision } from "@t3tools/contracts";
import type {
ApprovalRequestId,
ProviderApprovalDecision,
ProviderApprovalOption,
} from "@t3tools/contracts";
import { Pressable, View } from "react-native";

import { AppText as Text } from "../../components/AppText";
Expand All@@ -13,7 +17,14 @@ export interface PendingApprovalCardProps {
) => Promise<unknown>;
}

const DEFAULT_APPROVAL_OPTIONS = [
{ decision: "accept", label: "Allow once" },
{ decision: "acceptForSession", label: "Allow session" },
{ decision: "decline", label: "Decline" },
] satisfies ReadonlyArray<ProviderApprovalOption>;

export function PendingApprovalCard(props: PendingApprovalCardProps) {
const options = props.approval.options ?? DEFAULT_APPROVAL_OPTIONS;
// Opaque for the same reason as PendingUserInputCard: nothing blurs the feed
// behind this card, so a translucent surface bleeds messages through it.
return (
Expand All@@ -22,37 +33,40 @@ export function PendingApprovalCard(props: PendingApprovalCardProps) {
Approval needed
</Text>
<Text className="font-t3-bold text-lg text-neutral-950 dark:text-neutral-50">
{props.approval.requestKind}
{props.approval.appName ?? props.approval.requestKind}
</Text>
{props.approval.detail ? (
<Text className="font-sans text-sm leading-normal text-neutral-600 dark:text-neutral-400">
{props.approval.detail}
</Text>
) : null}
<View className="flex-row flex-wrap gap-2.5">
<Pressable
className="items-center justify-center rounded-[14px] bg-blue-500 px-3.5 py-3"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "accept")}
>
<Text className="font-t3-extrabold text-sm text-white">Allow once</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-neutral-200 px-3.5 py-3 dark:bg-neutral-800"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "acceptForSession")}
>
<Text className="font-t3-bold text-sm text-neutral-950 dark:text-neutral-50">
Allow session
</Text>
</Pressable>
<Pressable
className="items-center justify-center rounded-[14px] bg-rose-100 px-3.5 py-3 dark:bg-rose-500/18"
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, "decline")}
>
<Text className="font-t3-bold text-sm text-rose-700 dark:text-rose-300">Decline</Text>
</Pressable>
{options.map((option) => (
<Pressable
key={option.decision}
className={`items-center justify-center rounded-[14px] px-3.5 py-3 ${
option.decision === "accept"
? "bg-blue-500"
: option.decision === "decline"
? "bg-rose-100 dark:bg-rose-500/18"
: "bg-neutral-200 dark:bg-neutral-800"
}`}
disabled={props.respondingApprovalId === props.approval.requestId}
onPress={() => void props.onRespond(props.approval.requestId, option.decision)}
>
<Text
className={`text-sm ${
option.decision === "accept"
? "font-t3-extrabold text-white"
: option.decision === "decline"
? "font-t3-bold text-rose-700 dark:text-rose-300"
: "font-t3-bold text-neutral-950 dark:text-neutral-50"
}`}
>
{option.label}
</Text>
</Pressable>
))}
</View>
</View>
);
Expand Down
54 changes: 54 additions & 0 deletions apps/mobile/src/lib/threadActivity.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
import {
buildPendingUserInputAnswers,
buildThreadFeed,
derivePendingApprovals,
deriveThreadFeedPresentation,
isPendingUserInputOptionSelected,
setPendingUserInputCustomAnswer,
Expand DownExpand Up@@ -142,6 +143,59 @@ describe("pending user input answers", () => {
});
});

describe("pending approvals", () => {
it("keeps app access approvals and persistence choices from remote environments", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
];
const activity = makeActivity({
id: EventId.make("approval-safari"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: {
requestId: "req-safari",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});

expect(derivePendingApprovals([activity])).toEqual([
{
requestId: "req-safari",
requestKind: "mcp-elicitation",
createdAt: "2026-08-24T00:00:00.000Z",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
]);
});

it("removes an app access approval after a remote client rejects it", () => {
const requested = makeActivity({
id: EventId.make("approval-safari-open"),
kind: "approval.requested",
summary: "App access approval requested",
createdAt: "2026-08-24T00:00:00.000Z",
payload: { requestId: "req-safari", requestKind: "mcp-elicitation" },
});
const resolved = makeActivity({
id: EventId.make("approval-safari-resolved"),
kind: "approval.resolved",
summary: "Approval resolved",
createdAt: "2026-08-24T00:00:01.000Z",
payload: { requestId: "req-safari", decision: "decline" },
});

expect(derivePendingApprovals([requested, resolved])).toEqual([]);
});
});

function makeActivity(
input: Partial<OrchestrationThreadActivity> &
Pick<OrchestrationThreadActivity, "id" | "kind" | "summary" | "createdAt">,
Expand Down
32 changes: 24 additions & 8 deletions apps/mobile/src/lib/threadActivity.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
import { ApprovalRequestId, isToolLifecycleItemType } from "@t3tools/contracts";
import {
ApprovalRequestId,
isToolLifecycleItemType,
ProviderApprovalOption,
ProviderRequestKind,
} from "@t3tools/contracts";
import type {
OrchestrationLatestTurn,
OrchestrationThread,
Expand All@@ -11,14 +16,20 @@ import { formatDuration } from "@t3tools/shared/orchestrationTiming";

import * as Arr from "effect/Array";
import * as Order from "effect/Order";
import * as Schema from "effect/Schema";

export interface PendingApproval {
readonly requestId: ApprovalRequestId;
readonly requestKind: "command" | "file-read" | "file-change";
readonly requestKind: ProviderRequestKind;
readonly createdAt: string;
readonly detail?: string;
readonly appName?: string;
readonly options?: ReadonlyArray<ProviderApprovalOption>;
}

const isProviderRequestKind = Schema.is(ProviderRequestKind);
const isProviderApprovalOption = Schema.is(ProviderApprovalOption);

export interface PendingUserInput {
readonly requestId: ApprovalRequestId;
readonly createdAt: string;
Expand DownExpand Up@@ -147,6 +158,8 @@ function requestKindFromRequestType(requestType: unknown): PendingApproval["requ
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return null;
}
Expand DownExpand Up@@ -1375,20 +1388,23 @@ export function derivePendingApprovals(
? (activity.payload as Record<string, unknown>)
: null;
const requestId = parseApprovalRequestId(payload?.requestId);
const requestKind =
payload?.requestKind === "command" ||
payload?.requestKind === "file-read" ||
payload?.requestKind === "file-change"
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const requestKind = isProviderRequestKind(payload?.requestKind)
? payload.requestKind
: requestKindFromRequestType(payload?.requestType);
const detail = typeof payload?.detail === "string" ? payload.detail : undefined;
const appName = typeof payload?.appName === "string" ? payload.appName : undefined;
const options = Array.isArray(payload?.options)
? payload.options.filter(isProviderApprovalOption)
: undefined;

if (activity.kind === "approval.requested" && requestId && requestKind) {
openByRequestId.set(requestId, {
requestId,
requestKind,
createdAt: activity.createdAt,
...(detail ? { detail } : {}),
...(appName ? { appName } : {}),
...(options && options.length > 0 ? { options } : {}),
});
continue;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
ProviderDriverKind,
type OrchestrationEvent,
type OrchestrationThread,
type ProviderApprovalDecision,
} from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
Expand DownExpand Up@@ -199,14 +200,14 @@ export interface OrchestrationIntegrationHarness {
requestId: string,
predicate: (row: {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
}) => boolean,
timeoutMs?: number,
) => Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand DownExpand Up@@ -493,15 +494,15 @@ export const makeOrchestrationIntegrationHarness = (
row,
): row is {
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
} => row !== null && predicate(row),
`pending approval '${requestId}'`,
timeoutMs,
) as Effect.Effect<
{
readonly status: "pending" | "resolved";
readonly decision: "accept" | "acceptForSession" | "decline" | "cancel" | null;
readonly decision: ProviderApprovalDecision | null;
readonly resolvedAt: string | null;
},
never
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -1507,6 +1507,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
const resolvedDecision =
resolvedDecisionRaw === "accept" ||
resolvedDecisionRaw === "acceptForSession" ||
resolvedDecisionRaw === "acceptAlways" ||
resolvedDecisionRaw === "decline" ||
resolvedDecisionRaw === "cancel"
? resolvedDecisionRaw
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,4 +30,41 @@ describe("runtimeEventToActivities approval details", () => {
expect(activity?.kind).toBe("approval.requested");
expect((activity?.payload as Record<string, unknown> | undefined)?.detail).toBe(detail);
});

it("keeps app details and approval options available to remote clients", () => {
const options = [
{ decision: "decline", label: "Decline" },
{ decision: "acceptAlways", label: "Always allow Safari" },
{ decision: "accept", label: "Approve" },
] as const;
const event = {
type: "request.opened",
eventId: EventId.make("evt-mcp-elicitation"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-08-24T00:00:00.000Z",
threadId: ThreadId.make("thread-1"),
requestId: RuntimeRequestId.make("approval-safari"),
payload: {
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
} satisfies ProviderRuntimeEvent;

const [activity] = runtimeEventToActivities(event);

expect(activity).toMatchObject({
kind: "approval.requested",
summary: "App access approval requested",
payload: {
requestId: "approval-safari",
requestKind: "mcp-elicitation",
requestType: "mcp_elicitation_approval",
detail: "Allow ChatGPT to use Safari?",
appName: "Safari",
options,
},
});
});
});
Original file line numberDiff line numberDiff line change
Expand Up@@ -298,7 +298,7 @@ function sessionStatusAllowsActiveTurn(

function requestKindFromCanonicalRequestType(
requestType: string | undefined,
): "command" | "file-read" | "file-change" | undefined {
): "command" | "file-read" | "file-change" | "mcp-elicitation" | undefined {
switch (requestType) {
case "command_execution_approval":
case "exec_command_approval":
Expand All@@ -308,6 +308,8 @@ function requestKindFromCanonicalRequestType(
case "file_change_approval":
case "apply_patch_approval":
return "file-change";
case "mcp_elicitation_approval":
return "mcp-elicitation";
default:
return undefined;
}
Expand DownExpand Up@@ -388,12 +390,16 @@ export function runtimeEventToActivities(
? "File-read approval requested"
: requestKind === "file-change"
? "File-change approval requested"
: "Approval requested",
: requestKind === "mcp-elicitation"
? "App access approval requested"
: "Approval requested",
payload: {
requestId: toApprovalRequestId(event.requestId),
...(requestKind ? { requestKind } : {}),
requestType: event.payload.requestType,
...(event.payload.detail ? { detail: event.payload.detail } : {}),
...(event.payload.appName ? { appName: event.payload.appName } : {}),
...(event.payload.options ? { options: event.payload.options } : {}),
},
turnId: toTurnId(event.turnId) ?? null,
...maybeSequence,
Expand Down
Loading
Loading