mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-17 05:45:07 +00:00
Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a8b7a6a1e | ||
|
|
18192dc48b | ||
|
|
162745d8e6 | ||
|
|
937a610006 | ||
|
|
2269c8a010 | ||
|
|
e0847ac82f | ||
|
|
9ba2950132 | ||
|
|
fbb7a2c094 | ||
|
|
4437186c49 | ||
|
|
4bba288c10 | ||
|
|
c48d1c1700 | ||
|
|
db3cfadc6c |
+1
-1
@@ -76,7 +76,7 @@ Dense toolbar rows, such as the composer's, are the exception to the 44pt contro
|
||||
|
||||
In the composer, the first glyph's ink starts on the text column's edge, and the trailing control is always a disc, so the row does not shift as it changes between voice mode, send and stop. The disc nests into the corner, as far from the right edge as from the bottom, and touch-sized the composer's corner radius is concentric with it (`packages/app/src/composer/input/toolbar-rails.ts`). Touch-sized the disc keeps a 6pt clearance from its neighbour, because it is always painted and a pressed neighbour would merge with it. The attach button sits 2pt closer to the picker than its highlight would put it: the plus is all thin arms, so the full gap reads wide. That offset is set by eye.
|
||||
|
||||
One gate, `resolveControlSizing`, picks touch or pointer sizing: touch when the layout is compact or the device has a touch screen. An iPad with the sidebar docked is wide and touch-sized; a desktop is pointer-sized; a phone is both compact and touch. The touch-screen fact is read once at startup (`hasTouchScreen` in `hooks/use-fine-pointer.ts`), so attaching a mouse or keyboard to a tablet never shrinks its controls. Stylesheets take sizes from `bySizing({ touch, pointer })`, which resolves to a breakpoint value, so a caller never sees which sizing it got. Rows, icon buttons and icon slots take theirs from `styles/density.ts`, which uses the same gate. An `{ xs, md }` literal for a hit target or glyph is wrong: on an iPad it yields the pointer size.
|
||||
One gate, `resolveControlSizing`, picks touch or pointer sizing: touch when the layout is compact or touch is the primary input. An iPad with the sidebar docked is wide and touch-sized; a desktop is pointer-sized; a phone is both compact and touch. The primary input comes from `(pointer: coarse)` (`hasTouchPrimaryPointer` in `hooks/pointer-capabilities.ts`), not from whether a touch screen exists: WebKit keeps touch primary on an iPad with a trackpad attached, and Chromium reports a fine primary pointer for a laptop with a touch screen that its trackpad drives. The fact is read once at startup: attaching a pointer to a tablet does not shrink its controls, and a 2-in-1 launched with a pointer keeps pointer sizes after it switches to tablet mode until the app reloads. Stylesheets take sizes from `bySizing({ touch, pointer })`, which resolves to a breakpoint value, so a caller never sees which sizing it got. Rows, icon buttons and icon slots take theirs from `styles/density.ts`, which uses the same gate. An `{ xs, md }` literal for a hit target or glyph is wrong: on an iPad it yields the pointer size.
|
||||
|
||||
Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 where controls are touch-sized, and it reserves its size's control height so a row holding one lines up with a row holding a button. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
sha256-alhf4ULeJ7n8sfgnxsX8Ugw40GB7jz0u9R/3/MOveIw=
|
||||
sha256-hN+Klz3jXugHs5MsVzIQIwIa/HGbpdJ04qolKvbsOuk=
|
||||
|
||||
Generated
+37
-37
@@ -130,22 +130,22 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.246.tgz",
|
||||
"integrity": "sha512-FtR0HoHHNqeqJWjZN8qLUAzZVFUI9ztXYNPPwv98Ecmv9qq2QTauI8IzkY26CC0mleWAqb9RQEW2C0OtiUliug==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.326.tgz",
|
||||
"integrity": "sha512-BUTSky/4YWfL/MxC+4kV0NDbJFjbJPoQMFEk/s9G6hV9LUfYPMbsWz94bFQ7ZIo2ubj2xwJ2c2NVxkNlQhVw+Q==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"engines": {
|
||||
"node": ">=18.0.0"
|
||||
"node": ">=18.14.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.246"
|
||||
"@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.326",
|
||||
"@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.326"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@anthropic-ai/sdk": ">=0.93.0",
|
||||
@@ -154,9 +154,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-darwin-arm64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.246.tgz",
|
||||
"integrity": "sha512-pYDv2RT+UVOvEapMEWKf7Gm5a87Si1Zf+XR23IMGYbG5mESatNJ8Gz2PmkrwfTezZknb0ljWZe8zgcTFITM3dA==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.326.tgz",
|
||||
"integrity": "sha512-D3ZbowCMdKNet0YPZlsJxdJUW1t1Q8KLy1BwNd+5eilf18TlCRtWZlm8DrewFLmu/gxBK7gcsq6uysrIVbPyQg==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -167,9 +167,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-darwin-x64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.246.tgz",
|
||||
"integrity": "sha512-yl+gMMFUQ8++SBaxUe2JxBqU0LOJO4HZTsWWTOrH5kRlTRhdQDF/lESsoNXCHgfF/+77YNKgef0h+rl/D12Jfg==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.326.tgz",
|
||||
"integrity": "sha512-m8K3Im2S8STdAVBrriuDZyJcnjsu/Vc3476wIOqTAefnCCdtdZ4AHcOcWxt+4KIHE5Vx1qT2qacTRrQBaVVweA==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -180,9 +180,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.246.tgz",
|
||||
"integrity": "sha512-t7AEewD7bcjZYMmrfFLjsUSxPo4z+5J5O5cC9V2zOvAhNkefdMeGWI2/1cdqZxuaOiFVt46byjlZuiNNunF+bQ==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.326.tgz",
|
||||
"integrity": "sha512-nYVN8jCcH490DCXIvby7rllzQFxLzKeKClfo2u/yv7mx3ipZQv344caULL/amwZ8w8GUzYyZ8hnS6pI9goSq+A==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -193,9 +193,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64-musl": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.246.tgz",
|
||||
"integrity": "sha512-AeiDXveuA9dVRDouSRiQzL40P3dOuJPfZOlwwsFNbVUN0D+06WtwgmeWYnyRG4dxsM67Pf4lYcRZ0x9pfEZUwQ==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.326.tgz",
|
||||
"integrity": "sha512-baSsuP2/wuWujRpHjKT4WkJB5lhttqKq9jcTfY2KRtQpylbk8E5PWcct/pmwJfNCKIUoE8CD+JpmoWzsdd5Ajw==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -206,9 +206,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-linux-x64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.246.tgz",
|
||||
"integrity": "sha512-BIbBlJ6x7Cys6UFvahUfce26H+U+Q4tLWjKRD39AaV7JvRav8/vfdFytzWq6E+h9hT1OOWYuPYx2gMn5vDhZhQ==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.326.tgz",
|
||||
"integrity": "sha512-WMhDY07gk2O0E8FXTbrVYmPjSLFaYPDCPwsNueVxm6vZ7ek+lPaKuOMAxTb1K07TzSmTOexoWeX2Y9VrbVDMpw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -219,9 +219,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-linux-x64-musl": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.246.tgz",
|
||||
"integrity": "sha512-+3PrWX3qXgakO3tZImr7keKFry5XIkbHBEaUxgi3/RtPmxGwS+JdVAr0xxzOoC2F6Y66Kn0lUnztRnZHORBc+Q==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.326.tgz",
|
||||
"integrity": "sha512-kK9VO3uFqNd4wgeU0Cefluam5AdPu6mvF1nn6aboGy8TA5NoxlWTmA4/AwMhK39zK1S9Q2OjeX0JtAahYlIchw==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -232,9 +232,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-win32-arm64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.246.tgz",
|
||||
"integrity": "sha512-JV8b28OJ8d+EMVEVIWlN3aEkT8uSehO3ZN/PJzXFG7Jgn56oVYUew4aY9vK4jao/4E4mdfzvs358w4HcTBUzVw==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.326.tgz",
|
||||
"integrity": "sha512-S+Ai+HhGRVFfTDmYWRfTrdWF3b4KMsfLSThZCqRJ0WCOKOXrRShMKV1hqqHBljx/wkMDPCpY0V/9S/e6w57eGQ==",
|
||||
"cpu": [
|
||||
"arm64"
|
||||
],
|
||||
@@ -245,9 +245,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-agent-sdk-win32-x64": {
|
||||
"version": "0.3.246",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.246.tgz",
|
||||
"integrity": "sha512-omI65bYGynLpE1Ybijk56K1wBnt0H6WujNwlg1LzIdeHrYmpUxoqncK92xKH5kb9XWUz3byHqArbv7wsT+M/2A==",
|
||||
"version": "0.3.326",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.326.tgz",
|
||||
"integrity": "sha512-Yn1gZXYFuHmjHz7SpHx4TqDcRDsC8TfwWcntJdYjFzMWm+caPAp6QRqr/aTvirjqVA1D+D8Rd29xhuytpE3xTQ==",
|
||||
"cpu": [
|
||||
"x64"
|
||||
],
|
||||
@@ -40521,7 +40521,7 @@
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^0.17.1",
|
||||
"@anthropic-ai/claude-agent-sdk": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk": "0.3.326",
|
||||
"@anthropic-ai/sdk": "^0.104.2",
|
||||
"@getpaseo/client": "0.16.0",
|
||||
"@getpaseo/highlight": "0.16.0",
|
||||
|
||||
@@ -33,6 +33,8 @@ import {
|
||||
expectNoHostPasswordControls,
|
||||
removeHostFromHostPage,
|
||||
addDirectHostFromSettings,
|
||||
expectAddHostFieldDrawnAsInput,
|
||||
selectHostConnectionType,
|
||||
expectHostOnlineWithoutError,
|
||||
expectIdleAgentRelease,
|
||||
editRestartRecoveryPrompt,
|
||||
@@ -307,6 +309,24 @@ async function closeAddHostAndChangeTheme(page: import("@playwright/test").Page)
|
||||
await page.keyboard.press("Control+Alt+t");
|
||||
}
|
||||
|
||||
test("Add host draws its text fields as bordered inputs", async ({ page }) => {
|
||||
await gotoAppShell(page);
|
||||
|
||||
await test.step("the pairing link field", async () => {
|
||||
await openSidebarAddHost(page);
|
||||
await selectHostConnectionType(page, "relay");
|
||||
await expectAddHostFieldDrawnAsInput(page, "pair-link-input");
|
||||
await page.getByTestId("pair-link-cancel").click();
|
||||
});
|
||||
|
||||
await test.step("the direct connection fields", async () => {
|
||||
await selectHostConnectionType(page, "direct");
|
||||
await expectAddHostFieldDrawnAsInput(page, "direct-host-input");
|
||||
await expectAddHostFieldDrawnAsInput(page, "direct-port-input");
|
||||
await expectAddHostFieldDrawnAsInput(page, "direct-password-input");
|
||||
});
|
||||
});
|
||||
|
||||
test("sidebar Add host completes without navigating", async ({ page }) => {
|
||||
await gotoAppShell(page);
|
||||
await expect(page).toHaveURL(/\/open-project$/);
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
import { expect, test } from "../support/fixtures";
|
||||
import { gotoAppShell } from "../support/helpers/app";
|
||||
import {
|
||||
expectFooterActionsInline,
|
||||
seedDockedSidebarWidth,
|
||||
} from "../support/helpers/sidebar-footer-overflow";
|
||||
|
||||
// Chromium's pointer bitmasks expose both inputs while the mouse is primary.
|
||||
test.use({
|
||||
viewport: { width: 1280, height: 800 },
|
||||
launchOptions: {
|
||||
args: [
|
||||
"--blink-settings=primaryPointerType=4,availablePointerTypes=6,primaryHoverType=2,availableHoverTypes=3",
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
test("a touchscreen laptop keeps sidebar actions visible with a fine primary pointer", async ({
|
||||
page,
|
||||
}) => {
|
||||
await seedDockedSidebarWidth(page, 200);
|
||||
await gotoAppShell(page);
|
||||
expect(
|
||||
await page.evaluate(() => ({
|
||||
finePrimary: matchMedia("(pointer: fine)").matches,
|
||||
touchScreen: matchMedia("(any-pointer: coarse)").matches,
|
||||
})),
|
||||
).toEqual({ finePrimary: true, touchScreen: true });
|
||||
await expectFooterActionsInline(page, [
|
||||
"sidebar-add-project",
|
||||
"sidebar-usage-icon",
|
||||
"sidebar-hosts-trigger",
|
||||
"sidebar-help",
|
||||
"sidebar-settings",
|
||||
]);
|
||||
});
|
||||
@@ -223,6 +223,14 @@ export async function addDirectHostFromSettings(
|
||||
await expect(page.getByTestId("add-host-modal")).toHaveCount(0, { timeout: 30_000 });
|
||||
}
|
||||
|
||||
export async function expectAddHostFieldDrawnAsInput(page: Page, testId: string): Promise<void> {
|
||||
const field = page.getByTestId(testId);
|
||||
await expect(field).toBeVisible();
|
||||
await expect(field).toHaveCSS("border-top-width", "1px");
|
||||
await expect(field).not.toHaveCSS("padding-left", "0px");
|
||||
await expect(field).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)");
|
||||
}
|
||||
|
||||
export async function toggleHostAdvanced(page: Page): Promise<void> {
|
||||
await page.getByTestId("direct-host-advanced-toggle").click();
|
||||
}
|
||||
|
||||
@@ -60,14 +60,8 @@ export function footerOverflowMenu(page: Page): Locator {
|
||||
return page.getByTestId("sidebar-footer-overflow-menu");
|
||||
}
|
||||
|
||||
/**
|
||||
* The icon line shows exactly `testIDs`, in order, each `controlSize` square and wholly inside the
|
||||
* line's box, so no button is cut off by the sidebar's edge.
|
||||
*/
|
||||
export async function expectFooterLine(
|
||||
page: Page,
|
||||
input: { testIDs: string[]; controlSize: number },
|
||||
): Promise<void> {
|
||||
/** The icon line shows exactly `testIDs`, in order. */
|
||||
export async function expectFooterActionsInline(page: Page, testIDs: string[]): Promise<void> {
|
||||
const line = footerLine(page);
|
||||
await expect(line).toHaveCount(1);
|
||||
await expect
|
||||
@@ -76,7 +70,16 @@ export async function expectFooterLine(
|
||||
.locator(FOOTER_LINE_TEST_IDS.map((testID) => `[data-testid="${testID}"]`).join(","))
|
||||
.evaluateAll((elements) => elements.map((element) => element.getAttribute("data-testid"))),
|
||||
)
|
||||
.toEqual(input.testIDs);
|
||||
.toEqual(testIDs);
|
||||
}
|
||||
|
||||
/** The actions are square and fit inside the line. */
|
||||
export async function expectFooterLine(
|
||||
page: Page,
|
||||
input: { testIDs: string[]; controlSize: number },
|
||||
): Promise<void> {
|
||||
await expectFooterActionsInline(page, input.testIDs);
|
||||
const line = footerLine(page);
|
||||
const { row, buttons } = await line.evaluate((element, testIDs) => {
|
||||
const rect = (node: Element) => {
|
||||
const { x, width, height } = node.getBoundingClientRect();
|
||||
|
||||
@@ -68,24 +68,27 @@ const theme = {
|
||||
} as unknown as Theme;
|
||||
|
||||
describe("control sizing gate", () => {
|
||||
it("is touch-sized in the compact layout or on a touch screen, and pointer-sized otherwise", () => {
|
||||
expect(resolveControlSizing({ compactLayout: true, touchScreen: true })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: true, touchScreen: false })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: false, touchScreen: true })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: false, touchScreen: false })).toBe("pointer");
|
||||
it("is touch-sized in the compact layout or where touch is the primary input, and pointer-sized otherwise", () => {
|
||||
expect(resolveControlSizing({ compactLayout: true, touchPrimaryPointer: true })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: true, touchPrimaryPointer: false })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: false, touchPrimaryPointer: true })).toBe("touch");
|
||||
expect(resolveControlSizing({ compactLayout: false, touchPrimaryPointer: false })).toBe(
|
||||
"pointer",
|
||||
);
|
||||
});
|
||||
|
||||
it("gives a touch screen its touch sizes at every width", () => {
|
||||
it("gives a touch primary pointer its touch sizes at every width", () => {
|
||||
const sizes = { touch: 44, pointer: 32 };
|
||||
|
||||
// An iPad: touch-sized in the docked desktop layout too.
|
||||
expect(bySizing(sizes, true)).toEqual({ xs: 44, md: 44 });
|
||||
// A mouse-driven window: touch-sized only once it narrows into the compact layout.
|
||||
// A mouse- or trackpad-driven window, touch screen or not: touch-sized only once it narrows
|
||||
// into the compact layout.
|
||||
expect(bySizing(sizes, false)).toEqual({ xs: 44, md: 32 });
|
||||
});
|
||||
|
||||
it("keeps a device without a touch screen on pointer sizes from md up", () => {
|
||||
// The unit runtime has no touch screen, which is the desktop that must not change.
|
||||
it("keeps a device without a touch primary pointer on pointer sizes from md up", () => {
|
||||
// The unit runtime has no touch primary pointer, which is the desktop that must not change.
|
||||
expect(controlSizingForLayout(false)).toBe("pointer");
|
||||
expect(controlSizingForLayout(true)).toBe("touch");
|
||||
expect(CONTROL_HEIGHTS.md).toEqual({ xs: 44, md: 32 });
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { hasTouchScreen } from "@/hooks/pointer-capabilities";
|
||||
import { hasTouchPrimaryPointer } from "@/hooks/pointer-capabilities";
|
||||
|
||||
// The sizing gate, apart from the control sizes so that low-level modules such as
|
||||
// `constants/layout` can size by it without loading the theme. Import it through
|
||||
@@ -14,28 +14,32 @@ export type ControlSizing = "touch" | "pointer";
|
||||
export interface ControlSizingFacts {
|
||||
/** The layout is below the `md` breakpoint. */
|
||||
compactLayout: boolean;
|
||||
/** The device has a touch screen; see `hasTouchScreen`. */
|
||||
touchScreen: boolean;
|
||||
/** Touch is the device's primary input; see `hasTouchPrimaryPointer`. */
|
||||
touchPrimaryPointer: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* The one sizing gate: touch-sized in the compact layout or on any device with a touch screen,
|
||||
* pointer-sized otherwise. A touch screen keeps touch sizing when a mouse or keyboard is attached.
|
||||
* The one sizing gate: touch-sized in the compact layout or where touch is the primary input,
|
||||
* pointer-sized otherwise. An iPad keeps touch sizing with a trackpad attached; a laptop with a
|
||||
* touch screen that its trackpad drives is pointer-sized.
|
||||
*/
|
||||
export function resolveControlSizing({
|
||||
compactLayout,
|
||||
touchScreen,
|
||||
touchPrimaryPointer,
|
||||
}: ControlSizingFacts): ControlSizing {
|
||||
if (compactLayout || touchScreen) return "touch";
|
||||
if (compactLayout || touchPrimaryPointer) return "touch";
|
||||
return "pointer";
|
||||
}
|
||||
|
||||
// Read once, so attaching a mouse or keyboard later never flips the sizing.
|
||||
const DEVICE_HAS_TOUCH_SCREEN = hasTouchScreen();
|
||||
const DEVICE_HAS_TOUCH_PRIMARY_POINTER = hasTouchPrimaryPointer();
|
||||
|
||||
/** The sizing on this device for a layout, for code that sizes outside a stylesheet. */
|
||||
export function controlSizingForLayout(compactLayout: boolean): ControlSizing {
|
||||
return resolveControlSizing({ compactLayout, touchScreen: DEVICE_HAS_TOUCH_SCREEN });
|
||||
return resolveControlSizing({
|
||||
compactLayout,
|
||||
touchPrimaryPointer: DEVICE_HAS_TOUCH_PRIMARY_POINTER,
|
||||
});
|
||||
}
|
||||
|
||||
/** A Unistyles breakpoint value: one number in the compact layout, another from `md` up. */
|
||||
@@ -51,11 +55,11 @@ export type SizingValue = Record<ControlSizing, number>;
|
||||
*/
|
||||
export function bySizing(
|
||||
sizes: SizingValue,
|
||||
touchScreen: boolean = DEVICE_HAS_TOUCH_SCREEN,
|
||||
touchPrimaryPointer: boolean = DEVICE_HAS_TOUCH_PRIMARY_POINTER,
|
||||
): LayoutValue {
|
||||
return {
|
||||
xs: sizes[resolveControlSizing({ compactLayout: true, touchScreen })],
|
||||
md: sizes[resolveControlSizing({ compactLayout: false, touchScreen })],
|
||||
xs: sizes[resolveControlSizing({ compactLayout: true, touchPrimaryPointer })],
|
||||
md: sizes[resolveControlSizing({ compactLayout: false, touchPrimaryPointer })],
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ import {
|
||||
toolbarSlot,
|
||||
type ToolbarGlyphs,
|
||||
} from "@/components/ui/control-geometry";
|
||||
import { shortModelLabel } from "./utils";
|
||||
|
||||
const SNAP_POINTS = ["80%", "90%"];
|
||||
const MODEL_LIST_TOP_INSET = 4;
|
||||
@@ -66,11 +67,6 @@ interface CompactModelSheetProps {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
function shortModelLabel(label: string): string {
|
||||
const separatorIndex = label.lastIndexOf("/");
|
||||
return separatorIndex === -1 ? label : label.slice(separatorIndex + 1);
|
||||
}
|
||||
|
||||
function resolveModelSheetProfileActions(
|
||||
onCreateProfile: ((seed: AgentProfileSeed) => void) | undefined,
|
||||
onEditProfile: ((profileId: string) => void) | undefined,
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
getAgentControlHintKey,
|
||||
normalizeModelId,
|
||||
resolveAgentModelSelection,
|
||||
shortModelLabel,
|
||||
} from "./utils";
|
||||
|
||||
describe("getAgentControlHintKey", () => {
|
||||
@@ -251,3 +252,19 @@ describe("resolveAgentModelSelection", () => {
|
||||
expect(selection.displayThinking).toBe("Max");
|
||||
});
|
||||
});
|
||||
|
||||
describe("shortModelLabel", () => {
|
||||
it("drops a provider namespace", () => {
|
||||
expect(shortModelLabel("openrouter/gpt-5.5")).toBe("gpt-5.5");
|
||||
expect(shortModelLabel("openrouter/google/gemini-2.5-flash")).toBe("gemini-2.5-flash");
|
||||
});
|
||||
|
||||
it("keeps slashes inside a display name", () => {
|
||||
expect(shortModelLabel("DeepSeek V4.1 Flash (~6-7 tok/s, 56/56)")).toBe(
|
||||
"DeepSeek V4.1 Flash (~6-7 tok/s, 56/56)",
|
||||
);
|
||||
expect(shortModelLabel("llama-swap/DeepSeek V4.1 Flash (56/56)")).toBe(
|
||||
"DeepSeek V4.1 Flash (56/56)",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -35,6 +35,12 @@ export function normalizeModelId(modelId: string | null | undefined): string | n
|
||||
return normalized;
|
||||
}
|
||||
|
||||
// Drops a provider namespace ("openrouter/gpt-5.5" -> "gpt-5.5") for the compact trigger.
|
||||
// A namespace segment has no spaces, so slashes inside a display name ("52/56") survive.
|
||||
export function shortModelLabel(label: string): string {
|
||||
return label.replace(/^(?:[^\s/]+\/)+(?=\S)/, "");
|
||||
}
|
||||
|
||||
export function getFeatureHighlightColor(featureId: string): FeatureHighlightColor {
|
||||
switch (featureId) {
|
||||
case FAST_MODE_FEATURE_ID:
|
||||
|
||||
@@ -23,10 +23,18 @@ class FakeMediaQueryList {
|
||||
}
|
||||
}
|
||||
|
||||
function createFakeDisplay(initial: { finePointer: boolean; touchScreen: boolean }) {
|
||||
function createFakeDisplay(initial: {
|
||||
finePointer: boolean;
|
||||
touchScreen: boolean;
|
||||
touchPrimaryPointer?: boolean;
|
||||
}) {
|
||||
const queries = {
|
||||
finePointer: new FakeMediaQueryList("(hover: hover) and (pointer: fine)", initial.finePointer),
|
||||
touchScreen: new FakeMediaQueryList("(any-pointer: coarse)", initial.touchScreen),
|
||||
touchPrimaryPointer: new FakeMediaQueryList(
|
||||
"(pointer: coarse)",
|
||||
initial.touchPrimaryPointer ?? false,
|
||||
),
|
||||
};
|
||||
const matchMedia = (query: string) => {
|
||||
const match = Object.values(queries).find((list) => list.media === query);
|
||||
@@ -75,3 +83,25 @@ describe("pointer capabilities", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("hasTouchPrimaryPointer", () => {
|
||||
it("is false on a touch-screen laptop driven by its trackpad", () => {
|
||||
const display = createFakeDisplay({ finePointer: true, touchScreen: true });
|
||||
expect(createPointerCapabilitiesSource(display.matchMedia).hasTouchPrimaryPointer()).toBe(
|
||||
false,
|
||||
);
|
||||
});
|
||||
|
||||
it("is true when the primary pointer is coarse", () => {
|
||||
const display = createFakeDisplay({
|
||||
finePointer: false,
|
||||
touchScreen: true,
|
||||
touchPrimaryPointer: true,
|
||||
});
|
||||
expect(createPointerCapabilitiesSource(display.matchMedia).hasTouchPrimaryPointer()).toBe(true);
|
||||
});
|
||||
|
||||
it("is false without media queries", () => {
|
||||
expect(createPointerCapabilitiesSource(null).hasTouchPrimaryPointer()).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -8,6 +8,7 @@ import { isWeb } from "@/constants/platform";
|
||||
// (detachable keyboards, tablet mode, devtools touch emulation).
|
||||
const FINE_POINTER_QUERY = "(hover: hover) and (pointer: fine)";
|
||||
const TOUCH_SCREEN_QUERY = "(any-pointer: coarse)";
|
||||
const TOUCH_PRIMARY_POINTER_QUERY = "(pointer: coarse)";
|
||||
|
||||
export interface PointerCapabilities {
|
||||
/** A mouse-like pointer drives the UI. */
|
||||
@@ -21,6 +22,7 @@ type MatchMedia = (query: string) => MediaQueryList;
|
||||
export interface PointerCapabilitiesSource {
|
||||
getSnapshot: () => PointerCapabilities;
|
||||
subscribe: (onChange: () => void) => () => void;
|
||||
hasTouchPrimaryPointer: () => boolean;
|
||||
}
|
||||
|
||||
export function createPointerCapabilitiesSource(
|
||||
@@ -28,9 +30,11 @@ export function createPointerCapabilitiesSource(
|
||||
): PointerCapabilitiesSource {
|
||||
const finePointerQuery = matchMedia?.(FINE_POINTER_QUERY) ?? null;
|
||||
const touchScreenQuery = matchMedia?.(TOUCH_SCREEN_QUERY) ?? null;
|
||||
const touchPrimaryPointerQuery = matchMedia?.(TOUCH_PRIMARY_POINTER_QUERY) ?? null;
|
||||
let snapshot: PointerCapabilities = { finePointer: false, touchScreen: false };
|
||||
|
||||
return {
|
||||
hasTouchPrimaryPointer: () => touchPrimaryPointerQuery?.matches ?? false,
|
||||
getSnapshot() {
|
||||
const finePointer = finePointerQuery?.matches ?? false;
|
||||
const touchScreen = touchScreenQuery?.matches ?? false;
|
||||
@@ -61,6 +65,7 @@ const NATIVE_POINTER_CAPABILITIES: PointerCapabilities = { finePointer: false, t
|
||||
const nativeSource: PointerCapabilitiesSource = {
|
||||
getSnapshot: () => NATIVE_POINTER_CAPABILITIES,
|
||||
subscribe: () => () => {},
|
||||
hasTouchPrimaryPointer: () => true,
|
||||
};
|
||||
|
||||
const source = isWeb ? createPointerCapabilitiesSource(browserMatchMedia()) : nativeSource;
|
||||
@@ -79,10 +84,11 @@ export function hasFinePointer(): boolean {
|
||||
return source.getSnapshot().finePointer;
|
||||
}
|
||||
|
||||
/** Touch sizing remains enabled on hybrid browsers that report touch points. */
|
||||
export function hasTouchScreen(): boolean {
|
||||
return (
|
||||
source.getSnapshot().touchScreen ||
|
||||
(isWeb && typeof window !== "undefined" && window.navigator.maxTouchPoints > 0)
|
||||
);
|
||||
/**
|
||||
* True when touch is the primary input, read at call time. iPadOS keeps touch primary with a
|
||||
* trackpad attached; a laptop with a touch screen that its trackpad drives reports a fine primary
|
||||
* pointer.
|
||||
*/
|
||||
export function hasTouchPrimaryPointer(): boolean {
|
||||
return source.hasTouchPrimaryPointer();
|
||||
}
|
||||
|
||||
@@ -431,7 +431,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
|
||||
<View style={styles.portRow}>
|
||||
<View style={hostFieldStyle}>
|
||||
<Text style={styles.label}>{t("pairing.direct.fields.host")}</Text>
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
testID="direct-host-input"
|
||||
nativeID="direct-host-input"
|
||||
accessibilityLabel={t("pairing.direct.fields.host")}
|
||||
@@ -449,7 +449,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
|
||||
</View>
|
||||
<View style={portFieldStyle}>
|
||||
<Text style={styles.label}>{t("pairing.direct.fields.port")}</Text>
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
testID="direct-port-input"
|
||||
nativeID="direct-port-input"
|
||||
accessibilityLabel={t("pairing.direct.fields.port")}
|
||||
@@ -491,7 +491,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>{t("pairing.direct.fields.password")}</Text>
|
||||
<View style={styles.passwordRow}>
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
testID="direct-password-input"
|
||||
nativeID="direct-password-input"
|
||||
accessibilityLabel={t("pairing.direct.fields.password")}
|
||||
@@ -539,7 +539,7 @@ function AddHostModalContent({ visible, onClose, onCancel, onSaved }: AddHostMod
|
||||
<Text style={styles.advancedText}>{t("pairing.direct.advanced.label")}</Text>
|
||||
</PressHighlight>
|
||||
{isAdvancedOpen ? (
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
testID="direct-host-uri-input"
|
||||
nativeID="direct-host-uri-input"
|
||||
accessibilityLabel={t("pairing.direct.fields.connectionUri")}
|
||||
@@ -598,7 +598,3 @@ const ThemedChevronRight = withUnistyles(ChevronRight, (theme) => ({
|
||||
const ThemedEye = withUnistyles(Eye, (theme) => ({ color: theme.colors.foregroundMuted }));
|
||||
|
||||
const ThemedEyeOff = withUnistyles(EyeOff, (theme) => ({ color: theme.colors.foregroundMuted }));
|
||||
|
||||
const ThemedAdaptiveTextInput = withUnistyles(AdaptiveTextInput, (theme) => ({
|
||||
placeholderTextColor: theme.colors.foregroundMuted,
|
||||
}));
|
||||
|
||||
@@ -212,7 +212,7 @@ function PairLinkModalContent({
|
||||
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>{t("pairing.link.label")}</Text>
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
ref={inputRef}
|
||||
initialValue={initialUrl}
|
||||
testID="pair-link-input"
|
||||
@@ -234,11 +234,13 @@ function PairLinkModalContent({
|
||||
<Text style={styles.label}>
|
||||
{t("pairing.hostPassword.title", { host: parsedHostLabel(offerUrlRef.current) })}
|
||||
</Text>
|
||||
<ThemedAdaptiveTextInput
|
||||
<AdaptiveTextInput
|
||||
testID="pair-link-password-input"
|
||||
resetKey={`pair-link-password-${passwordResetKey}`}
|
||||
accessibilityLabel={t("pairing.hostPassword.label")}
|
||||
placeholder={t("pairing.hostPassword.label")}
|
||||
onChangeText={setPassword}
|
||||
autoFocus
|
||||
secureTextEntry
|
||||
style={styles.input}
|
||||
/>
|
||||
@@ -275,7 +277,3 @@ function PairLinkModalContent({
|
||||
}
|
||||
|
||||
const ThemedLink = withUnistyles(Link, (theme) => ({ color: theme.colors.accentForeground }));
|
||||
|
||||
const ThemedAdaptiveTextInput = withUnistyles(AdaptiveTextInput, (theme) => ({
|
||||
placeholderTextColor: theme.colors.foregroundMuted,
|
||||
}));
|
||||
|
||||
@@ -762,7 +762,7 @@ function ChatAgentContent({
|
||||
});
|
||||
const reportAttentionError = useCallback(
|
||||
(error: unknown) => {
|
||||
toastApi.show(String(error), { variant: "error", durationMs: null });
|
||||
toastApi.error(toErrorMessage(error));
|
||||
},
|
||||
[toastApi],
|
||||
);
|
||||
|
||||
@@ -449,7 +449,7 @@ test("a timed-out subscription rejects and cannot replay on reconnect", async ()
|
||||
h.open();
|
||||
await connecting;
|
||||
const observation = h.client.observeAgents({ timeout: 10 });
|
||||
await expect(observation.ready).rejects.toThrow(/timed out|timeout/i);
|
||||
await expect(observation.ready).rejects.toMatchObject({ code: "DAEMON_REQUEST_TIMEOUT" });
|
||||
await observation.release();
|
||||
const reconnecting = h.client.connect();
|
||||
h.open();
|
||||
|
||||
@@ -1492,7 +1492,7 @@ test("keeps the transport connected when a session RPC ping times out", async ()
|
||||
await connectPromise;
|
||||
expect(client.getConnectionState().status).toBe("connected");
|
||||
|
||||
await expect(client.ping({ timeoutMs: 1 })).rejects.toThrow("Timeout waiting for message");
|
||||
await expect(client.ping({ timeoutMs: 1 })).rejects.toThrow("No response to ping after");
|
||||
|
||||
expect(client.getConnectionState().status).toBe("connected");
|
||||
});
|
||||
@@ -1541,7 +1541,9 @@ test("bounds the wait for push token revocation", async () => {
|
||||
await connectPromise;
|
||||
|
||||
const revocation = client.unregisterPushToken("ExponentPushToken[test-device]");
|
||||
const rejection = expect(revocation).rejects.toThrow("Timeout waiting for message (2000ms)");
|
||||
const rejection = expect(revocation).rejects.toThrow(
|
||||
"No response to push.unregister.request after 2000ms",
|
||||
);
|
||||
await vi.advanceTimersByTimeAsync(1_999);
|
||||
expect(client.getConnectionState().status).toBe("connected");
|
||||
|
||||
@@ -1550,6 +1552,30 @@ test("bounds the wait for push token revocation", async () => {
|
||||
expect(client.getConnectionState().status).toBe("connected");
|
||||
});
|
||||
|
||||
test("identifies the request when marking an agent as read times out", async () => {
|
||||
useHeartbeatClock();
|
||||
const transport = createMockTransport();
|
||||
const client = new DaemonClient({
|
||||
url: "ws://test",
|
||||
clientId: "clsk_attention_timeout",
|
||||
reconnect: { enabled: false },
|
||||
transportFactory: () => transport.transport,
|
||||
});
|
||||
clients.push(client);
|
||||
const connected = client.connect();
|
||||
transport.triggerOpen();
|
||||
await connected;
|
||||
|
||||
const outcome = client.clearAgentAttention("agent-1").catch((error: unknown) => error);
|
||||
await vi.advanceTimersByTimeAsync(60_000);
|
||||
expect(await outcome).toMatchObject({
|
||||
name: "DaemonConnectionError",
|
||||
code: "DAEMON_REQUEST_TIMEOUT",
|
||||
message: "No response to clear_agent_attention after 60000ms",
|
||||
});
|
||||
expect(client.isConnected).toBe(true);
|
||||
});
|
||||
|
||||
test("defaults session RPC waiters to sixty seconds", async () => {
|
||||
useHeartbeatClock();
|
||||
const logger = createMockLogger();
|
||||
@@ -1594,7 +1620,7 @@ test("defaults session RPC waiters to sixty seconds", async () => {
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (60000ms)");
|
||||
await expect(responsePromise).rejects.toThrow("No response to fetch_agent_request after 60000ms");
|
||||
});
|
||||
|
||||
test("honors explicit fetchAgent timeout below the session RPC default", async () => {
|
||||
@@ -1642,7 +1668,7 @@ test("honors explicit fetchAgent timeout below the session RPC default", async (
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (5000ms)");
|
||||
await expect(responsePromise).rejects.toThrow("No response to fetch_agent_request after 5000ms");
|
||||
});
|
||||
|
||||
test("preserves legacy fetchAgent id overload", async () => {
|
||||
@@ -1806,7 +1832,9 @@ test("honors explicit fetchAgentTimeline timeout below the session RPC default",
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (2000ms)");
|
||||
await expect(responsePromise).rejects.toThrow(
|
||||
"No response to fetch_agent_timeline_request after 2000ms",
|
||||
);
|
||||
});
|
||||
|
||||
test("lists the full agent prompt index", async () => {
|
||||
@@ -1899,7 +1927,7 @@ test("honors explicit fetchAgents timeout below the session RPC default", async
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (1200ms)");
|
||||
await expect(responsePromise).rejects.toThrow("No response to fetch_agents_request after 1200ms");
|
||||
});
|
||||
|
||||
test("honors explicit shutdownServer timeout below the session RPC default", async () => {
|
||||
@@ -1945,7 +1973,9 @@ test("honors explicit shutdownServer timeout below the session RPC default", asy
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (1500ms)");
|
||||
await expect(responsePromise).rejects.toThrow(
|
||||
"No response to shutdown_server_request after 1500ms",
|
||||
);
|
||||
});
|
||||
|
||||
test("honors explicit getDaemonStatus timeout below the session RPC default", async () => {
|
||||
@@ -1991,7 +2021,9 @@ test("honors explicit getDaemonStatus timeout below the session RPC default", as
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (1500ms)");
|
||||
await expect(responsePromise).rejects.toThrow(
|
||||
"No response to daemon.get_status.request after 1500ms",
|
||||
);
|
||||
});
|
||||
|
||||
test("honors explicit getDaemonPairingOffer timeout below the session RPC default", async () => {
|
||||
@@ -2037,7 +2069,9 @@ test("honors explicit getDaemonPairingOffer timeout below the session RPC defaul
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(responsePromise).rejects.toThrow("Timeout waiting for message (1500ms)");
|
||||
await expect(responsePromise).rejects.toThrow(
|
||||
"No response to daemon.get_pairing_offer.request after 1500ms",
|
||||
);
|
||||
});
|
||||
|
||||
test("gates config reload on the daemon capability", async () => {
|
||||
@@ -2443,7 +2477,9 @@ test("keeps enable and disable inside the session RPC deadline", async () => {
|
||||
expect(settled).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
await expect(pending).rejects.toThrow("Timeout waiting for message (60000ms)");
|
||||
await expect(pending).rejects.toThrow(
|
||||
`No response to plugin.${action}.request after 60000ms`,
|
||||
);
|
||||
}
|
||||
} finally {
|
||||
vi.useRealTimers();
|
||||
@@ -8619,7 +8655,9 @@ test("usage request timeout detaches its update listener", async () => {
|
||||
const result = client.listUsageReports({ requestId: "timeout-usage" }, (report) =>
|
||||
updates.push(report),
|
||||
);
|
||||
const rejected = expect(result).rejects.toThrow("Timeout waiting for message (60000ms)");
|
||||
const rejected = expect(result).rejects.toThrow(
|
||||
"No response to usage.list_reports.request after 60000ms",
|
||||
);
|
||||
await vi.advanceTimersByTimeAsync(60_001);
|
||||
await rejected;
|
||||
mock.triggerMessage(
|
||||
@@ -9403,7 +9441,7 @@ test("RPC deadlines remain active while a preceding frame waits for drain", asyn
|
||||
blocked = true;
|
||||
const first = client.sendHostFrame("route", new Uint8Array([1]));
|
||||
try {
|
||||
await expect(client.ping({ timeoutMs: 20 })).rejects.toThrow("Timeout waiting for message");
|
||||
await expect(client.ping({ timeoutMs: 20 })).rejects.toThrow("No response to ping after");
|
||||
expect(client.isConnected).toBe(true);
|
||||
} finally {
|
||||
drain();
|
||||
|
||||
@@ -1023,6 +1023,7 @@ interface WaitHandle<T> {
|
||||
interface WaitOptions {
|
||||
skipQueue?: boolean;
|
||||
requestId?: string;
|
||||
requestType?: SessionInboundMessage["type"];
|
||||
}
|
||||
|
||||
interface CorrelatedResponseIdentity {
|
||||
@@ -2359,7 +2360,7 @@ export class DaemonClient {
|
||||
return { kind: "ok", value };
|
||||
},
|
||||
timeout,
|
||||
{ ...params.options, requestId: params.requestId },
|
||||
{ ...params.options, requestId: params.requestId, requestType: params.message.type },
|
||||
);
|
||||
|
||||
// The response deadline still applies while the transport waits for drain.
|
||||
@@ -8107,7 +8108,9 @@ export class DaemonClient {
|
||||
): WaitHandle<T> {
|
||||
// Capture stack trace at call site, not inside setTimeout
|
||||
const timeoutError = new DaemonConnectionError(
|
||||
`Timeout waiting for message (${timeout}ms)`,
|
||||
options?.requestType
|
||||
? `No response to ${options.requestType} after ${timeout}ms`
|
||||
: `Timeout waiting for message (${timeout}ms)`,
|
||||
"DAEMON_REQUEST_TIMEOUT",
|
||||
);
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^0.17.1",
|
||||
"@anthropic-ai/claude-agent-sdk": "0.3.246",
|
||||
"@anthropic-ai/claude-agent-sdk": "0.3.326",
|
||||
"@anthropic-ai/sdk": "^0.104.2",
|
||||
"@getpaseo/client": "0.16.0",
|
||||
"@getpaseo/highlight": "0.16.0",
|
||||
|
||||
@@ -13532,6 +13532,33 @@ test("the last assistant message is the newest turn's reply, not joined to the p
|
||||
}
|
||||
});
|
||||
|
||||
test("the last assistant message read from rebuilt history is the newest reply, not joined to the one before it", async () => {
|
||||
// Rows replayed from provider history have no turn id. A reply the agent starts on its own,
|
||||
// such as Claude waking after a background subagent, follows the previous reply with no user
|
||||
// message between them; only their message ids tell them apart.
|
||||
const workdir = mkdtempSync(join(tmpdir(), "agent-manager-history-last-reply-"));
|
||||
const codex = fakeCodexEmitting({
|
||||
historyItems: [
|
||||
{ type: "user_message", text: "Start a background task.", messageId: "user-1" },
|
||||
{ type: "assistant_message", text: "Started it, ", messageId: "message-1" },
|
||||
{ type: "assistant_message", text: "I will report back.", messageId: "message-1" },
|
||||
{ type: "assistant_message", text: "The task finished.", messageId: "message-2" },
|
||||
],
|
||||
});
|
||||
const manager = new AgentManager({ clients: { codex }, logger });
|
||||
const agent = await manager.createAgent({ provider: "codex", cwd: workdir }, undefined, {
|
||||
workspaceId: undefined,
|
||||
});
|
||||
try {
|
||||
await manager.hydrateTimelineFromProvider(agent.id, { force: true });
|
||||
|
||||
expect(await manager.getLastAssistantMessage(agent.id)).toBe("The task finished.");
|
||||
} finally {
|
||||
await manager.closeAgent(agent.id);
|
||||
rmSync(workdir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("reads the last durable assistant response without loading a stored-only child", async () => {
|
||||
const store = new RecordingTimelineStore();
|
||||
await store.appendCommitted("stored-child", {
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ProviderOptionsValidationError } from "./provider-options.js";
|
||||
import type { AgentToolResult } from "@getpaseo/plugin/server";
|
||||
import type { RuntimeCleanupCandidate } from "./idle-runtime-cleanup/index.js";
|
||||
import { AgentNotFoundError, ensureAgentLoaded } from "./agent-loading.js";
|
||||
import { projectTimelineRows } from "./timeline-projection.js";
|
||||
import { continuesAssistantMessage, projectTimelineRows } from "./timeline-projection.js";
|
||||
import type { PluginLifecycle } from "../plugins/lifecycle/index.js";
|
||||
import { describeHookAgent, publishAgentStream } from "../plugins/lifecycle/index.js";
|
||||
import { applyRecordPatch } from "../record-patch.js";
|
||||
@@ -4058,24 +4058,16 @@ export class AgentManager {
|
||||
private getLastAssistantMessageSegmentFromTimeline(
|
||||
timeline: readonly Pick<AgentTimelineRow, "item" | "turnId">[],
|
||||
): { text: string; startsAtBeginning: boolean } | null {
|
||||
// Collect the last contiguous assistant messages of one turn (Claude streams chunks).
|
||||
// A turn the provider starts on its own has no user message before its reply.
|
||||
// Collect the chunks of the last assistant message (Claude streams chunks). A turn the
|
||||
// provider starts on its own has no user message before its reply.
|
||||
const chunks: string[] = [];
|
||||
let replyTurnId: string | undefined;
|
||||
let startsAtBeginning = false;
|
||||
for (let i = timeline.length - 1; i >= 0; i--) {
|
||||
const { item, turnId } = timeline[i];
|
||||
if (item.type !== "assistant_message") {
|
||||
if (chunks.length) {
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (chunks.length === 0) {
|
||||
replyTurnId = turnId;
|
||||
} else if (turnId !== replyTurnId) {
|
||||
const { item } = timeline[i];
|
||||
if (chunks.length > 0 && !continuesAssistantMessage(timeline[i], timeline[i + 1])) {
|
||||
break;
|
||||
}
|
||||
if (item.type !== "assistant_message") continue;
|
||||
chunks.push(item.text);
|
||||
startsAtBeginning = i === 0;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,6 @@ import {
|
||||
} from "./copilot-acp-agent.js";
|
||||
import { GenericACPAgentClient } from "./generic-acp-agent.js";
|
||||
import { parseKiroExtensionCommands } from "./kiro-acp-agent.js";
|
||||
import { transformPiModels } from "./pi/agent.js";
|
||||
import type { AgentStreamEvent } from "../agent-sdk-types.js";
|
||||
import type {
|
||||
AgentCapabilityFlags,
|
||||
@@ -2260,7 +2259,12 @@ describe("ACPAgentClient modelTransformer", () => {
|
||||
provider: "pi",
|
||||
logger: createTestLogger(),
|
||||
defaultCommand: ["test-acp"],
|
||||
modelTransformer: transformPiModels,
|
||||
modelTransformer: (models) =>
|
||||
models.map((model) => ({
|
||||
...model,
|
||||
label: model.label.split("/").at(-1) ?? model.label,
|
||||
description: model.id,
|
||||
})),
|
||||
});
|
||||
|
||||
await expect(
|
||||
@@ -2914,60 +2918,6 @@ describe("ACP providers advertise session listing", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("transformPiModels", () => {
|
||||
test("keeps slash-free labels unchanged", () => {
|
||||
expect(
|
||||
transformPiModels([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "gpt-4.1-mini",
|
||||
label: "GPT 4.1 Mini",
|
||||
description: "Fast",
|
||||
},
|
||||
]),
|
||||
).toEqual([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "gpt-4.1-mini",
|
||||
label: "GPT 4.1 Mini",
|
||||
description: "Fast",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
test("uses the last path segment as label and preserves existing descriptions", () => {
|
||||
expect(
|
||||
transformPiModels([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/openai/gpt-4.1-mini",
|
||||
label: "openrouter/openai/gpt-4.1-mini",
|
||||
description: undefined,
|
||||
},
|
||||
{
|
||||
provider: "pi",
|
||||
id: "anthropic/claude-sonnet-4",
|
||||
label: "anthropic/claude-sonnet-4",
|
||||
description: "Balanced",
|
||||
},
|
||||
]),
|
||||
).toEqual([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/openai/gpt-4.1-mini",
|
||||
label: "gpt-4.1-mini",
|
||||
description: "openrouter/openai/gpt-4.1-mini",
|
||||
},
|
||||
{
|
||||
provider: "pi",
|
||||
id: "anthropic/claude-sonnet-4",
|
||||
label: "claude-sonnet-4",
|
||||
description: "Balanced",
|
||||
},
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("ACPAgentSession slash commands", () => {
|
||||
test("returns immediately for ACP sessions that do not wait for async command discovery", async () => {
|
||||
const session = new ACPAgentSession(
|
||||
|
||||
@@ -91,7 +91,7 @@ test.each([
|
||||
}
|
||||
});
|
||||
|
||||
test("bypass allows execution without publishing permission events and follows live mode changes", async () => {
|
||||
async function createBypassSession() {
|
||||
let requestPermission: CanUseTool | undefined;
|
||||
const query = Object.assign((async function* () {})(), {
|
||||
async setPermissionMode(_mode: PermissionMode) {},
|
||||
@@ -112,17 +112,25 @@ test("bypass allows execution without publishing permission events and follows l
|
||||
});
|
||||
const events: AgentStreamEvent[] = [];
|
||||
session.subscribe((event) => events.push(event));
|
||||
await session.setMode("bypassPermissions");
|
||||
if (!requestPermission) throw new Error("SDK permission callback was not installed");
|
||||
return { session, events, requestPermission };
|
||||
}
|
||||
|
||||
test("bypass approves Claude's own checks without publishing permission events and follows live mode changes", async () => {
|
||||
const { session, events, requestPermission } = await createBypassSession();
|
||||
try {
|
||||
await session.setMode("bypassPermissions");
|
||||
if (!requestPermission) throw new Error("SDK permission callback was not installed");
|
||||
const controller = new AbortController();
|
||||
const input = { command: "echo hello" };
|
||||
const result = requestPermission("Bash", input, {
|
||||
const input = { command: "rm -rf build" };
|
||||
// Claude Code sends these fields, but this SDK version does not declare them on CanUseTool.
|
||||
const ownCheck = {
|
||||
signal: controller.signal,
|
||||
toolUseID: "execution",
|
||||
decisionReason: "Explicit ask rule",
|
||||
});
|
||||
// Abort also settles the pre-fix callback, so this repro never hangs.
|
||||
decisionReason: "Dangerous rm command",
|
||||
decisionReasonType: "safetyCheck",
|
||||
};
|
||||
const result = requestPermission("Bash", input, ownCheck);
|
||||
// Abort also settles a prompting callback, so this test never hangs.
|
||||
controller.abort();
|
||||
await expect(result).resolves.toMatchObject({ behavior: "allow", updatedInput: input });
|
||||
expect(events.filter((event) => event.type.startsWith("permission_"))).toEqual([]);
|
||||
@@ -135,6 +143,7 @@ test("bypass allows execution without publishing permission events and follows l
|
||||
] as const) {
|
||||
await session.setMode(mode);
|
||||
const resolution = requestPermission(tool, toolInput, {
|
||||
...ownCheck,
|
||||
signal: new AbortController().signal,
|
||||
toolUseID: tool,
|
||||
});
|
||||
@@ -149,3 +158,44 @@ test("bypass allows execution without publishing permission events and follows l
|
||||
await session.close();
|
||||
}
|
||||
});
|
||||
|
||||
test.each([
|
||||
["an ask rule", { decisionReasonType: "rule" }],
|
||||
["a hook", { decisionReasonType: "hook", decisionReason: "Confirm before posting" }],
|
||||
[
|
||||
"an ask rule on Claude's own check",
|
||||
{
|
||||
decisionReasonType: "safetyCheck",
|
||||
matchedAskRule: { source: "policySettings", toolName: "Bash", ruleContent: "rm *" },
|
||||
},
|
||||
],
|
||||
[
|
||||
"a tool the user answers on the card",
|
||||
{ decisionReasonType: "other", requiresUserInteraction: true },
|
||||
],
|
||||
["a compound command with an ask rule in one part", { decisionReasonType: "subcommandResults" }],
|
||||
[
|
||||
"a read the user blocked outside the working directories",
|
||||
{ decisionReasonType: "safetyCheck", decisionReasonCode: "outside_reads_blocked" },
|
||||
],
|
||||
[
|
||||
"an organization's ask limit",
|
||||
{ decisionReasonType: "workingDir", decisionReasonCode: "org_ask_ceiling" },
|
||||
],
|
||||
["a sandbox override the user's read block raised", { decisionReasonType: "sandboxOverride" }],
|
||||
["a Claude Code that does not say why it asks", {}],
|
||||
])("bypass still asks the user about %s", async (_source, why) => {
|
||||
const { session, events, requestPermission } = await createBypassSession();
|
||||
try {
|
||||
const ask = { signal: new AbortController().signal, toolUseID: "execution", ...why };
|
||||
const resolution = requestPermission("Bash", { command: "gh pr comment 1" }, ask);
|
||||
const requestEvent = events.at(-1);
|
||||
expect(requestEvent?.type).toBe("permission_requested");
|
||||
if (requestEvent?.type !== "permission_requested")
|
||||
throw new Error("Missing permission request");
|
||||
await session.respondToPermission(requestEvent.request.id, { behavior: "deny" });
|
||||
await expect(resolution).resolves.toMatchObject({ behavior: "deny" });
|
||||
} finally {
|
||||
await session.close();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -11,6 +11,7 @@ import path from "node:path";
|
||||
import { LRUCache } from "lru-cache";
|
||||
import stripAnsi from "strip-ansi";
|
||||
import { createImportDescriptorScheduler } from "./import-descriptor-scheduler.js";
|
||||
import { bypassApprovesAsk } from "./bypass-approval.js";
|
||||
import {
|
||||
type AgentDefinition,
|
||||
type CanUseTool,
|
||||
@@ -83,7 +84,7 @@ import {
|
||||
type ClaudeProviderOptions,
|
||||
} from "./options.js";
|
||||
import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
|
||||
import { discoverClaudeModels } from "./model-discovery.js";
|
||||
import { discoverClaudeModels, killExitingClaudeModelDiscoveries } from "./model-discovery.js";
|
||||
import { claudeQuery, type ClaudeOptions, type ClaudeQueryFactory } from "./query.js";
|
||||
import {
|
||||
findSteeredMessageParent,
|
||||
@@ -1751,6 +1752,10 @@ export class ClaudeAgentClient implements AgentClient {
|
||||
};
|
||||
}
|
||||
|
||||
async shutdown(): Promise<void> {
|
||||
await killExitingClaudeModelDiscoveries();
|
||||
}
|
||||
|
||||
async resolveDefaultModeId({ env: launchEnv }: ResolveAgentDefaultModeInput): Promise<string> {
|
||||
return claudeModeCatalog(this.buildProviderEnv(launchEnv)).defaultModeId;
|
||||
}
|
||||
@@ -5307,10 +5312,8 @@ class ClaudeAgentSession implements AgentSession {
|
||||
input,
|
||||
options,
|
||||
): Promise<PermissionResult> => {
|
||||
// Decide before publishing anything: bypassed tools never enter the permission UI.
|
||||
// Claude also routes questions and plan review through this callback.
|
||||
const needsUserAnswer = toolName === "AskUserQuestion" || toolName === "ExitPlanMode";
|
||||
if (this.currentMode === "bypassPermissions" && !needsUserAnswer) {
|
||||
// Decide before publishing anything: bypassed asks never enter the permission UI.
|
||||
if (this.currentMode === "bypassPermissions" && bypassApprovesAsk(toolName, options)) {
|
||||
return { behavior: "allow", updatedInput: input, toolUseID: options.toolUseID };
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import type { CanUseTool } from "@anthropic-ai/claude-agent-sdk";
|
||||
|
||||
type PermissionOptions = Parameters<CanUseTool>[2];
|
||||
|
||||
// In bypassPermissions, Claude Code still forwards an ask when the user configured one
|
||||
// (a permissions.ask rule, including managed policy, or a PreToolUse hook), when the tool
|
||||
// needs an answer, or when one of its own checks fires. Bypass approves only Claude's own
|
||||
// checks. A missing or unknown reason type stays with the user.
|
||||
// `subcommandResults` is left out: a compound or piped command uses it as a container,
|
||||
// including when a user's ask rule matched one of its parts. `sandboxOverride` is left
|
||||
// out: in Bypass, Claude Code forwards it only when the user's read block or hook raised it.
|
||||
const CLAUDE_OWN_CHECK_TYPES: ReadonlySet<string> = new Set([
|
||||
"safetyCheck",
|
||||
"workingDir",
|
||||
"mode",
|
||||
"classifier",
|
||||
"asyncAgent",
|
||||
]);
|
||||
|
||||
// Settings the user or organization chose, which Claude Code reports under its own types:
|
||||
// permissions.blockReadsOutsideWorkingDirectories, and an organization's ask limit.
|
||||
const CONFIGURED_ASK_CODES: ReadonlySet<string> = new Set([
|
||||
"outside_reads_blocked",
|
||||
"org_ask_ceiling",
|
||||
]);
|
||||
|
||||
const QUESTION_TOOLS: ReadonlySet<string> = new Set(["AskUserQuestion", "ExitPlanMode"]);
|
||||
|
||||
export function bypassApprovesAsk(toolName: string, options: PermissionOptions): boolean {
|
||||
if (QUESTION_TOOLS.has(toolName) || options.matchedAskRule) {
|
||||
return false;
|
||||
}
|
||||
// The SDK forwards these from Claude Code without declaring them on CanUseTool.
|
||||
if ("requiresUserInteraction" in options && options.requiresUserInteraction === true) {
|
||||
return false;
|
||||
}
|
||||
const reasonCode = "decisionReasonCode" in options ? options.decisionReasonCode : undefined;
|
||||
if (typeof reasonCode === "string" && CONFIGURED_ASK_CODES.has(reasonCode)) {
|
||||
return false;
|
||||
}
|
||||
const reasonType = "decisionReasonType" in options ? options.decisionReasonType : undefined;
|
||||
return typeof reasonType === "string" && CLAUDE_OWN_CHECK_TYPES.has(reasonType);
|
||||
}
|
||||
@@ -6,6 +6,10 @@ import type { ProviderRuntimeSettings } from "../../provider-launch-config.js";
|
||||
import { terminateWithTreeKill } from "../../../../utils/tree-kill.js";
|
||||
import { claudeQuery, type ClaudeQueryInput, type ClaudeQueryContext } from "./query.js";
|
||||
|
||||
const DISCOVERY_WAIT_MS = 5_000;
|
||||
// Long enough for the CLI to finish an OAuth token refresh it started before the wait ended.
|
||||
const DISCOVERY_EXIT_GRACE_MS = 60_000;
|
||||
|
||||
interface ClaudeModelDiscoveryOptions {
|
||||
resolveBinary: () => Promise<string>;
|
||||
runtimeSettings?: ProviderRuntimeSettings;
|
||||
@@ -18,19 +22,24 @@ type OpenDiscoveryQuery = (
|
||||
context: ClaudeQueryContext,
|
||||
) => Pick<Query, "supportedModels" | "close">;
|
||||
|
||||
type DiscoveryQuery = ReturnType<OpenDiscoveryQuery>;
|
||||
|
||||
// Discovery processes left to exit on their own after their caller stopped waiting.
|
||||
const exitingDiscoveries = new Map<ChildProcess, () => Promise<void>>();
|
||||
|
||||
// The curated catalog survives a failed or slow probe. This process never receives
|
||||
// a prompt and must not persist a session or launch user MCP servers/hooks.
|
||||
export async function discoverClaudeModels(
|
||||
options: ClaudeModelDiscoveryOptions,
|
||||
openQuery: OpenDiscoveryQuery = claudeQuery,
|
||||
): Promise<ModelInfo[]> {
|
||||
const controller = new AbortController();
|
||||
const waitController = new AbortController();
|
||||
const signal = options.signal
|
||||
? AbortSignal.any([options.signal, controller.signal])
|
||||
: controller.signal;
|
||||
? AbortSignal.any([options.signal, waitController.signal])
|
||||
: waitController.signal;
|
||||
const timer = setTimeout(
|
||||
() => controller.abort(new Error("Claude model discovery timed out")),
|
||||
5_000,
|
||||
() => waitController.abort(new Error("Claude model discovery timed out")),
|
||||
DISCOVERY_WAIT_MS,
|
||||
);
|
||||
let endInput!: () => void;
|
||||
const ended = new Promise<void>((resolve) => {
|
||||
@@ -46,7 +55,7 @@ export async function discoverClaudeModels(
|
||||
};
|
||||
},
|
||||
};
|
||||
let query: ReturnType<OpenDiscoveryQuery> | undefined;
|
||||
let query: DiscoveryQuery | undefined;
|
||||
let child: ChildProcess | undefined;
|
||||
try {
|
||||
signal.throwIfAborted();
|
||||
@@ -64,7 +73,8 @@ export async function discoverClaudeModels(
|
||||
strictMcpConfig: true,
|
||||
settingSources: ["user"],
|
||||
settings: { disableAllHooks: true },
|
||||
abortController: controller,
|
||||
// No abortController: the SDK kills the process when it aborts, and the end of
|
||||
// the wait must not.
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -78,12 +88,56 @@ export async function discoverClaudeModels(
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
endInput();
|
||||
try {
|
||||
query?.close();
|
||||
} finally {
|
||||
if (child) {
|
||||
await terminateWithTreeKill(child, { gracefulTimeoutMs: 200, forceTimeoutMs: 200 });
|
||||
}
|
||||
if (query && child && !hasExited(child)) {
|
||||
// The CLI may be refreshing an expired OAuth token, even after it has answered.
|
||||
// Claude Code rotates the refresh token before saving the new pair, so killing it now
|
||||
// leaves a revoked token on disk and logs the user out (#9314). With its input ended
|
||||
// it exits once that work is done; the grace period and daemon shutdown bound the wait.
|
||||
letDiscoveryExit(query, child);
|
||||
} else {
|
||||
await retireDiscovery(query, child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Kills discovery processes still exiting after their wait ended. Called on daemon shutdown. */
|
||||
export async function killExitingClaudeModelDiscoveries(): Promise<void> {
|
||||
await Promise.all(Array.from(exitingDiscoveries.values(), (kill) => kill()));
|
||||
}
|
||||
|
||||
function letDiscoveryExit(query: DiscoveryQuery, child: ChildProcess): void {
|
||||
function forget(): void {
|
||||
clearTimeout(graceTimer);
|
||||
child.off("exit", onExit);
|
||||
exitingDiscoveries.delete(child);
|
||||
}
|
||||
function onExit(): void {
|
||||
forget();
|
||||
query.close();
|
||||
}
|
||||
async function kill(): Promise<void> {
|
||||
forget();
|
||||
await retireDiscovery(query, child);
|
||||
}
|
||||
const graceTimer = setTimeout(() => void kill(), DISCOVERY_EXIT_GRACE_MS);
|
||||
graceTimer.unref();
|
||||
child.once("exit", onExit);
|
||||
exitingDiscoveries.set(child, kill);
|
||||
}
|
||||
|
||||
async function retireDiscovery(
|
||||
query: DiscoveryQuery | undefined,
|
||||
child: ChildProcess | undefined,
|
||||
): Promise<void> {
|
||||
try {
|
||||
query?.close();
|
||||
} finally {
|
||||
if (child) {
|
||||
await terminateWithTreeKill(child, { gracefulTimeoutMs: 200, forceTimeoutMs: 200 });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function hasExited(child: ChildProcess): boolean {
|
||||
return child.exitCode !== null || child.signalCode !== null;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { ChildProcess } from "node:child_process";
|
||||
import * as fs from "node:fs/promises";
|
||||
import * as os from "node:os";
|
||||
import * as path from "node:path";
|
||||
@@ -1173,4 +1174,127 @@ describe("Claude model discovery process", () => {
|
||||
await expect(result).rejects.toBe(failure);
|
||||
expect(closed).toBe(true);
|
||||
});
|
||||
|
||||
describe("when the CLI is still starting up at the deadline", () => {
|
||||
// Without a pid, terminateWithTreeKill signals the child directly instead of a real tree.
|
||||
class StartingClaudeProcess extends ChildProcess {
|
||||
readonly signals: string[] = [];
|
||||
override kill(signal?: NodeJS.Signals | number): boolean {
|
||||
this.signals.push(String(signal));
|
||||
this.emit("exit", null, signal);
|
||||
return true;
|
||||
}
|
||||
exitOnItsOwn(): void {
|
||||
this.emit("exit", 0, null);
|
||||
}
|
||||
}
|
||||
|
||||
interface StalledDiscoveryState {
|
||||
closed: boolean;
|
||||
inputEnded: boolean;
|
||||
}
|
||||
|
||||
async function recordInputEnd(
|
||||
prompt: AsyncIterable<unknown>,
|
||||
state: StalledDiscoveryState,
|
||||
): Promise<void> {
|
||||
await prompt[Symbol.asyncIterator]().next();
|
||||
state.inputEnded = true;
|
||||
}
|
||||
|
||||
// By default the CLI never answers: an expired OAuth token is refreshed first.
|
||||
function startStalledDiscovery(
|
||||
supportedModels: () => Promise<ModelInfo[]> = () => new Promise<ModelInfo[]>(() => {}),
|
||||
) {
|
||||
const child = new StartingClaudeProcess();
|
||||
const state: StalledDiscoveryState = { closed: false, inputEnded: false };
|
||||
const result = discoverClaudeModels(
|
||||
{ resolveBinary: async () => "/claude", env: {} },
|
||||
(input, context) => {
|
||||
if (typeof input.prompt === "string") throw new Error("unexpected inference prompt");
|
||||
void recordInputEnd(input.prompt, state);
|
||||
context.onChildProcess?.(child);
|
||||
return {
|
||||
supportedModels,
|
||||
close: () => {
|
||||
state.closed = true;
|
||||
},
|
||||
};
|
||||
},
|
||||
);
|
||||
return { child, state, result };
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it("stops waiting at the limit but lets the CLI finish instead of killing it", async () => {
|
||||
vi.useFakeTimers();
|
||||
const { child, state, result } = startStalledDiscovery();
|
||||
const settled = expect(result).rejects.toThrow("Claude model discovery timed out");
|
||||
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
await settled;
|
||||
expect(state.inputEnded).toBe(true);
|
||||
expect(child.signals).toEqual([]);
|
||||
expect(state.closed).toBe(false);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(59_999);
|
||||
expect(child.signals).toEqual([]);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
expect(child.signals).toEqual(["SIGTERM"]);
|
||||
expect(state.closed).toBe(true);
|
||||
});
|
||||
|
||||
async function answerAtOnce(): Promise<ModelInfo[]> {
|
||||
return [];
|
||||
}
|
||||
|
||||
it("lets the CLI finish after it answers instead of killing it", async () => {
|
||||
// The CLI answers supportedModels() before its startup token refresh has saved the
|
||||
// rotated refresh token, so a kill right after the answer also logs the user out.
|
||||
vi.useFakeTimers();
|
||||
const { child, state, result } = startStalledDiscovery(answerAtOnce);
|
||||
await expect(result).resolves.toEqual([]);
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(state.inputEnded).toBe(true);
|
||||
expect(child.signals).toEqual([]);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1_000);
|
||||
child.exitOnItsOwn();
|
||||
expect(state.closed).toBe(true);
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
expect(child.signals).toEqual([]);
|
||||
});
|
||||
|
||||
it("never signals a CLI that exits on its own during the grace period", async () => {
|
||||
vi.useFakeTimers();
|
||||
const { child, state, result } = startStalledDiscovery();
|
||||
const settled = expect(result).rejects.toThrow("Claude model discovery timed out");
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
await settled;
|
||||
|
||||
await vi.advanceTimersByTimeAsync(2_000);
|
||||
child.exitOnItsOwn();
|
||||
expect(state.closed).toBe(true);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
expect(child.signals).toEqual([]);
|
||||
});
|
||||
|
||||
it("tree-kills a still-running CLI when the daemon shuts down", async () => {
|
||||
vi.useFakeTimers();
|
||||
const { child, state, result } = startStalledDiscovery();
|
||||
const settled = expect(result).rejects.toThrow("Claude model discovery timed out");
|
||||
await vi.advanceTimersByTimeAsync(5_000);
|
||||
await settled;
|
||||
expect(child.signals).toEqual([]);
|
||||
|
||||
await new ClaudeAgentClient({ logger: createTestLogger() }).shutdown();
|
||||
expect(child.signals).toEqual(["SIGTERM"]);
|
||||
expect(state.closed).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2215,6 +2215,36 @@ describe("Codex app-server provider", () => {
|
||||
appServer.assertNoErrors();
|
||||
});
|
||||
|
||||
test("lets idle cleanup release a session opened only to read its history", async () => {
|
||||
let spawns = 0;
|
||||
const appServer = createFakeCodexAppServer({
|
||||
"thread/resume": () =>
|
||||
Promise.reject(new Error(archivedThreadErrorMessage("archived-thread-id"))),
|
||||
"thread/read": () => ({ thread: { turns: [] } }),
|
||||
});
|
||||
const provider = new CodexAppServerAgentClient(createTestLogger(), undefined, {
|
||||
appServerProcess: createFakeCodexAppServerProcess(() => {
|
||||
spawns += 1;
|
||||
return appServer.child;
|
||||
}),
|
||||
});
|
||||
const internals = castInternals<{
|
||||
goalsEnabledPromise: Promise<boolean> | null;
|
||||
autoReviewEnabledPromise: Promise<boolean> | null;
|
||||
}>(provider);
|
||||
internals.goalsEnabledPromise = Promise.resolve(false);
|
||||
internals.autoReviewEnabledPromise = Promise.resolve(false);
|
||||
|
||||
const session = await provider.resumeSession(archivedThreadHandle(), undefined, undefined, {
|
||||
purpose: "history",
|
||||
});
|
||||
|
||||
expect(await session.canStopRuntime!()).toBe(true);
|
||||
expect(spawns).toBe(1);
|
||||
await session.close();
|
||||
appServer.assertNoErrors();
|
||||
});
|
||||
|
||||
test("unarchives Codex when an active Paseo agent resumes an archived thread", async () => {
|
||||
const threadRequests: string[] = [];
|
||||
let resumeAttempts = 0;
|
||||
|
||||
@@ -5341,6 +5341,8 @@ export class CodexAppServerAgentSession implements AgentSession {
|
||||
}
|
||||
|
||||
async canStopRuntime(): Promise<boolean> {
|
||||
// A history session released its app-server once it read the thread, so nothing runs.
|
||||
if (this.connectionState === "history-ready") return true;
|
||||
if (
|
||||
!this.client ||
|
||||
this.client.hasPendingRequests() ||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
// Drops an upstream "Vendor: " prefix ("OpenAI: GPT-5.5"). A colon inside parentheses or after a
|
||||
// comma belongs to the model name ("DeepSeek V4 (ctx: 128k)"), so it is kept.
|
||||
function stripVendorPrefix(label: string): string {
|
||||
const vendorSeparatorIndex = label.indexOf(": ");
|
||||
if (vendorSeparatorIndex === -1 || /[(),]/.test(label.slice(0, vendorSeparatorIndex))) {
|
||||
return label;
|
||||
}
|
||||
return label.slice(vendorSeparatorIndex + 2).trim();
|
||||
}
|
||||
|
||||
// The label Pi and OMP show for a model from their catalogs. A model name is either a path
|
||||
// ("google/gemini_2.5-flash", as OpenRouter reports it) or free text that can contain slashes
|
||||
// and underscores ("IQ3_S ... 52/56"). Only paths are shortened.
|
||||
export function modelDisplayLabel(model: { id: string; name?: string }): string {
|
||||
const text = model.name?.trim().replace(/\s+/g, " ") || model.id.trim();
|
||||
if (/\s/.test(text)) {
|
||||
return stripVendorPrefix(text);
|
||||
}
|
||||
const lastSegment = text.split("/").findLast((segment) => segment.length > 0) ?? text;
|
||||
return stripVendorPrefix(lastSegment.replace(/_+/g, " "));
|
||||
}
|
||||
@@ -1855,3 +1855,69 @@ test("closing OMP during image conversion rejects its pending start", async () =
|
||||
await session.close();
|
||||
await rejected;
|
||||
});
|
||||
|
||||
describe("OMP catalog model labels", () => {
|
||||
test.each([
|
||||
{
|
||||
name: "keeps slashes and underscores inside a free-text model name",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "s-q3fn(p-t)",
|
||||
name: "Qwen3.8 Flash Next IQ3_S, prior + tail skip (fastest, ~60-70 tok/s on 0.2.10, 52/56)",
|
||||
},
|
||||
label: "Qwen3.8 Flash Next IQ3_S, prior + tail skip (fastest, ~60-70 tok/s on 0.2.10, 52/56)",
|
||||
},
|
||||
{
|
||||
name: "keeps a free-text name that ends in a slash-separated word",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "ds-strata-6",
|
||||
name: "DeepSeek V4.1 Flash 2.25bpw via Strata (full 6 experts, untested, ~5-6 tok/s)",
|
||||
},
|
||||
label: "DeepSeek V4.1 Flash 2.25bpw via Strata (full 6 experts, untested, ~5-6 tok/s)",
|
||||
},
|
||||
{
|
||||
name: "keeps a colon inside a free-text model name",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "qwen3-tail",
|
||||
name: "Qwen3 IQ3_S (tail skip: on, 52/56)",
|
||||
},
|
||||
label: "Qwen3 IQ3_S (tail skip: on, 52/56)",
|
||||
},
|
||||
{
|
||||
name: "keeps an OMP catalog name as it is",
|
||||
model: {
|
||||
provider: "openrouter",
|
||||
id: "anthropic/claude-opus-4.1:batch",
|
||||
name: "Claude Opus 4.1 (batch)",
|
||||
},
|
||||
label: "Claude Opus 4.1 (batch)",
|
||||
},
|
||||
{
|
||||
name: "drops the vendor prefix from an upstream model name",
|
||||
model: { provider: "openrouter", id: "openai/gpt-5.5", name: "OpenAI: GPT-5.5" },
|
||||
label: "GPT-5.5",
|
||||
},
|
||||
{
|
||||
name: "falls back to the last segment of a path-like id",
|
||||
model: { provider: "pioneer", id: "canada-quant/glm_5.2" },
|
||||
label: "glm 5.2",
|
||||
},
|
||||
])("$name", async ({ model, label }) => {
|
||||
const runtime = new FakeOmp();
|
||||
runtime.queueSessionSetup((session) => {
|
||||
session.models = [model];
|
||||
});
|
||||
const client = new OmpAgentClient({ logger: createTestLogger(), runtime });
|
||||
|
||||
const catalog = await client.fetchCatalog({
|
||||
scope: "workspace",
|
||||
cwd: "/workspace/project",
|
||||
force: false,
|
||||
});
|
||||
|
||||
expect(catalog.models.map((entry) => entry.label)).toEqual([label]);
|
||||
expect(catalog.models[0]?.id).toBe(`${model.provider}/${model.id}`);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -15,7 +15,6 @@ import {
|
||||
type AgentLaunchContext,
|
||||
type AgentMetadata,
|
||||
type AgentMode,
|
||||
type AgentModelDefinition,
|
||||
type AgentPermissionRequest,
|
||||
type AgentPermissionResponse,
|
||||
type AgentProviderNotice,
|
||||
@@ -252,36 +251,6 @@ interface OmpSlashCommandInvocation {
|
||||
|
||||
type AutoCompactMode = boolean | "toggle" | "unknown";
|
||||
|
||||
function normalizeOmpModelLabel(label: string): string {
|
||||
const normalizedLabel = label.trim().replace(/[_\s]+/g, " ");
|
||||
const vendorSeparatorIndex = normalizedLabel.indexOf(": ");
|
||||
if (vendorSeparatorIndex === -1) {
|
||||
return normalizedLabel;
|
||||
}
|
||||
|
||||
return normalizedLabel.slice(vendorSeparatorIndex + 2).trim();
|
||||
}
|
||||
|
||||
export function transformOmpModels(models: AgentModelDefinition[]): AgentModelDefinition[] {
|
||||
return models.map((model) => {
|
||||
if (!model.label.includes("/")) {
|
||||
return model;
|
||||
}
|
||||
|
||||
const segments = model.label.split("/").filter((segment) => segment.length > 0);
|
||||
const rawLabel = segments.at(-1);
|
||||
if (!rawLabel) {
|
||||
return model;
|
||||
}
|
||||
|
||||
return {
|
||||
...model,
|
||||
label: normalizeOmpModelLabel(rawLabel),
|
||||
description: model.description ?? model.label,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function isOmpThinkingLevel(value: string | null | undefined): value is OmpThinkingLevel {
|
||||
return (
|
||||
value === "off" ||
|
||||
@@ -2571,13 +2540,11 @@ export class OmpAgentClient implements AgentClient {
|
||||
});
|
||||
if (!runtimeSession) throw new Error("OMP catalog runtime did not start");
|
||||
const catalogSession = runtimeSession;
|
||||
const models = transformOmpModels(
|
||||
(
|
||||
await runProviderRefreshActivity(context, "get_available_models", () =>
|
||||
catalogSession.getAvailableModels(null),
|
||||
)
|
||||
).map((model) => mapOmpModel(model, this.provider)),
|
||||
);
|
||||
const models = (
|
||||
await runProviderRefreshActivity(context, "get_available_models", () =>
|
||||
catalogSession.getAvailableModels(null),
|
||||
)
|
||||
).map((model) => mapOmpModel(model, this.provider));
|
||||
return { models, modes: [...OMP_MODES] };
|
||||
} finally {
|
||||
context?.signal.removeEventListener("abort", handleAbort);
|
||||
|
||||
@@ -164,7 +164,7 @@ describe("mapOmpModel thinking options", () => {
|
||||
|
||||
expect(result.provider).toBe("omp");
|
||||
expect(result.id).toBe("pioneer/canada-quant/glm-5.2");
|
||||
expect(result.label).toBe("pioneer/GLM-5.2");
|
||||
expect(result.label).toBe("GLM-5.2");
|
||||
expect(result.metadata).toEqual({ provider: "pioneer", modelId: "canada-quant/glm-5.2" });
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,6 +3,7 @@ import type {
|
||||
AgentProvider,
|
||||
AgentSelectOption,
|
||||
} from "../../agent-sdk-types.js";
|
||||
import { modelDisplayLabel } from "../model-label.js";
|
||||
import type { OmpModel, OmpThinkingLevel } from "./rpc-types.js";
|
||||
|
||||
export const DEFAULT_OMP_THINKING_LEVEL: OmpThinkingLevel = "medium";
|
||||
@@ -43,7 +44,7 @@ export function mapOmpModel(model: OmpModel, provider: AgentProvider): AgentMode
|
||||
return {
|
||||
provider,
|
||||
id: `${model.provider}/${model.id}`,
|
||||
label: `${model.provider}/${model.name ?? model.id}`,
|
||||
label: modelDisplayLabel(model),
|
||||
description: `${model.provider}/${model.id}`,
|
||||
metadata: {
|
||||
provider: model.provider,
|
||||
|
||||
@@ -2477,6 +2477,42 @@ describe("OpenCode adapter startTurn error handling", () => {
|
||||
await session.close();
|
||||
});
|
||||
|
||||
test("reports a question rejected by a human steer as resolved", async () => {
|
||||
const { parent: session, openCode } = await createParentSession("ses_steer_question");
|
||||
openCode.sessionPromptAsyncEvents = [];
|
||||
const events: AgentStreamEvent[] = [];
|
||||
session.subscribe((event) => events.push(event));
|
||||
const { turnId } = await session.startTurn("first");
|
||||
openCode.emitEvent({
|
||||
type: "question.asked",
|
||||
properties: {
|
||||
id: "question-steer",
|
||||
sessionID: "ses_steer_question",
|
||||
questions: [{ question: "Which color?", header: "Color", options: [] }],
|
||||
},
|
||||
});
|
||||
await vi.waitFor(() => expect(session.getPendingPermissions()).toHaveLength(1));
|
||||
|
||||
await expect(
|
||||
session.steerActiveTurn?.("never mind", {
|
||||
expectedTurnId: turnId,
|
||||
clearPendingPermissions: true,
|
||||
}),
|
||||
).resolves.toEqual({ status: "accepted" });
|
||||
|
||||
expect(openCode.calls.questionReject).toContainEqual(
|
||||
expect.objectContaining({ requestID: "question-steer" }),
|
||||
);
|
||||
expect(events).toContainEqual(
|
||||
expect.objectContaining({
|
||||
type: "permission_resolved",
|
||||
requestId: "question-steer",
|
||||
resolution: expect.objectContaining({ behavior: "deny" }),
|
||||
}),
|
||||
);
|
||||
await session.close();
|
||||
});
|
||||
|
||||
test("keeps multiple native steers correlated in admission order", async () => {
|
||||
const { parent: session, openCode } = await createParentSession("ses_native_steer_fifo");
|
||||
openCode.sessionPromptAsyncEvents = [];
|
||||
|
||||
@@ -5045,22 +5045,24 @@ class OpenCodeAgentSession implements AgentSession {
|
||||
answers,
|
||||
});
|
||||
}
|
||||
|
||||
this.pendingPermissions.delete(requestId);
|
||||
this.pendingPermissionDirectories.delete(requestId);
|
||||
return;
|
||||
} else {
|
||||
const reply = resolveOpenCodePermissionReply(response);
|
||||
await this.client.permission.reply({
|
||||
requestID: requestId,
|
||||
directory,
|
||||
reply,
|
||||
message: response.behavior === "deny" ? response.message : undefined,
|
||||
});
|
||||
}
|
||||
|
||||
const reply = resolveOpenCodePermissionReply(response);
|
||||
await this.client.permission.reply({
|
||||
requestID: requestId,
|
||||
directory,
|
||||
reply,
|
||||
message: response.behavior === "deny" ? response.message : undefined,
|
||||
});
|
||||
|
||||
this.pendingPermissions.delete(requestId);
|
||||
this.pendingPermissionDirectories.delete(requestId);
|
||||
this.notifySubscribers({
|
||||
type: "permission_resolved",
|
||||
provider: "opencode",
|
||||
requestId,
|
||||
resolution: response,
|
||||
});
|
||||
}
|
||||
|
||||
describePersistence(): AgentPersistenceHandle | null {
|
||||
|
||||
@@ -19,12 +19,7 @@ import { pathToFileURL } from "node:url";
|
||||
import { describe, expect, onTestFinished, test } from "vitest";
|
||||
|
||||
import type { AgentSession, AgentSessionConfig, AgentStreamEvent } from "../../agent-sdk-types.js";
|
||||
import {
|
||||
PiProviderOptionsSchema,
|
||||
PiRpcAgentClient,
|
||||
PiRpcAgentSession,
|
||||
transformPiModels,
|
||||
} from "./agent.js";
|
||||
import { PiProviderOptionsSchema, PiRpcAgentClient, PiRpcAgentSession } from "./agent.js";
|
||||
import { PiCliRuntime } from "./cli-runtime.js";
|
||||
import { FakePi } from "./test-utils/fake-pi.js";
|
||||
import { createPiExtensionHost } from "./extensions/index.js";
|
||||
@@ -3970,35 +3965,73 @@ readline.createInterface({ input: process.stdin }).on("line", (line) => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("transformPiModels", () => {
|
||||
test("normalizes labels that include the upstream provider prefix", () => {
|
||||
expect(
|
||||
transformPiModels([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/google/gemini-2.5-flash-lite",
|
||||
label: "openrouter/google/gemini_2.5 flash lite",
|
||||
},
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/openai/gpt-5.5",
|
||||
label: "openrouter/OpenAI: GPT-5.5",
|
||||
},
|
||||
]),
|
||||
).toEqual([
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/google/gemini-2.5-flash-lite",
|
||||
label: "gemini 2.5 flash lite",
|
||||
description: "openrouter/google/gemini_2.5 flash lite",
|
||||
describe("Pi catalog model labels", () => {
|
||||
test.each([
|
||||
{
|
||||
name: "keeps slashes and underscores inside a free-text model name",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "s-q3fn(p-t)",
|
||||
name: "Qwen3.8 Flash Next IQ3_S, prior + tail skip (fastest, ~60-70 tok/s on 0.2.10, 52/56)",
|
||||
},
|
||||
{
|
||||
provider: "pi",
|
||||
id: "openrouter/openai/gpt-5.5",
|
||||
label: "GPT-5.5",
|
||||
description: "openrouter/OpenAI: GPT-5.5",
|
||||
label: "Qwen3.8 Flash Next IQ3_S, prior + tail skip (fastest, ~60-70 tok/s on 0.2.10, 52/56)",
|
||||
},
|
||||
{
|
||||
name: "keeps a free-text name that ends in a slash-separated word",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "ds-strata-6",
|
||||
name: "DeepSeek V4.1 Flash 2.25bpw via Strata (full 6 experts, untested, ~5-6 tok/s)",
|
||||
},
|
||||
]);
|
||||
label: "DeepSeek V4.1 Flash 2.25bpw via Strata (full 6 experts, untested, ~5-6 tok/s)",
|
||||
},
|
||||
{
|
||||
name: "keeps a colon inside a free-text model name",
|
||||
model: {
|
||||
provider: "llama-swap",
|
||||
id: "qwen3-tail",
|
||||
name: "Qwen3 IQ3_S (tail skip: on, 52/56)",
|
||||
},
|
||||
label: "Qwen3 IQ3_S (tail skip: on, 52/56)",
|
||||
},
|
||||
{
|
||||
name: "drops the vendor prefix from an upstream model name",
|
||||
model: { provider: "openrouter", id: "openai/gpt-5.5", name: "OpenAI: GPT-5.5" },
|
||||
label: "GPT-5.5",
|
||||
},
|
||||
{
|
||||
name: "shortens a path-like name to its last segment",
|
||||
model: {
|
||||
provider: "openrouter",
|
||||
id: "google/gemini-2.5-flash-lite",
|
||||
name: "google/gemini-2.5-flash-lite",
|
||||
},
|
||||
label: "gemini-2.5-flash-lite",
|
||||
},
|
||||
{
|
||||
name: "falls back to the last segment of a path-like id",
|
||||
model: { provider: "openrouter", id: "google/gemini_2.5-flash-lite" },
|
||||
label: "gemini 2.5-flash-lite",
|
||||
},
|
||||
{
|
||||
name: "falls back to an id with spaces when the name is blank",
|
||||
model: { provider: "local", id: "DeepSeek-V4.1-Flash 2.25bpw (Strata)", name: " " },
|
||||
label: "DeepSeek-V4.1-Flash 2.25bpw (Strata)",
|
||||
},
|
||||
])("$name", async ({ model, label }) => {
|
||||
const pi = new FakePi();
|
||||
pi.queueSessionSetup((session) => {
|
||||
session.models = [model];
|
||||
});
|
||||
|
||||
const catalog = await createClient(pi).fetchCatalog({
|
||||
scope: "workspace",
|
||||
cwd: "/workspace/project",
|
||||
force: false,
|
||||
});
|
||||
|
||||
expect(catalog.models.map((entry) => entry.label)).toEqual([label]);
|
||||
expect(catalog.models[0]?.id).toBe(`${model.provider}/${model.id}`);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -83,6 +83,7 @@ import {
|
||||
listPiImportableSessions,
|
||||
readPiImportSessionConfig,
|
||||
} from "./session-descriptor.js";
|
||||
import { modelDisplayLabel } from "../model-label.js";
|
||||
import type { PiRuntime, PiRuntimeSession, PiStartSessionInput } from "./runtime.js";
|
||||
import type {
|
||||
PiAgentSessionEvent,
|
||||
@@ -313,36 +314,6 @@ interface PiSlashCommandInvocation {
|
||||
|
||||
type AutoCompactMode = boolean | "toggle" | "unknown";
|
||||
|
||||
function normalizePiModelLabel(label: string): string {
|
||||
const normalizedLabel = label.trim().replace(/[_\s]+/g, " ");
|
||||
const vendorSeparatorIndex = normalizedLabel.indexOf(": ");
|
||||
if (vendorSeparatorIndex === -1) {
|
||||
return normalizedLabel;
|
||||
}
|
||||
|
||||
return normalizedLabel.slice(vendorSeparatorIndex + 2).trim();
|
||||
}
|
||||
|
||||
export function transformPiModels(models: AgentModelDefinition[]): AgentModelDefinition[] {
|
||||
return models.map((model) => {
|
||||
if (!model.label.includes("/")) {
|
||||
return model;
|
||||
}
|
||||
|
||||
const segments = model.label.split("/").filter((segment) => segment.length > 0);
|
||||
const rawLabel = segments.at(-1);
|
||||
if (!rawLabel) {
|
||||
return model;
|
||||
}
|
||||
|
||||
return {
|
||||
...model,
|
||||
label: normalizePiModelLabel(rawLabel),
|
||||
description: model.description ?? model.label,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function isPiThinkingLevel(value: string | null | undefined): value is PiThinkingLevel {
|
||||
return (
|
||||
value === "off" ||
|
||||
@@ -1166,7 +1137,7 @@ function mapPiModel(model: PiModel, provider: AgentProvider): AgentModelDefiniti
|
||||
return {
|
||||
provider,
|
||||
id: `${model.provider}/${model.id}`,
|
||||
label: `${model.provider}/${model.name ?? model.id}`,
|
||||
label: modelDisplayLabel(model),
|
||||
description: `${model.provider}/${model.id}`,
|
||||
metadata: {
|
||||
provider: model.provider,
|
||||
@@ -2817,15 +2788,13 @@ export class PiRpcAgentClient implements AgentClient {
|
||||
"get_state",
|
||||
() => catalogSession.getState(),
|
||||
);
|
||||
const models = transformPiModels(
|
||||
piModels.map((model) => {
|
||||
const mapped = mapPiModel(model, PI_PROVIDER);
|
||||
const isConfigured =
|
||||
model.provider === configuredModel?.provider && model.id === configuredModel?.id;
|
||||
if (isConfigured) mapped.isDefault = true;
|
||||
return mapped;
|
||||
}),
|
||||
);
|
||||
const models = piModels.map((model) => {
|
||||
const mapped = mapPiModel(model, PI_PROVIDER);
|
||||
const isConfigured =
|
||||
model.provider === configuredModel?.provider && model.id === configuredModel?.id;
|
||||
if (isConfigured) mapped.isDefault = true;
|
||||
return mapped;
|
||||
});
|
||||
return { models, modes: [] };
|
||||
} finally {
|
||||
context?.signal.removeEventListener("abort", handleAbort);
|
||||
|
||||
@@ -241,6 +241,23 @@ function mergeReasoningChunks(entries: readonly WorkingEntry[]): WorkingEntry[]
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether `next`, the row right after `previous`, is another chunk of the same assistant
|
||||
* message. A turn id or message id change starts a new message, which matters where rows
|
||||
* replayed from provider history carry no turn id.
|
||||
*/
|
||||
export function continuesAssistantMessage(
|
||||
previous: Pick<AgentTimelineRow, "item" | "turnId">,
|
||||
next: Pick<AgentTimelineRow, "item" | "turnId">,
|
||||
): boolean {
|
||||
return (
|
||||
previous.item.type === "assistant_message" &&
|
||||
next.item.type === "assistant_message" &&
|
||||
previous.turnId === next.turnId &&
|
||||
(next.item.messageId === undefined || next.item.messageId === previous.item.messageId)
|
||||
);
|
||||
}
|
||||
|
||||
function mergeAssistantChunks(entries: readonly WorkingEntry[]): WorkingEntry[] {
|
||||
const output: WorkingEntry[] = [];
|
||||
|
||||
@@ -248,10 +265,8 @@ function mergeAssistantChunks(entries: readonly WorkingEntry[]): WorkingEntry[]
|
||||
const previous = output[output.length - 1];
|
||||
const shouldMerge =
|
||||
previous &&
|
||||
previous.item.type === "assistant_message" &&
|
||||
entry.item.type === "assistant_message" &&
|
||||
previous.seqEnd + 1 === entry.seqStart &&
|
||||
previous.turnId === entry.turnId;
|
||||
continuesAssistantMessage(previous, entry);
|
||||
|
||||
if (!shouldMerge || !previous) {
|
||||
output.push(entry);
|
||||
@@ -262,13 +277,6 @@ function mergeAssistantChunks(entries: readonly WorkingEntry[]): WorkingEntry[]
|
||||
{ type: "assistant_message" }
|
||||
>;
|
||||
const entryAssistant = entry.item as Extract<AgentTimelineItem, { type: "assistant_message" }>;
|
||||
if (
|
||||
entryAssistant.messageId !== undefined &&
|
||||
previousAssistant.messageId !== entryAssistant.messageId
|
||||
) {
|
||||
output.push(entry);
|
||||
continue;
|
||||
}
|
||||
|
||||
const collapsedKinds = new Set<TimelineProjectionKind>([
|
||||
...previous.collapsed,
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
import { beforeAll, beforeEach, describe, test, expect } from "vitest";
|
||||
import { mkdtempSync, rmSync } from "node:fs";
|
||||
import { tmpdir } from "node:os";
|
||||
import path from "node:path";
|
||||
import pino from "pino";
|
||||
|
||||
import { createTestPaseoDaemon } from "../test-utils/paseo-daemon.js";
|
||||
import { DaemonClient } from "../test-utils/daemon-client.js";
|
||||
import {
|
||||
canRunRealProvider,
|
||||
createRealProviderClients,
|
||||
getRealProviderConfig,
|
||||
} from "./real-provider-test-config.js";
|
||||
|
||||
async function readStatusAndPendingIds(
|
||||
client: DaemonClient,
|
||||
agentId: string,
|
||||
): Promise<{ status: string; pendingIds: string[] }> {
|
||||
const fetched = await client.fetchAgent(agentId);
|
||||
const snapshot = fetched!.agent;
|
||||
const pendingIds = (snapshot.pendingPermissions ?? []).map((pending) => pending.id);
|
||||
return { status: snapshot.status, pendingIds };
|
||||
}
|
||||
|
||||
describe("daemon E2E (real opencode) - a message sent instead of answering a question", () => {
|
||||
let canRun = false;
|
||||
|
||||
beforeAll(async () => {
|
||||
canRun = await canRunRealProvider("opencode");
|
||||
});
|
||||
|
||||
beforeEach((context) => {
|
||||
if (!canRun) {
|
||||
context.skip();
|
||||
}
|
||||
});
|
||||
|
||||
test("removes the superseded question from the pending list", async () => {
|
||||
const cwd = mkdtempSync(path.join(tmpdir(), "daemon-real-opencode-question-"));
|
||||
const logger = pino({ level: "silent" });
|
||||
const daemon = await createTestPaseoDaemon({
|
||||
agentClients: createRealProviderClients(["opencode"], logger),
|
||||
logger,
|
||||
});
|
||||
const client = new DaemonClient({ url: `ws://127.0.0.1:${daemon.port}/ws` });
|
||||
await client.connect();
|
||||
await client.fetchAgents({ subscribe: {} });
|
||||
|
||||
try {
|
||||
const agent = await client.createAgent({
|
||||
...getRealProviderConfig("opencode"),
|
||||
cwd,
|
||||
title: "OpenCode superseded question",
|
||||
});
|
||||
|
||||
await client.sendMessage(
|
||||
agent.id,
|
||||
[
|
||||
"Use the question tool to ask me exactly one clarifying question:",
|
||||
"What color should the button be?",
|
||||
"Wait for my answer before doing anything else.",
|
||||
].join(" "),
|
||||
);
|
||||
await client.waitForAgentUpsert(
|
||||
agent.id,
|
||||
(snapshot) => snapshot.pendingPermissions?.[0]?.kind === "question",
|
||||
120_000,
|
||||
);
|
||||
|
||||
// The app sends with the default send setting, which steers the running turn.
|
||||
await client.sendMessage(agent.id, "Never mind the question. Reply with the word done.", {
|
||||
activeTurnBehavior: "steer",
|
||||
});
|
||||
// OpenCode rejects the question and runs the steer message to completion.
|
||||
await expect
|
||||
.poll(() => readStatusAndPendingIds(client, agent.id), {
|
||||
timeout: 120_000,
|
||||
interval: 1_000,
|
||||
})
|
||||
.toEqual({ status: "idle", pendingIds: [] });
|
||||
} finally {
|
||||
await client.close().catch(() => undefined);
|
||||
await daemon.close();
|
||||
rmSync(cwd, { recursive: true, force: true });
|
||||
}
|
||||
}, 300_000);
|
||||
});
|
||||
@@ -1,5 +1,5 @@
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { mkdtemp, writeFile, rm, readFile, lstat } from "node:fs/promises";
|
||||
import { mkdtemp, writeFile, rm, readFile, lstat, utimes } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { tmpdir } from "node:os";
|
||||
import { expect, test } from "vitest";
|
||||
@@ -107,6 +107,67 @@ test("supports empty trees, unborn HEAD, staged and unstaged comparisons", async
|
||||
}
|
||||
});
|
||||
|
||||
test.each([
|
||||
{ name: "index to working tree", base: { kind: "index" } as const },
|
||||
{
|
||||
name: "commit to working tree with a file removed from the index",
|
||||
base: { kind: "rev", rev: "HEAD" } as const,
|
||||
},
|
||||
])("$name sees a same-size edit saved in the timestamp tick it was staged", async ({ base }) => {
|
||||
const cwd = await mkdtemp(join(tmpdir(), "diff-racy-index-"));
|
||||
const git = (...args: string[]) => execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
|
||||
const file = join(cwd, "x.ts");
|
||||
const indexPath = join(cwd, ".git", "index");
|
||||
const tick = new Date("2026-01-01T00:00:00Z");
|
||||
try {
|
||||
git("init", "-b", "main");
|
||||
git("config", "user.email", "test@example.com");
|
||||
git("config", "user.name", "Test");
|
||||
// Only mtime, size, and inode tell this edit apart; ctime always moves.
|
||||
git("config", "core.trustctime", "false");
|
||||
await writeFile(file, "const value = 1;\n");
|
||||
await writeFile(join(cwd, "y.ts"), "const kept = 1;\n");
|
||||
git("add", ".");
|
||||
git("-c", "commit.gpgsign=false", "commit", "-m", "base");
|
||||
await writeFile(file, "const value = 2;\n");
|
||||
await utimes(file, tick, tick);
|
||||
git("add", "x.ts");
|
||||
if (base.kind === "rev") {
|
||||
git("-c", "commit.gpgsign=false", "commit", "-m", "staged");
|
||||
// A file on disk and in the base commit but absent from the index
|
||||
// selects the private index for commit to working tree comparisons.
|
||||
git("rm", "--cached", "y.ts");
|
||||
}
|
||||
// The index is written in the tick the file was staged, and the file is
|
||||
// saved again with the same size within that tick.
|
||||
await utimes(indexPath, tick, tick);
|
||||
await writeFile(file, "const value = 3;\n");
|
||||
await utimes(file, tick, tick);
|
||||
expect(git("diff", "--name-only")).toBe("x.ts");
|
||||
const originalIndex = await readFile(indexPath);
|
||||
const originalMtime = (await lstat(indexPath, { bigint: true })).mtimeNs;
|
||||
|
||||
const comparison = await listComparison({
|
||||
cwd,
|
||||
base,
|
||||
head: { kind: "worktree" },
|
||||
highlight: false,
|
||||
});
|
||||
expect(comparison.files.map((entry) => entry.entry.path)).toEqual(["x.ts"]);
|
||||
const record = await readBody(comparison);
|
||||
expect(record.body.hunks[0].lines).toEqual([
|
||||
{ type: "header", content: "@@ -1 +1 @@" },
|
||||
{ type: "remove", content: "const value = 2;" },
|
||||
{ type: "add", content: "const value = 3;" },
|
||||
]);
|
||||
await comparison.close();
|
||||
expect(await readFile(indexPath)).toEqual(originalIndex);
|
||||
expect((await lstat(indexPath, { bigint: true })).mtimeNs).toBe(originalMtime);
|
||||
} finally {
|
||||
await rm(cwd, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("lists oversized untracked files without treating their truncated contents as additions", async () => {
|
||||
const cwd = await mkdtemp(join(tmpdir(), "diff-large-file-"));
|
||||
const git = (...args: string[]) => execFileSync("git", args, { cwd, encoding: "utf8" }).trim();
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
stat as statFile,
|
||||
mkdtemp,
|
||||
copyFile,
|
||||
utimes,
|
||||
realpath,
|
||||
access,
|
||||
rm,
|
||||
@@ -3665,6 +3666,12 @@ export async function prepareAllChangesIndex(cwd: string, baseRef: string) {
|
||||
|
||||
// write-tree rewrites its index. A private snapshot prevents an index read from
|
||||
// invalidating the observation that requested it.
|
||||
//
|
||||
// Git re-reads a file whose stat matches its index entry only when the entry is
|
||||
// not older than the index file ("racy git"). A fresh copy would be newer than
|
||||
// every entry, so a same-size edit made in the tick the index was written would
|
||||
// read as unchanged. The copy takes the source's mtime, read before copying and
|
||||
// rounded down to the second, so it is never later than the source.
|
||||
export async function snapshotComparisonIndex(cwd: string) {
|
||||
const directory = await mkdtemp(resolve(tmpdir(), "paseo-comparison-index-"));
|
||||
const indexFile = resolve(directory, "index");
|
||||
@@ -3676,7 +3683,9 @@ export async function snapshotComparisonIndex(cwd: string) {
|
||||
const source = resolveGitRevParsePath(cwd, index.stdout);
|
||||
if (!source) throw new Error("Git did not return an index path");
|
||||
try {
|
||||
const { atime, mtimeMs } = await statFile(source);
|
||||
await copyFile(source, indexFile);
|
||||
await utimes(indexFile, atime, Math.floor(mtimeMs / 1000));
|
||||
} catch (error) {
|
||||
if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") throw error;
|
||||
await runGitCommand(["read-tree", "--empty"], {
|
||||
|
||||
Reference in New Issue
Block a user