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
2 changes: 2 additions & 0 deletions apps/cloud/src/api/protected.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const makeBaseEngine = (): ExecutionEngine =>
result: { result: "ok", logs: [] },
}),
getPausedExecution: () => Effect.succeed(null),
pausedExecutionCount: () => Effect.succeed(0),
hasPausedExecutions: () => Effect.succeed(false),
getDescription: Effect.succeed("desc"),
}) as ExecutionEngine;

Expand Down
2 changes: 2 additions & 0 deletions apps/cloud/src/engine/execution-usage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@ export const withExecutionUsageTracking = <E extends Cause.YieldableError>(
// resume doesn't count as usage
resume: (executionId, response) => engine.resume(executionId, response),
getPausedExecution: (executionId) => engine.getPausedExecution(executionId),
pausedExecutionCount: () => engine.pausedExecutionCount(),
hasPausedExecutions: () => engine.hasPausedExecutions(),
getDescription: engine.getDescription,
});
1 change: 1 addition & 0 deletions apps/host-cloudflare/src/mcp/session-durable-object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export class McpSessionDO extends McpAgentSessionDOBase<CloudflareEnv, CfSession
engine,
trigger: { kind: "mcp", actor },
browserApprovalStore: self.browserApprovalStore,
pausedExecutionHooks: self.pausedExecutionHooks,
elicitationMode:
elicitationMode === "browser"
? {
Expand Down
14 changes: 5 additions & 9 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions packages/core/execution/src/engine.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,18 @@ describe("executeWithPause failure propagation", () => {
}),
);
});

describe("pausedExecutionCount", () => {
it.effect("starts at zero", () =>
Effect.gen(function* () {
const executor = yield* makeExecutor();
const engine = createExecutionEngine({
executor,
codeExecutor: succeedingExecutor,
});

expect(yield* engine.pausedExecutionCount()).toBe(0);
expect(yield* engine.hasPausedExecutions()).toBe(false);
}),
);
});
8 changes: 8 additions & 0 deletions packages/core/execution/src/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,12 @@ export type ExecutionEngine<E extends Cause.YieldableError = CodeExecutionError>
*/
readonly getPausedExecution: (executionId: string) => Effect.Effect<PausedExecution | null>;

/** Count of executions currently paused awaiting resume. */
readonly pausedExecutionCount: () => Effect.Effect<number>;

/** Whether any executions are paused awaiting resume. */
readonly hasPausedExecutions: () => Effect.Effect<boolean>;

/**
* Get the dynamic tool description (workflow + namespaces).
*/
Expand Down Expand Up @@ -852,6 +858,8 @@ export const createExecutionEngine = <E extends Cause.YieldableError = CodeExecu
resume: resumeExecution,
getPausedExecution: (executionId) =>
Effect.sync(() => pausedExecutions.get(executionId) ?? null),
pausedExecutionCount: () => Effect.sync(() => pausedExecutions.size),
hasPausedExecutions: () => Effect.sync(() => pausedExecutions.size > 0),
getDescription: buildExecuteDescription(executor),
};
};
4 changes: 4 additions & 0 deletions packages/core/execution/src/promise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export type ExecutionEngine = {
response: ResumeResponse,
) => Promise<ExecutionResult | null>;
readonly getPausedExecution: (executionId: string) => Promise<PausedExecution | null>;
readonly pausedExecutionCount: () => Promise<number>;
readonly hasPausedExecutions: () => Promise<boolean>;
readonly getDescription: () => Promise<string>;
};

Expand Down Expand Up @@ -152,6 +154,8 @@ export const toPromiseExecutionEngine = <E extends Cause.YieldableError>(
executeWithPause: (code) => Effect.runPromise(engine.executeWithPause(code)),
resume: (executionId, response) => Effect.runPromise(engine.resume(executionId, response)),
getPausedExecution: (executionId) => Effect.runPromise(engine.getPausedExecution(executionId)),
pausedExecutionCount: () => Effect.runPromise(engine.pausedExecutionCount()),
hasPausedExecutions: () => Effect.runPromise(engine.hasPausedExecutions()),
getDescription: () => Effect.runPromise(engine.getDescription),
});

Expand Down
3 changes: 2 additions & 1 deletion packages/core/sdk/src/executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3885,8 +3885,9 @@ export const createExecutor = <const TPlugins extends readonly AnyPlugin[] = rea
: policyForcesApproval && policy.pattern
? `Approve ${address}? (matched policy: ${policy.pattern})`
: `Approve ${address}?`;
const preview = approvalArgumentPreview(args);
const request = FormElicitation.make({
message: `${message}\n\nArguments:\n${approvalArgumentPreview(args)}`,
message: `${message}\n\nArguments:\n${preview}`,
requestedSchema: { type: "object", properties: {} },
});
const response = yield* handler({ address, args, request });
Expand Down
Loading
Loading