mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-20 15:25:13 +00:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47f2615324 | ||
|
|
8e865bed0d | ||
|
|
2298effb0b | ||
|
|
a7fed94e51 | ||
|
|
36dffc9503 | ||
|
|
d78cc90e4d | ||
|
|
0f57c2b4c7 | ||
|
|
ddd7aff9be |
+7
-5
@@ -186,11 +186,13 @@ Terminal activity contributes to the workspace status bucket **per `workspaceId`
|
||||
|
||||
Single file, validated with `PersistedConfigSchema`.
|
||||
|
||||
`agents.skills.selection` is the daemon host's orchestration-skill preference. Missing means
|
||||
`{ mode: "all" }`. Installed state is not persisted; the daemon derives it from the shared
|
||||
`~/.agents/skills` and Claude skill directories and keeps config plus filesystem convergence behind
|
||||
one serialized owner. Codex discovers the shared directory. Updates retire unchanged files from
|
||||
Paseo-managed copies in `~/.codex/skills`, preserving user edits and untracked files.
|
||||
`agents.skills.selection` stores the orchestration-skill preference for the daemon host, and a
|
||||
missing value defaults to `{ mode: "all" }`. The daemon does not persist installed state. It
|
||||
derives installed state from `~/.agents/skills`, `~/.claude/skills`, and `~/.gemini/config/skills`,
|
||||
and serializes configuration and filesystem convergence through one owner. Codex and Gemini CLI
|
||||
discover `~/.agents/skills`, while Antigravity discovers `~/.gemini/config/skills`. Updates retire
|
||||
unchanged files from Paseo-managed copies in `~/.codex/skills` and preserve user edits and
|
||||
untracked files.
|
||||
|
||||
`paseo reload` reads and validates this file once inside the daemon. That snapshot drives resolution,
|
||||
classification, application, and reload bookkeeping. `DaemonConfigStore` owns applying runtime-safe
|
||||
|
||||
@@ -10,16 +10,19 @@ import {
|
||||
expectColumnAtLeftGutter,
|
||||
expectColumnClearOfOutline,
|
||||
expectContentColumnWidth,
|
||||
expectSharedHorizontalRail,
|
||||
} from "../support/helpers/content-width";
|
||||
import { openFileExplorer, openFileFromExplorer } from "../support/helpers/file-explorer";
|
||||
import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
|
||||
|
||||
const ULTRAWIDE_VIEWPORT = { width: 2560, height: 1080 };
|
||||
const DESKTOP_VIEWPORT = { width: 1440, height: 900 };
|
||||
const TRANSITION_VIEWPORT = { width: 1250, height: 900 };
|
||||
const DEFAULT_COLUMN = { min: 800, max: 820 };
|
||||
const WIDE_COLUMN = { min: 1180, max: 1200 };
|
||||
const FULL_COLUMN = { min: 2000, max: ULTRAWIDE_VIEWPORT.width };
|
||||
|
||||
test("resizes mounted chat content and leaves room for the outline at full width", async ({
|
||||
test("resizes mounted chat content and keeps timeline and composer on one rail beside the outline", async ({
|
||||
page,
|
||||
}) => {
|
||||
test.setTimeout(120_000);
|
||||
@@ -37,26 +40,46 @@ test("resizes mounted chat content and leaves room for the outline at full width
|
||||
await openAgentRoute(page, agent);
|
||||
await expectChatOutlinePrompts(page, 2);
|
||||
const reply = page.getByTestId("assistant-message").first();
|
||||
const turnFooter = page.getByTestId("turn-footer").first();
|
||||
const composer = page.getByTestId("message-input-root");
|
||||
await expectContentColumnWidth(reply, DEFAULT_COLUMN);
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
const originalReply = await reply.elementHandle();
|
||||
|
||||
// In the transition band (pane ~930px >= 918px, < 820 + 120), Default clears the outline on one rail.
|
||||
await page.setViewportSize(TRANSITION_VIEWPORT);
|
||||
await expectColumnClearOfOutline(composer, chatOutlineRail(page));
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
|
||||
await page.setViewportSize(ULTRAWIDE_VIEWPORT);
|
||||
await chooseContentWidth(page, "Wide");
|
||||
await expectContentColumnWidth(reply, WIDE_COLUMN);
|
||||
await expectContentColumnWidth(composer, WIDE_COLUMN);
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
|
||||
// At 1440px (pane ~1120px < 1200 + 120), Wide clears the outline and keeps timeline and composer aligned.
|
||||
await page.setViewportSize(DESKTOP_VIEWPORT);
|
||||
await expectColumnClearOfOutline(composer, chatOutlineRail(page));
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
|
||||
await page.setViewportSize(ULTRAWIDE_VIEWPORT);
|
||||
await chooseContentWidth(page, "Full");
|
||||
await expectContentColumnWidth(reply, FULL_COLUMN);
|
||||
await expectContentColumnWidth(composer, FULL_COLUMN);
|
||||
await expectColumnClearOfOutline(reply, chatOutlineRail(page));
|
||||
await expectColumnClearOfOutline(composer, chatOutlineRail(page));
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
|
||||
await disableChatOutline(page);
|
||||
await expectNoChatOutline(page);
|
||||
await expectColumnAtLeftGutter(page, reply);
|
||||
await expectColumnAtLeftGutter(page, composer);
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
|
||||
await chooseContentWidth(page, "Default");
|
||||
await expectContentColumnWidth(reply, DEFAULT_COLUMN);
|
||||
await expectContentColumnWidth(composer, DEFAULT_COLUMN);
|
||||
await expectSharedHorizontalRail(turnFooter, composer);
|
||||
expect(await originalReply?.evaluate((node) => node.isConnected)).toBe(true);
|
||||
} finally {
|
||||
await agent.cleanup();
|
||||
|
||||
@@ -22,7 +22,7 @@ type AgentSkillsClient = Pick<
|
||||
"close" | "connect" | "getAgentSkillsStatus" | "saveAgentSkillsSelection"
|
||||
>;
|
||||
|
||||
export type SkillTargetName = "agents" | "claude";
|
||||
export type SkillTargetName = "agents" | "claude" | "antigravity";
|
||||
|
||||
export interface AgentSkillsSandbox {
|
||||
available: string[];
|
||||
@@ -64,6 +64,7 @@ export async function startAgentSkillsSandbox(): Promise<AgentSkillsSandbox> {
|
||||
const targets = {
|
||||
agents: path.join(home, ".agents", "skills"),
|
||||
claude: path.join(home, ".claude", "skills"),
|
||||
antigravity: path.join(home, ".gemini", "config", "skills"),
|
||||
};
|
||||
const codexSkillsDir = path.join(home, ".codex", "skills");
|
||||
|
||||
|
||||
@@ -51,3 +51,18 @@ export async function expectColumnAtLeftGutter(page: Page, column: Locator): Pro
|
||||
})
|
||||
.toBeLessThanOrEqual(24);
|
||||
}
|
||||
|
||||
/** Checks that two column surfaces sit on the same left and right vertical rails. */
|
||||
export async function expectSharedHorizontalRail(first: Locator, second: Locator): Promise<void> {
|
||||
await expect(first).toBeVisible({ timeout: 30_000 });
|
||||
await expect(second).toBeVisible({ timeout: 30_000 });
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const [a, b] = await Promise.all([first.boundingBox(), second.boundingBox()]);
|
||||
if (!a || !b) return Infinity;
|
||||
const leftDelta = Math.abs(a.x - b.x);
|
||||
const rightDelta = Math.abs(a.x + a.width - (b.x + b.width));
|
||||
return Math.max(leftDelta, rightDelta);
|
||||
})
|
||||
.toBeLessThanOrEqual(1);
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ export interface SetupHost {
|
||||
/**
|
||||
* An isolated host whose only agent history is the Claude sessions given here, so suggestions
|
||||
* never depend on the machine running the test. Its HOME is a scratch folder, so the skills setup
|
||||
* installs never land in the real ~/.agents, ~/.claude or ~/.codex. `withBrokenProvider` adds a
|
||||
* installs never land in the real ~/.agents, ~/.claude, ~/.codex, or ~/.gemini/config. `withBrokenProvider` adds a
|
||||
* provider that cannot start.
|
||||
*/
|
||||
export async function startSetupHost(
|
||||
|
||||
@@ -66,6 +66,7 @@
|
||||
[role="slider"],
|
||||
[role="menuitem"],
|
||||
[tabindex],
|
||||
[data-window-no-drag],
|
||||
[contenteditable="true"] {
|
||||
-webkit-app-region: no-drag !important;
|
||||
}
|
||||
|
||||
@@ -66,4 +66,23 @@ describe("fetchAgentCommands", () => {
|
||||
|
||||
expect(client.calls).toEqual([{ agentId: "agent-1", draftConfig: undefined }]);
|
||||
});
|
||||
|
||||
it("deduplicates duplicate command names from the daemon, keeping the first entry", async () => {
|
||||
const client = createClient(
|
||||
commandsPayload([
|
||||
{ name: "goal", description: "Run until goal is finished", argumentHint: "" },
|
||||
{ name: "plan", description: "Plan carefully before executing a task.", argumentHint: "" },
|
||||
{ name: "plan", description: "Local plan skill description", argumentHint: "" },
|
||||
{ name: "review", description: "Review changes", argumentHint: "" },
|
||||
]),
|
||||
);
|
||||
|
||||
const commands = await fetchAgentCommands({ client, agentId: "agent-1" });
|
||||
|
||||
expect(commands).toEqual([
|
||||
{ name: "goal", description: "Run until goal is finished", argumentHint: "" },
|
||||
{ name: "plan", description: "Plan carefully before executing a task.", argumentHint: "" },
|
||||
{ name: "review", description: "Review changes", argumentHint: "" },
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -37,6 +37,18 @@ export interface AgentCommandsClient {
|
||||
listCommands(options: ListAgentCommandsOptions): ReturnType<DaemonClient["listCommands"]>;
|
||||
}
|
||||
|
||||
// COMPAT(dedupeListCommands): added in v0.17.0, remove after 2027-05-20 once daemon floor >= v0.17.0.
|
||||
function dedupeSlashCommands(commands: readonly AgentSlashCommand[]): AgentSlashCommand[] {
|
||||
const seen = new Set<string>();
|
||||
const unique: AgentSlashCommand[] = [];
|
||||
for (const command of commands) {
|
||||
if (seen.has(command.name)) continue;
|
||||
seen.add(command.name);
|
||||
unique.push(command);
|
||||
}
|
||||
return unique;
|
||||
}
|
||||
|
||||
export async function fetchAgentCommands(input: {
|
||||
client: AgentCommandsClient;
|
||||
agentId: string;
|
||||
@@ -47,7 +59,7 @@ export async function fetchAgentCommands(input: {
|
||||
draftConfig: input.draftConfig,
|
||||
});
|
||||
if (response.error) throw new Error(response.error);
|
||||
return response.commands as AgentSlashCommand[];
|
||||
return dedupeSlashCommands(response.commands as AgentSlashCommand[]);
|
||||
}
|
||||
|
||||
interface UseAgentCommandsQueryOptions {
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
import { SPACING } from "@/styles/theme";
|
||||
|
||||
// Outline rail geometry shared between the rail overlay and the chat pane's column rail.
|
||||
export const CHAT_OUTLINE_RAIL_WIDTH = 36;
|
||||
export const CHAT_OUTLINE_RAIL_LEFT = SPACING[2];
|
||||
export const CHAT_OUTLINE_MIN_PANEL_WIDTH = 918;
|
||||
export const CHAT_OUTLINE_GUTTER_INSET = CHAT_OUTLINE_RAIL_LEFT + CHAT_OUTLINE_RAIL_WIDTH;
|
||||
@@ -11,7 +11,3 @@ export interface ChatOutlineRailProps {
|
||||
export function ChatOutlineRail(_props: ChatOutlineRailProps): null {
|
||||
return null;
|
||||
}
|
||||
|
||||
export function useChatOutlineRailLayout(_enabled: boolean) {
|
||||
return { onLayout: undefined, inset: 0 };
|
||||
}
|
||||
|
||||
@@ -2,19 +2,17 @@ import { memo, useCallback, useEffect, useMemo, useState, useSyncExternalStore }
|
||||
import { Pressable, Text, View, type PointerEvent as RNPointerEvent } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { useReducedMotion } from "react-native-reanimated";
|
||||
import { useContainerWidthBelow } from "@/hooks/use-container-width";
|
||||
import { SPACING } from "@/styles/theme";
|
||||
import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
|
||||
import { CHAT_OUTLINE_RAIL_LEFT, CHAT_OUTLINE_RAIL_WIDTH } from "./geometry";
|
||||
import { createChatOutlineHoverIntent } from "./hover-intent";
|
||||
import { promptTickMagnification } from "./model";
|
||||
import type { ChatOutlineRailProps } from "./rail";
|
||||
|
||||
// Hover tracking lives on the rail and the slots, never on the Pressable inside them:
|
||||
// magnifying a slot must not move the box the pointer is resting on. See docs/hover.md.
|
||||
const RAIL_WIDTH = 36;
|
||||
const RAIL_LEFT = SPACING[2];
|
||||
const RAIL_WIDTH = CHAT_OUTLINE_RAIL_WIDTH;
|
||||
const RAIL_LEFT = CHAT_OUTLINE_RAIL_LEFT;
|
||||
const SLOT_HEIGHT = 8;
|
||||
const MIN_PANEL_WIDTH = 918;
|
||||
const RESTING_PILL_HEIGHT = 2;
|
||||
const MAGNIFIED_PILL_HEIGHT = 4;
|
||||
const RESTING_PILL_WIDTH = 10;
|
||||
@@ -24,11 +22,6 @@ const PREVIEW_WIDTH = 260;
|
||||
const PREVIEW_HEIGHT = 48;
|
||||
const PREVIEW_GAP = 4;
|
||||
|
||||
export function useChatOutlineRailLayout(enabled: boolean) {
|
||||
const { onLayout, isBelow } = useContainerWidthBelow(MIN_PANEL_WIDTH);
|
||||
return { onLayout, inset: enabled && !isBelow ? RAIL_LEFT + RAIL_WIDTH : 0 };
|
||||
}
|
||||
|
||||
export const ChatOutlineRail = memo(function ChatOutlineRail({
|
||||
prompts,
|
||||
activePrompt,
|
||||
|
||||
@@ -40,6 +40,7 @@ import {
|
||||
type HistoryStartSettleScheduler,
|
||||
} from "./history-start-settle-scheduler";
|
||||
import { useChatFindSelectedMessageId } from "@/agent-stream/chat-find";
|
||||
import { CHAT_COLUMN_BASE_GUTTER, resolveChatColumnGutters } from "@/chat-rail/gutters";
|
||||
import { useScrollToMessage } from "./use-scroll-to-message.web";
|
||||
|
||||
interface CreateWebStreamStrategyInput {
|
||||
@@ -1228,21 +1229,20 @@ function WebStreamViewport(props: StreamRenderInput & { isMobileBreakpoint: bool
|
||||
]);
|
||||
|
||||
const contentContainerStyle = useMemo((): CSSProperties => {
|
||||
const gutter = isMobileBreakpoint ? 8 : 16;
|
||||
const leftGutter = gutter + outlineInset;
|
||||
// Balance the outline gutter using only the space the capped column has left over.
|
||||
const rightGutter =
|
||||
outlineInset > 0 && contentMaxWidth !== undefined
|
||||
? `clamp(${gutter}px, calc(100% - ${leftGutter + contentMaxWidth}px), ${leftGutter}px)`
|
||||
: gutter;
|
||||
const gutter = isMobileBreakpoint ? 8 : CHAT_COLUMN_BASE_GUTTER;
|
||||
const { paddingLeft, paddingRight } = resolveChatColumnGutters({
|
||||
gutter,
|
||||
outlineInset,
|
||||
contentMaxWidth,
|
||||
});
|
||||
return {
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
minHeight: "100%",
|
||||
paddingTop: CONTENT_PADDING_TOP_PX,
|
||||
paddingBottom: 16,
|
||||
paddingLeft: leftGutter,
|
||||
paddingRight: rightGutter,
|
||||
paddingLeft,
|
||||
paddingRight,
|
||||
boxSizing: "border-box",
|
||||
};
|
||||
}, [contentMaxWidth, isMobileBreakpoint, outlineInset]);
|
||||
|
||||
@@ -80,8 +80,9 @@ import { resolveStreamRenderStrategy } from "./strategy-resolver";
|
||||
import { type StreamSegmentRenderers, type StreamViewportHandle } from "./strategy";
|
||||
import { renderStreamRow, type RenderStreamItem } from "./stream-row";
|
||||
import { type NearBottom, useIsNearBottom, useNearBottom } from "./near-bottom";
|
||||
import { ChatOutlineRail, useChatOutlineRailLayout } from "@/agent-stream/chat-outline/rail";
|
||||
import { ChatOutlineRail } from "@/agent-stream/chat-outline/rail";
|
||||
import { useChatOutline } from "@/agent-stream/chat-outline/use-chat-outline";
|
||||
import { CHAT_COLUMN_RAIL_DATASET, useChatOutlineRail } from "@/chat-rail";
|
||||
import { getHostRuntimeStore } from "@/runtime/host-runtime";
|
||||
import { planTimelineTailFetch } from "@/timeline/timeline-sync-plan";
|
||||
import {
|
||||
@@ -322,7 +323,7 @@ function ScrollToBottomButton({
|
||||
);
|
||||
if (isNearBottom && !isTimelineDetached) return null;
|
||||
return (
|
||||
<View style={containerStyle} pointerEvents="box-none">
|
||||
<View style={containerStyle} dataSet={CHAT_COLUMN_RAIL_DATASET} pointerEvents="box-none">
|
||||
<Animated.View entering={scrollIndicatorFadeIn} exiting={scrollIndicatorFadeOut}>
|
||||
<Pressable
|
||||
style={stylesheet.scrollToBottomButton}
|
||||
@@ -365,7 +366,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
|
||||
const { t } = useTranslation();
|
||||
const autoExpandReasoning = useSettings((settings) => settings.autoExpandReasoning);
|
||||
const chatDisplay = useSettings((settings) => settings.chatDisplay);
|
||||
const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
|
||||
const contentMaxWidth = useSettings(resolveContentMaxWidth);
|
||||
const viewportRef = useRef<StreamViewportHandle | null>(null);
|
||||
const pendingClientMessageIds = useMemo(
|
||||
@@ -404,10 +404,6 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
|
||||
(state) =>
|
||||
state.sessions[resolvedServerId]?.serverInfo?.features?.agentForkContextCursor === true,
|
||||
);
|
||||
const supportsChatOutline = useSessionStore(
|
||||
(state) =>
|
||||
state.sessions[resolvedServerId]?.serverInfo?.features?.agentTimelinePromptIndex === true,
|
||||
);
|
||||
const timelineEpoch = useSessionStore(
|
||||
(state) => state.sessions[resolvedServerId]?.agentTimelineCursor.get(agentId)?.epoch ?? null,
|
||||
);
|
||||
@@ -617,22 +613,21 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
|
||||
mountedHistoryMessageIds.has(messageId) || liveHeadMessageIds.has(messageId),
|
||||
};
|
||||
}, [baseRenderModel.segments.liveHead, mountedHistoryMessageIds]);
|
||||
const outlineEnabled = supportsChatOutline && chatOutlineEnabled;
|
||||
const outlineRail = useChatOutlineRail();
|
||||
const outlineInset = outlineRail.inset;
|
||||
const chatOutline = useChatOutline({
|
||||
agentId,
|
||||
serverId: resolvedServerId,
|
||||
timelineEpoch,
|
||||
tail: effectiveStreamItems,
|
||||
head: effectiveStreamHead,
|
||||
enabled: outlineEnabled,
|
||||
enabled: outlineRail.enabled,
|
||||
viewportRef,
|
||||
onJumpError: handleTimelineHistoryLoadError,
|
||||
mountedHistoryMessageIds,
|
||||
revealLoadedMessage: revealLoadedHistory,
|
||||
});
|
||||
|
||||
const outlineLayout = useChatOutlineRailLayout(outlineEnabled);
|
||||
|
||||
useImperativeHandle(
|
||||
ref,
|
||||
() => ({
|
||||
@@ -1176,10 +1171,7 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
|
||||
visibleMessageIds={mountedMessageIds}
|
||||
>
|
||||
<ToolCallSheetProvider>
|
||||
<AssistantSelectionCopySurface
|
||||
style={stylesheet.container}
|
||||
onLayout={outlineLayout.onLayout}
|
||||
>
|
||||
<AssistantSelectionCopySurface style={stylesheet.container}>
|
||||
<MessageOuterSpacingProvider disableOuterSpacing>
|
||||
<ToolCallExpansionContext.Provider value={toolCallExpansion}>
|
||||
<UserMessageExpansionContext.Provider value={userMessageExpansion}>
|
||||
@@ -1208,12 +1200,12 @@ const AgentStreamViewComponent = forwardRef<AgentStreamViewHandle, AgentStreamVi
|
||||
baseListContentContainerStyle: stylesheet.listContentContainer,
|
||||
forwardListContentContainerStyle: stylesheet.forwardListContentContainer,
|
||||
contentMaxWidth,
|
||||
outlineInset: outlineLayout.inset,
|
||||
outlineInset,
|
||||
})}
|
||||
</UserMessageExpansionContext.Provider>
|
||||
</ToolCallExpansionContext.Provider>
|
||||
</MessageOuterSpacingProvider>
|
||||
{outlineLayout.inset > 0 && chatOutline.prompts.length >= 2 ? (
|
||||
{outlineInset > 0 && chatOutline.prompts.length >= 2 ? (
|
||||
<ChatOutlineRail
|
||||
prompts={chatOutline.prompts}
|
||||
activePrompt={chatOutline.activePrompt}
|
||||
|
||||
@@ -1,20 +1,14 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { View, type LayoutChangeEvent, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { View, type StyleProp, type ViewStyle } from "react-native";
|
||||
|
||||
interface AssistantSelectionCopySurfaceProps {
|
||||
children: ReactNode;
|
||||
style?: StyleProp<ViewStyle>;
|
||||
onLayout?: (event: LayoutChangeEvent) => void;
|
||||
}
|
||||
|
||||
export function AssistantSelectionCopySurface({
|
||||
children,
|
||||
style,
|
||||
onLayout,
|
||||
}: AssistantSelectionCopySurfaceProps) {
|
||||
return (
|
||||
<View style={style} onLayout={onLayout}>
|
||||
{children}
|
||||
</View>
|
||||
);
|
||||
return <View style={style}>{children}</View>;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import { useCallback, type ClipboardEvent, type CSSProperties, type ReactNode } from "react";
|
||||
import { View, type LayoutChangeEvent, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { createAssistantSelectionClipboardContent } from "./content.web";
|
||||
|
||||
interface AssistantSelectionCopySurfaceProps {
|
||||
children: ReactNode;
|
||||
style?: StyleProp<ViewStyle>;
|
||||
onLayout?: (event: LayoutChangeEvent) => void;
|
||||
}
|
||||
|
||||
const DISPLAY_CONTENTS: CSSProperties = { display: "contents" };
|
||||
@@ -13,7 +12,6 @@ const DISPLAY_CONTENTS: CSSProperties = { display: "contents" };
|
||||
export function AssistantSelectionCopySurface({
|
||||
children,
|
||||
style,
|
||||
onLayout,
|
||||
}: AssistantSelectionCopySurfaceProps) {
|
||||
const handleCopy = useCallback((event: ClipboardEvent<HTMLDivElement>) => {
|
||||
const content = createAssistantSelectionClipboardContent(window.getSelection());
|
||||
@@ -28,9 +26,7 @@ export function AssistantSelectionCopySurface({
|
||||
|
||||
return (
|
||||
<div onCopy={handleCopy} style={DISPLAY_CONTENTS}>
|
||||
<View style={style} onLayout={onLayout}>
|
||||
{children}
|
||||
</View>
|
||||
<View style={style}>{children}</View>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { CHAT_OUTLINE_GUTTER_INSET } from "@/agent-stream/chat-outline/geometry";
|
||||
import { CHAT_COLUMN_BASE_GUTTER, resolveChatColumnGutters } from "./gutters";
|
||||
import {
|
||||
CHAT_COLUMN_RAIL_DATASET as NATIVE_CHAT_COLUMN_RAIL_DATASET,
|
||||
ChatColumnRailSurface as NativeChatColumnRailSurface,
|
||||
useChatOutlineRail as useNativeChatOutlineRail,
|
||||
} from "./index.native";
|
||||
import { CHAT_COLUMN_RAIL_DATASET as WEB_CHAT_COLUMN_RAIL_DATASET } from "./index.web";
|
||||
|
||||
describe("resolveChatColumnGutters", () => {
|
||||
it("uses symmetric base gutters when no outline inset is reserved", () => {
|
||||
expect(
|
||||
resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: 0,
|
||||
contentMaxWidth: 820,
|
||||
}),
|
||||
).toEqual({ paddingLeft: 16, paddingRight: 16 });
|
||||
|
||||
expect(
|
||||
resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: 0,
|
||||
contentMaxWidth: undefined,
|
||||
}),
|
||||
).toEqual({ paddingLeft: 16, paddingRight: 16 });
|
||||
});
|
||||
|
||||
it("reserves only the left outline gutter when content width is Full", () => {
|
||||
expect(
|
||||
resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: CHAT_OUTLINE_GUTTER_INSET,
|
||||
contentMaxWidth: undefined,
|
||||
}),
|
||||
).toEqual({ paddingLeft: 60, paddingRight: 16 });
|
||||
});
|
||||
|
||||
it("balances capped columns with a clamped right gutter from the remaining width", () => {
|
||||
expect(
|
||||
resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: CHAT_OUTLINE_GUTTER_INSET,
|
||||
contentMaxWidth: 820,
|
||||
}),
|
||||
).toEqual({
|
||||
paddingLeft: 60,
|
||||
paddingRight: "clamp(16px, calc(100% - 880px), 60px)",
|
||||
});
|
||||
|
||||
expect(
|
||||
resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: CHAT_OUTLINE_GUTTER_INSET,
|
||||
contentMaxWidth: 1200,
|
||||
}),
|
||||
).toEqual({
|
||||
paddingLeft: 60,
|
||||
paddingRight: "clamp(16px, calc(100% - 1260px), 60px)",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("native and web chat-rail boundaries", () => {
|
||||
it("keeps native as a zero-overhead pass-through with no dataset or outline inset", () => {
|
||||
const sentinel = "child";
|
||||
expect(NATIVE_CHAT_COLUMN_RAIL_DATASET).toBeUndefined();
|
||||
expect(useNativeChatOutlineRail()).toEqual({ enabled: false, inset: 0 });
|
||||
expect(NativeChatColumnRailSurface({ serverId: "srv-1", children: sentinel })).toBe(sentinel);
|
||||
});
|
||||
|
||||
it("tags web rail lanes with a frozen dataset reference", () => {
|
||||
expect(WEB_CHAT_COLUMN_RAIL_DATASET).toEqual({ chatRailLane: "true" });
|
||||
expect(Object.isFrozen(WEB_CHAT_COLUMN_RAIL_DATASET)).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,30 @@
|
||||
import { SPACING } from "@/styles/theme";
|
||||
|
||||
export const CHAT_COLUMN_BASE_GUTTER = SPACING[4];
|
||||
|
||||
export interface ChatColumnGutters {
|
||||
paddingLeft: number;
|
||||
paddingRight: number | string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Horizontal padding for a chat column on web.
|
||||
*
|
||||
* When the chat outline reserves `outlineInset` on the left, a capped column matches
|
||||
* that inset on the right using only the horizontal slack left over after fitting
|
||||
* `contentMaxWidth`. Default and Wide stay centered while the pane has room, shift
|
||||
* smoothly away from the outline as the pane narrows, and fall back to the base gutter
|
||||
* on the right when uncapped (`Full`) or tight.
|
||||
*/
|
||||
export function resolveChatColumnGutters(input: {
|
||||
gutter: number;
|
||||
outlineInset: number;
|
||||
contentMaxWidth: number | undefined;
|
||||
}): ChatColumnGutters {
|
||||
const paddingLeft = input.gutter + input.outlineInset;
|
||||
const paddingRight =
|
||||
input.outlineInset > 0 && input.contentMaxWidth !== undefined
|
||||
? `clamp(${input.gutter}px, calc(100% - ${paddingLeft + input.contentMaxWidth}px), ${paddingLeft}px)`
|
||||
: input.gutter;
|
||||
return { paddingLeft, paddingRight };
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
import type { ReactNode } from "react";
|
||||
|
||||
export interface ChatColumnRailSurfaceProps {
|
||||
serverId: string;
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export interface ChatOutlineRailState {
|
||||
/** Whether the chat outline feature is enabled for this pane (independent of pane width). */
|
||||
readonly enabled: boolean;
|
||||
/** Left gutter inset currently reserved for the outline rail (`0` or `44` on web). */
|
||||
readonly inset: number;
|
||||
}
|
||||
|
||||
const DISABLED_CHAT_OUTLINE_RAIL: ChatOutlineRailState = Object.freeze({
|
||||
enabled: false,
|
||||
inset: 0,
|
||||
});
|
||||
|
||||
/**
|
||||
* Marker for chat surfaces (composer, track bar, callouts) that share the pane's
|
||||
* horizontal column rail. On web, an active `ChatColumnRailSurface` applies the
|
||||
* pane's outline-aware gutters via CSS custom properties without re-rendering
|
||||
* children. Native never reserves an outline gutter, so this is undefined.
|
||||
*/
|
||||
export const CHAT_COLUMN_RAIL_DATASET: Record<string, string> | undefined = undefined;
|
||||
|
||||
/**
|
||||
* Native pass-through: the chat outline is a wide-layout web affordance, so native
|
||||
* renders no wrapper view, registers no subscriptions, and reserves no outline inset.
|
||||
*/
|
||||
export function ChatColumnRailSurface({ children }: ChatColumnRailSurfaceProps) {
|
||||
return children;
|
||||
}
|
||||
|
||||
/** Chat outline state for this pane (always disabled with 0 inset on native). */
|
||||
export function useChatOutlineRail(): ChatOutlineRailState {
|
||||
return DISABLED_CHAT_OUTLINE_RAIL;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
export {
|
||||
CHAT_COLUMN_RAIL_DATASET,
|
||||
ChatColumnRailSurface,
|
||||
useChatOutlineRail,
|
||||
type ChatColumnRailSurfaceProps,
|
||||
type ChatOutlineRailState,
|
||||
} from "./index.native";
|
||||
@@ -0,0 +1,143 @@
|
||||
import {
|
||||
createContext,
|
||||
useContext,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
type CSSProperties,
|
||||
} from "react";
|
||||
import {
|
||||
CHAT_OUTLINE_GUTTER_INSET,
|
||||
CHAT_OUTLINE_MIN_PANEL_WIDTH,
|
||||
} from "@/agent-stream/chat-outline/geometry";
|
||||
import { resolveContentMaxWidth, useSettings } from "@/hooks/use-settings";
|
||||
import { useSessionStore } from "@/stores/session-store";
|
||||
import { CHAT_COLUMN_BASE_GUTTER, resolveChatColumnGutters } from "./gutters";
|
||||
import type { ChatColumnRailSurfaceProps, ChatOutlineRailState } from "./index";
|
||||
|
||||
export type { ChatColumnRailSurfaceProps, ChatOutlineRailState };
|
||||
|
||||
const STYLE_ID = "paseo-chat-column-rail";
|
||||
// React Native Web turns `dataSet={{ chatRailLane: "true" }}` into `data-chat-rail-lane="true"`.
|
||||
// When the enclosing pane reserves an outline gutter, every tagged rail consumer receives
|
||||
// the same horizontal gutters in the browser's layout pass without re-rendering React subtrees
|
||||
// or growing Unistyles' CSS registry.
|
||||
const RAIL_RULE =
|
||||
'[data-chat-rail-active="true"] [data-chat-rail-lane="true"]{padding-left:var(--paseo-chat-rail-left)!important;padding-right:var(--paseo-chat-rail-right)!important;}';
|
||||
|
||||
const BASE_SURFACE_STYLE: CSSProperties = {
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
minHeight: 0,
|
||||
};
|
||||
|
||||
const DISABLED_CHAT_OUTLINE_RAIL: ChatOutlineRailState = Object.freeze({
|
||||
enabled: false,
|
||||
inset: 0,
|
||||
});
|
||||
|
||||
const ChatOutlineRailContext = createContext<ChatOutlineRailState>(DISABLED_CHAT_OUTLINE_RAIL);
|
||||
|
||||
export const CHAT_COLUMN_RAIL_DATASET: Record<string, string> | undefined = Object.freeze({
|
||||
chatRailLane: "true",
|
||||
});
|
||||
|
||||
function ensureChatColumnRailStyle(): void {
|
||||
if (typeof document === "undefined") return;
|
||||
if (document.getElementById(STYLE_ID)) return;
|
||||
const style = document.createElement("style");
|
||||
style.id = STYLE_ID;
|
||||
style.textContent = RAIL_RULE;
|
||||
document.head.appendChild(style);
|
||||
}
|
||||
|
||||
function cssLength(value: number | string): string {
|
||||
return typeof value === "number" ? `${value}px` : value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pane-level owner of the chat column rail on web.
|
||||
*
|
||||
* Measures the pane width once against `CHAT_OUTLINE_MIN_PANEL_WIDTH` (ignoring 0px
|
||||
* measurements from hidden retained tabs) and publishes the resolved horizontal gutters
|
||||
* via CSS custom properties to the composer, track bar, and callouts. Only the outline
|
||||
* enabled flag and reserved inset (`0` or `44`) enter React context for `AgentStreamView`.
|
||||
*/
|
||||
export function ChatColumnRailSurface({ serverId, children }: ChatColumnRailSurfaceProps) {
|
||||
const surfaceRef = useRef<HTMLDivElement | null>(null);
|
||||
const [isBelow, setIsBelow] = useState(true);
|
||||
const chatOutlineEnabled = useSettings((settings) => settings.chatOutlineEnabled);
|
||||
const contentMaxWidth = useSettings(resolveContentMaxWidth);
|
||||
const supportsChatOutline = useSessionStore(
|
||||
(state) => state.sessions[serverId]?.serverInfo?.features?.agentTimelinePromptIndex === true,
|
||||
);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
const node = surfaceRef.current;
|
||||
if (!node) return;
|
||||
const update = (width: number) => {
|
||||
// Retained inactive tabs sit under `display: none` and report 0; ignore them.
|
||||
if (width <= 0) return;
|
||||
const next = width < CHAT_OUTLINE_MIN_PANEL_WIDTH;
|
||||
setIsBelow((current) => (current === next ? current : next));
|
||||
};
|
||||
update(node.getBoundingClientRect().width);
|
||||
if (typeof ResizeObserver === "undefined") return;
|
||||
const observer = new ResizeObserver((entries) => {
|
||||
const width =
|
||||
entries[entries.length - 1]?.contentRect.width ?? node.getBoundingClientRect().width;
|
||||
update(width);
|
||||
});
|
||||
observer.observe(node);
|
||||
return () => observer.disconnect();
|
||||
}, []);
|
||||
|
||||
const enabled = supportsChatOutline && chatOutlineEnabled;
|
||||
const inset = enabled && !isBelow ? CHAT_OUTLINE_GUTTER_INSET : 0;
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (inset > 0) {
|
||||
ensureChatColumnRailStyle();
|
||||
}
|
||||
}, [inset]);
|
||||
|
||||
const outlineRail = useMemo<ChatOutlineRailState>(
|
||||
() => (enabled ? { enabled, inset } : DISABLED_CHAT_OUTLINE_RAIL),
|
||||
[enabled, inset],
|
||||
);
|
||||
|
||||
const surfaceStyle = useMemo((): CSSProperties => {
|
||||
if (inset === 0) {
|
||||
return BASE_SURFACE_STYLE;
|
||||
}
|
||||
const gutters = resolveChatColumnGutters({
|
||||
gutter: CHAT_COLUMN_BASE_GUTTER,
|
||||
outlineInset: inset,
|
||||
contentMaxWidth,
|
||||
});
|
||||
return {
|
||||
...BASE_SURFACE_STYLE,
|
||||
"--paseo-chat-rail-left": cssLength(gutters.paddingLeft),
|
||||
"--paseo-chat-rail-right": cssLength(gutters.paddingRight),
|
||||
} as CSSProperties;
|
||||
}, [contentMaxWidth, inset]);
|
||||
|
||||
return (
|
||||
<ChatOutlineRailContext.Provider value={outlineRail}>
|
||||
<div
|
||||
ref={surfaceRef}
|
||||
style={surfaceStyle}
|
||||
data-chat-rail-active={inset > 0 ? "true" : undefined}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
</ChatOutlineRailContext.Provider>
|
||||
);
|
||||
}
|
||||
|
||||
export function useChatOutlineRail(): ChatOutlineRailState {
|
||||
return useContext(ChatOutlineRailContext);
|
||||
}
|
||||
@@ -2,6 +2,7 @@ import { useCallback, useState } from "react";
|
||||
import { View, Text } from "react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
import { FOOTER_HEIGHT } from "@/constants/layout";
|
||||
import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
|
||||
import { KeyboardTranslateView } from "@/keyboard/shift";
|
||||
@@ -35,7 +36,7 @@ export function ArchivedAgentCallout({ serverId, agentId }: ArchivedAgentCallout
|
||||
|
||||
return (
|
||||
<KeyboardTranslateView style={styles.container}>
|
||||
<View style={styles.inputAreaContainer}>
|
||||
<View style={styles.inputAreaContainer} dataSet={CHAT_COLUMN_RAIL_DATASET}>
|
||||
<View style={styles.inputAreaContent}>
|
||||
<View style={styles.calloutStack}>
|
||||
<View style={styles.callout}>
|
||||
|
||||
@@ -24,6 +24,9 @@ import { isNative } from "@/constants/platform";
|
||||
*/
|
||||
export const WINDOW_CONTENT_DATASET = { "window-content": "" };
|
||||
|
||||
/** Reserves a clickable area for a control mounted outside the titlebar rail. */
|
||||
export const WINDOW_NO_DRAG_DATASET = { "window-no-drag": "" };
|
||||
|
||||
export const titlebarDragSurfaceStyle: React.CSSProperties = {
|
||||
cursor: "default",
|
||||
// @ts-expect-error — WebkitAppRegion is not in CSSProperties
|
||||
|
||||
@@ -27,6 +27,7 @@ const NO_SHORTCUT: ShortcutKey[] = [];
|
||||
interface CompactHeaderProps {
|
||||
/** The leading island: the sidebar menu, or a back button. */
|
||||
navigation: "menu" | "back";
|
||||
inDesktopTitlebar?: boolean;
|
||||
/** Back button action. Defaults to navigating back. */
|
||||
onBack?: () => void;
|
||||
title?: string;
|
||||
@@ -49,6 +50,7 @@ interface CompactHeaderProps {
|
||||
*/
|
||||
export function CompactHeader({
|
||||
navigation,
|
||||
inDesktopTitlebar = false,
|
||||
onBack,
|
||||
title,
|
||||
titleTestID,
|
||||
@@ -58,22 +60,28 @@ export function CompactHeader({
|
||||
}: CompactHeaderProps) {
|
||||
const insets = useSafeAreaInsets();
|
||||
const inTopBand = useTopBand() !== null;
|
||||
const usesTitlebarHeight = inTopBand || inDesktopTitlebar;
|
||||
const rootStyle = useMemo(
|
||||
() => [
|
||||
styles.root,
|
||||
{
|
||||
paddingTop: insets.top + (inTopBand ? 0 : HEADER_TOP_PADDING_MOBILE),
|
||||
paddingTop: insets.top + (usesTitlebarHeight ? 0 : HEADER_TOP_PADDING_MOBILE),
|
||||
marginLeft: insets.left,
|
||||
marginRight: insets.right,
|
||||
},
|
||||
],
|
||||
[inTopBand, insets.top, insets.left, insets.right],
|
||||
[usesTitlebarHeight, insets.top, insets.left, insets.right],
|
||||
);
|
||||
|
||||
return (
|
||||
<IconButtonChromeProvider value="header-island">
|
||||
<View style={rootStyle}>
|
||||
<View style={inTopBand ? styles.topBandRow : styles.row}>
|
||||
<View
|
||||
style={[
|
||||
usesTitlebarHeight ? styles.titlebarRow : styles.row,
|
||||
inDesktopTitlebar && styles.desktopTitlebarDividerSpace,
|
||||
]}
|
||||
>
|
||||
<View style={styles.island}>
|
||||
{navigation === "menu" ? <SidebarMenuToggle /> : <BackButton onBack={onBack} />}
|
||||
</View>
|
||||
@@ -155,12 +163,16 @@ const styles = StyleSheet.create((theme) => ({
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
topBandRow: {
|
||||
titlebarRow: {
|
||||
height: HEADER_INNER_HEIGHT,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
desktopTitlebarDividerSpace: {
|
||||
borderBottomWidth: theme.borderWidth[1],
|
||||
borderBottomColor: "transparent",
|
||||
},
|
||||
titleGroup: {
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
|
||||
@@ -4,6 +4,7 @@ import type { JsonValue } from "@getpaseo/protocol/agent-types";
|
||||
import { Keyboard, StyleSheet as RNStyleSheet, Text, View } from "react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
import { useContainerWidthBelow } from "@/hooks/use-container-width";
|
||||
import invariant from "tiny-invariant";
|
||||
import { Composer } from "@/composer";
|
||||
@@ -536,14 +537,17 @@ export function WorkspaceDraftComposer({
|
||||
return (
|
||||
<View style={animatedStaticStyles.inputAreaWrapper} onLayout={onInputAreaLayout}>
|
||||
{formErrorMessage ? (
|
||||
<View style={styles.formErrorRow}>
|
||||
<View
|
||||
style={styles.formErrorRow}
|
||||
dataSet={isComposerFullscreen ? undefined : CHAT_COLUMN_RAIL_DATASET}
|
||||
>
|
||||
<View style={styles.formError}>
|
||||
<Text style={styles.errorText}>{formErrorMessage}</Text>
|
||||
</View>
|
||||
</View>
|
||||
) : null}
|
||||
{importPillPress && !isComposerFullscreen ? (
|
||||
<View style={styles.importPillRow}>
|
||||
<View style={styles.importPillRow} dataSet={CHAT_COLUMN_RAIL_DATASET}>
|
||||
<View style={styles.importPillContent}>
|
||||
<ComposerImportPill onPress={importPillPress} />
|
||||
</View>
|
||||
|
||||
@@ -30,6 +30,7 @@ import {
|
||||
} from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import {
|
||||
controlSizingForLayout,
|
||||
@@ -2575,7 +2576,10 @@ function ComposerContentImpl({
|
||||
>
|
||||
<AttachmentLightbox source={lightboxSource} onClose={handleLightboxClose} />
|
||||
{/* Input area */}
|
||||
<View style={inputAreaContainerStyle}>
|
||||
<View
|
||||
style={inputAreaContainerStyle}
|
||||
dataSet={isFullscreen ? undefined : CHAT_COLUMN_RAIL_DATASET}
|
||||
>
|
||||
<View style={inputAreaContentStyle}>
|
||||
{isFullscreen ? null : queueList}
|
||||
{!isFullscreen && sendErrorNode}
|
||||
|
||||
@@ -21,6 +21,7 @@ import {
|
||||
useHorizontalScrollBoundary,
|
||||
} from "@/components/ui/horizontal-scroll-boundary";
|
||||
import { STATUS_RING_HALO_INSET } from "@/components/status-ring/geometry";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
import { isWeb } from "@/constants/platform";
|
||||
import { usePanelAwareHorizontalScrollGesture } from "@/mobile-panels/gestures";
|
||||
import { getStatusDotColor } from "@/utils/status-dot-color";
|
||||
@@ -45,7 +46,7 @@ export function ComposerTrackBar({ children }: { children: ReactNode }): ReactEl
|
||||
const scrollGesture = usePanelAwareHorizontalScrollGesture();
|
||||
const scrollBoundary = useHorizontalScrollBoundary();
|
||||
return (
|
||||
<View style={styles.bar} pointerEvents="box-none">
|
||||
<View style={styles.bar} dataSet={CHAT_COLUMN_RAIL_DATASET} pointerEvents="box-none">
|
||||
<View style={styles.trackViewport} pointerEvents="box-none">
|
||||
<GestureDetector gesture={scrollGesture}>
|
||||
<Animated.ScrollView
|
||||
|
||||
@@ -2892,7 +2892,8 @@ export const ar: TranslationResources = {
|
||||
updateAvailable: "التحديث متاح",
|
||||
updateTitle: "تحديث مهارات Paseo ؟",
|
||||
uninstallTitle: "إلغاء تثبيت مهارات Paseo ؟",
|
||||
uninstallMessage: "يزيل جميع مهارات تنسيق Paseo من ~/.agents ، ~/.claude ، ~/.codex.",
|
||||
uninstallMessage:
|
||||
"يزيل جميع مهارات تنسيق Paseo من ~/.agents و~/.claude و~/.codex و~/.gemini/config.",
|
||||
choose: "اختيار المهارات",
|
||||
chooseAll: "كل المهارات",
|
||||
chooseAllHint: "أبقِ جميع المهارات المرفقة مثبتة، بما فيها ما يُضاف لاحقًا.",
|
||||
@@ -2900,7 +2901,7 @@ export const ar: TranslationResources = {
|
||||
chooseEmpty: "لا تتضمن هذه النسخة أي مهارات.",
|
||||
removeTitle: "إزالة المهارات غير المحددة؟",
|
||||
removeMessage:
|
||||
"سيتم حذف {{skills}} من ~/.agents و~/.claude و~/.codex. كما يُحذف كل ما أضفته داخل مجلدات المهارات تلك.",
|
||||
"سيتم حذف {{skills}} من ~/.agents و~/.claude و~/.codex و~/.gemini/config. كما يُحذف كل ما أضفته داخل مجلدات المهارات تلك.",
|
||||
saveFailed: "تعذر حفظ اختيار المهارات.",
|
||||
statusFailed: "غير قادر على التحقق من حالة مهارات التنسيق.",
|
||||
updateFailed: "غير قادر على تحديث مهارات التنسيق.",
|
||||
|
||||
@@ -2994,7 +2994,7 @@ export const en = {
|
||||
updateTitle: "Update Paseo skills?",
|
||||
uninstallTitle: "Uninstall Paseo skills?",
|
||||
uninstallMessage:
|
||||
"Removes all Paseo orchestration skills from ~/.agents, ~/.claude, ~/.codex on this host.",
|
||||
"Removes all Paseo orchestration skills from ~/.agents, ~/.claude, ~/.codex, and ~/.gemini/config on this host.",
|
||||
choose: "Choose skills",
|
||||
chooseAll: "All skills",
|
||||
chooseAllHint: "Keep every bundled skill installed, including ones added later.",
|
||||
@@ -3002,7 +3002,7 @@ export const en = {
|
||||
chooseEmpty: "This host bundles no skills.",
|
||||
removeTitle: "Remove deselected skills?",
|
||||
removeMessage:
|
||||
"{{skills}} will be deleted from ~/.agents, ~/.claude, and ~/.codex on this host. Anything you added inside those skill folders is deleted too.",
|
||||
"{{skills}} will be deleted from ~/.agents, ~/.claude, ~/.codex, and ~/.gemini/config on this host. Anything you added inside those skill folders is deleted too.",
|
||||
saveFailed: "Could not save your skill selection.",
|
||||
actions: {
|
||||
update: "Update",
|
||||
|
||||
@@ -2916,7 +2916,7 @@ export const es: TranslationResources = {
|
||||
updateTitle: "¿Actualizar las habilidades dePaseo?",
|
||||
uninstallTitle: "¿Desinstalar las habilidadesPaseo?",
|
||||
uninstallMessage:
|
||||
"Elimina todas las habilidades de orquestaciónPaseode ~/.agents, ~/.claude, ~/.codex.",
|
||||
"Elimina todas las habilidades de orquestación Paseo de ~/.agents, ~/.claude, ~/.codex y ~/.gemini/config.",
|
||||
choose: "Elegir habilidades",
|
||||
chooseAll: "Todas las habilidades",
|
||||
chooseAllHint:
|
||||
@@ -2925,7 +2925,7 @@ export const es: TranslationResources = {
|
||||
chooseEmpty: "Esta versión no incluye habilidades.",
|
||||
removeTitle: "¿Eliminar las habilidades deseleccionadas?",
|
||||
removeMessage:
|
||||
"{{skills}} se eliminarán de ~/.agents, ~/.claude y ~/.codex. También se elimina todo lo que hayas añadido dentro de esas carpetas de habilidades.",
|
||||
"{{skills}} se eliminarán de ~/.agents, ~/.claude, ~/.codex y ~/.gemini/config. También se elimina todo lo que hayas añadido dentro de esas carpetas de habilidades.",
|
||||
saveFailed: "No se pudo guardar tu selección de habilidades.",
|
||||
statusFailed: "No se puede comprobar el estado de las habilidades de orquestación.",
|
||||
updateFailed: "No se pueden actualizar las habilidades de orquestación.",
|
||||
|
||||
@@ -2919,7 +2919,7 @@ export const fr: TranslationResources = {
|
||||
updateTitle: "Mettre à jour les skills Paseo ?",
|
||||
uninstallTitle: "Désinstaller les skills Paseo ?",
|
||||
uninstallMessage:
|
||||
"Supprime tous les skills d’orchestration Paseo de ~/.agents, ~/.claude et ~/.codex sur cet hôte.",
|
||||
"Supprime tous les skills d’orchestration Paseo de ~/.agents, ~/.claude, ~/.codex et ~/.gemini/config sur cet hôte.",
|
||||
choose: "Choisir les skills",
|
||||
chooseAll: "Tous les skills",
|
||||
chooseAllHint:
|
||||
@@ -2928,7 +2928,7 @@ export const fr: TranslationResources = {
|
||||
chooseEmpty: "Cet hôte ne fournit aucun skill.",
|
||||
removeTitle: "Supprimer les skills décochés ?",
|
||||
removeMessage:
|
||||
"{{skills}} seront supprimés de ~/.agents, ~/.claude et ~/.codex sur cet hôte. Tout ce que vous avez ajouté dans ces dossiers de skills sera également supprimé.",
|
||||
"{{skills}} seront supprimés de ~/.agents, ~/.claude, ~/.codex et ~/.gemini/config sur cet hôte. Tout ce que vous avez ajouté dans ces dossiers de skills sera également supprimé.",
|
||||
saveFailed: "Impossible d’enregistrer votre sélection de skills.",
|
||||
statusFailed: "Impossible de vérifier l’état des skills d’orchestration.",
|
||||
updateFailed: "Impossible de mettre à jour les skills d’orchestration.",
|
||||
|
||||
@@ -2884,7 +2884,7 @@ export const ja: TranslationResources = {
|
||||
updateTitle: "Paseoスキルを更新しますか?",
|
||||
uninstallTitle: "Paseoスキルをアンインストールしますか?",
|
||||
uninstallMessage:
|
||||
"~/.agents、~/.claude、~/.codexからすべてのPaseoオーケストレーションスキルを削除します。",
|
||||
"~/.agents、~/.claude、~/.codex、~/.gemini/configからすべてのPaseoオーケストレーションスキルを削除します。",
|
||||
choose: "スキルを選択",
|
||||
chooseAll: "すべてのスキル",
|
||||
chooseAllHint:
|
||||
@@ -2893,7 +2893,7 @@ export const ja: TranslationResources = {
|
||||
chooseEmpty: "このビルドにはスキルが含まれていません。",
|
||||
removeTitle: "選択を外したスキルを削除しますか?",
|
||||
removeMessage:
|
||||
"{{skills}} を ~/.agents、~/.claude、~/.codex から削除します。それらのスキルフォルダー内に追加したものもすべて削除されます。",
|
||||
"{{skills}} を ~/.agents、~/.claude、~/.codex、~/.gemini/config から削除します。それらのスキルフォルダー内に追加したものもすべて削除されます。",
|
||||
saveFailed: "スキルの選択を保存できませんでした。",
|
||||
statusFailed: "オーケストレーションスキルのステータスを確認できません。",
|
||||
updateFailed: "オーケストレーションスキルを更新できません。",
|
||||
|
||||
@@ -2871,7 +2871,7 @@ export const ko: TranslationResources = {
|
||||
updateTitle: "Paseo 스킬을 업데이트할까요?",
|
||||
uninstallTitle: "Paseo 스킬을 제거할까요?",
|
||||
uninstallMessage:
|
||||
"~/.agents, ~/.claude, ~/.codex에서 모든 Paseo 오케스트레이션 스킬을 제거합니다.",
|
||||
"~/.agents, ~/.claude, ~/.codex, ~/.gemini/config에서 모든 Paseo 오케스트레이션 스킬을 제거합니다.",
|
||||
choose: "스킬 선택",
|
||||
chooseAll: "모든 스킬",
|
||||
chooseAllHint: "나중에 추가되는 항목을 포함하여 모든 번들 스킬을 설치된 상태로 유지합니다.",
|
||||
@@ -2879,7 +2879,7 @@ export const ko: TranslationResources = {
|
||||
chooseEmpty: "이 빌드에는 번들 스킬이 없습니다.",
|
||||
removeTitle: "선택 해제한 스킬을 제거할까요?",
|
||||
removeMessage:
|
||||
"{{skills}}는 ~/.agents, ~/.claude 및 ~/.codex에서 삭제됩니다. 해당 스킬 폴더 안에 추가한 모든 항목도 삭제됩니다.",
|
||||
"{{skills}}는 ~/.agents, ~/.claude, ~/.codex 및 ~/.gemini/config에서 삭제됩니다. 해당 스킬 폴더 안에 추가한 모든 항목도 삭제됩니다.",
|
||||
saveFailed: "선택한 스킬을 저장하지 못했습니다.",
|
||||
statusFailed: "오케스트레이션 스킬 상태를 확인할 수 없습니다.",
|
||||
updateFailed: "오케스트레이션 스킬을 업데이트할 수 없습니다.",
|
||||
|
||||
@@ -2897,7 +2897,7 @@ export const ptBR: TranslationResources = {
|
||||
updateTitle: "Atualizar Paseo skills?",
|
||||
uninstallTitle: "Desinstalar Paseo skills?",
|
||||
uninstallMessage:
|
||||
"Remove todas as skills de orquestração do Paseo de ~/.agents, ~/.claude e ~/.codex.",
|
||||
"Remove todas as skills de orquestração do Paseo de ~/.agents, ~/.claude, ~/.codex e ~/.gemini/config.",
|
||||
choose: "Escolher skills",
|
||||
chooseAll: "Todas as skills",
|
||||
chooseAllHint:
|
||||
@@ -2906,7 +2906,7 @@ export const ptBR: TranslationResources = {
|
||||
chooseEmpty: "Esta versão não inclui skills.",
|
||||
removeTitle: "Remover as skills desmarcadas?",
|
||||
removeMessage:
|
||||
"{{skills}} serão excluídas de ~/.agents, ~/.claude e ~/.codex. Tudo o que você adicionou dentro dessas pastas de skills também é excluído.",
|
||||
"{{skills}} serão excluídas de ~/.agents, ~/.claude, ~/.codex e ~/.gemini/config. Tudo o que você adicionou dentro dessas pastas de skills também é excluído.",
|
||||
saveFailed: "Não foi possível salvar sua seleção de skills.",
|
||||
statusFailed: "Não foi possível verificar o status das skills de orquestração.",
|
||||
updateFailed: "Não foi possível atualizar as skills de orquestração.",
|
||||
|
||||
@@ -2909,7 +2909,7 @@ export const ru: TranslationResources = {
|
||||
updateTitle: "Обновить навыки Paseo?",
|
||||
uninstallTitle: "Удалить навыки Paseo?",
|
||||
uninstallMessage:
|
||||
"Удаляет все навыки оркестрации Paseo из ~/.agents, ~/.claude и ~/.codex на этом хосте.",
|
||||
"Удаляет все навыки оркестрации Paseo из ~/.agents, ~/.claude, ~/.codex и ~/.gemini/config на этом хосте.",
|
||||
choose: "Выбрать навыки",
|
||||
chooseAll: "Все навыки",
|
||||
chooseAllHint: "Устанавливать все встроенные навыки, включая добавленные позже.",
|
||||
@@ -2917,7 +2917,7 @@ export const ru: TranslationResources = {
|
||||
chooseEmpty: "На этом хосте нет встроенных навыков.",
|
||||
removeTitle: "Удалить снятые навыки?",
|
||||
removeMessage:
|
||||
"{{skills}} будут удалены из ~/.agents, ~/.claude и ~/.codex на этом хосте. Всё, что вы добавили в эти папки навыков, тоже будет удалено.",
|
||||
"{{skills}} будут удалены из ~/.agents, ~/.claude, ~/.codex и ~/.gemini/config на этом хосте. Всё, что вы добавили в эти папки навыков, тоже будет удалено.",
|
||||
saveFailed: "Не удалось сохранить выбор навыков.",
|
||||
statusFailed: "Не удалось проверить состояние навыков оркестрации.",
|
||||
updateFailed: "Не удалось обновить навыки оркестрации.",
|
||||
|
||||
@@ -2826,7 +2826,8 @@ export const zhCN: TranslationResources = {
|
||||
updateAvailable: "有更新可用",
|
||||
updateTitle: "更新 Paseo skills?",
|
||||
uninstallTitle: "卸载 Paseo skills?",
|
||||
uninstallMessage: "会从 ~/.agents、~/.claude、~/.codex 移除所有 Paseo 编排 skills。",
|
||||
uninstallMessage:
|
||||
"会从 ~/.agents、~/.claude、~/.codex、~/.gemini/config 移除所有 Paseo 编排 skills。",
|
||||
choose: "选择 skills",
|
||||
chooseAll: "全部 skills",
|
||||
chooseAllHint: "保持安装所有内置 skills,包括以后新增的。",
|
||||
@@ -2834,7 +2835,7 @@ export const zhCN: TranslationResources = {
|
||||
chooseEmpty: "此版本未内置 skills。",
|
||||
removeTitle: "移除取消勾选的 skills?",
|
||||
removeMessage:
|
||||
"将从 ~/.agents、~/.claude、~/.codex 中删除 {{skills}}。你在这些 skill 文件夹里添加的内容也会一并删除。",
|
||||
"将从 ~/.agents、~/.claude、~/.codex、~/.gemini/config 中删除 {{skills}}。你在这些 skill 文件夹里添加的内容也会一并删除。",
|
||||
saveFailed: "无法保存你的 skills 选择。",
|
||||
statusFailed: "无法检查编排 skills 状态。",
|
||||
updateFailed: "无法更新编排 skills。",
|
||||
|
||||
@@ -22,6 +22,7 @@ import { shallow, useShallow } from "zustand/shallow";
|
||||
import { useStoreWithEqualityFn } from "zustand/traditional";
|
||||
import { useAgentStreamTail } from "@/agent-stream/use-agent-stream-tail";
|
||||
import { AgentStreamView, type AgentStreamViewHandle } from "@/agent-stream/view";
|
||||
import { CHAT_COLUMN_RAIL_DATASET, ChatColumnRailSurface } from "@/chat-rail";
|
||||
import { ArchivedAgentCallout } from "@/components/archived-agent-callout";
|
||||
import { ComposerDock } from "@/composer/dock";
|
||||
import { FileDropZone } from "@/components/file-drop/file-drop-zone";
|
||||
@@ -1267,7 +1268,11 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
|
||||
);
|
||||
|
||||
const dock = (
|
||||
<ChatSurface disabled={isArchivingCurrentAgent} fullscreen={isComposerFullscreen}>
|
||||
<ChatSurface
|
||||
serverId={serverId}
|
||||
disabled={isArchivingCurrentAgent}
|
||||
fullscreen={isComposerFullscreen}
|
||||
>
|
||||
{dockContent}
|
||||
{composerSection}
|
||||
{dockOverlay}
|
||||
@@ -1337,10 +1342,12 @@ function wrapAgentCommandProvider({
|
||||
}
|
||||
|
||||
function ChatSurface({
|
||||
serverId,
|
||||
children,
|
||||
disabled,
|
||||
fullscreen,
|
||||
}: {
|
||||
serverId: string;
|
||||
children: [ReactNode, ReactNode, ReactNode];
|
||||
disabled: boolean;
|
||||
fullscreen: boolean;
|
||||
@@ -1349,9 +1356,11 @@ function ChatSurface({
|
||||
// closes everything the chat opened.
|
||||
return (
|
||||
<OverlayDismissalScope>
|
||||
<FileDropZone style={styles.container} disabled={disabled}>
|
||||
<ComposerDock fullscreen={fullscreen}>{children}</ComposerDock>
|
||||
</FileDropZone>
|
||||
<ChatColumnRailSurface serverId={serverId}>
|
||||
<FileDropZone style={styles.container} disabled={disabled}>
|
||||
<ComposerDock fullscreen={fullscreen}>{children}</ComposerDock>
|
||||
</FileDropZone>
|
||||
</ChatColumnRailSurface>
|
||||
</OverlayDismissalScope>
|
||||
);
|
||||
}
|
||||
@@ -1365,7 +1374,7 @@ function TimelineSyncErrorCallout({
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<View style={styles.timelineSyncCalloutRail}>
|
||||
<View style={styles.timelineSyncCalloutRail} dataSet={CHAT_COLUMN_RAIL_DATASET}>
|
||||
<View style={styles.timelineSyncCalloutContent}>
|
||||
<View style={styles.timelineSyncCallout} testID="agent-timeline-sync-error">
|
||||
<Text style={styles.timelineSyncCalloutText}>
|
||||
|
||||
@@ -1,24 +1,39 @@
|
||||
import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
|
||||
import type { NavigateToWorkspaceInput } from "@/stores/navigation-active-workspace-store";
|
||||
import { parseServerIdFromPathname } from "@/utils/host-routes";
|
||||
import { isHttpUrl } from "@/utils/http-url";
|
||||
|
||||
interface HostNavigationOwner {
|
||||
browserAvailable: boolean;
|
||||
openAgent(input: { serverId: string; agentId: string }): void;
|
||||
openWorkspace(input: NavigateToWorkspaceInput): void;
|
||||
isHostRegistered(serverId: string): boolean;
|
||||
openAgent(input: { serverId: string; agentId: string }): string;
|
||||
openWorkspace(input: NavigateToWorkspaceInput): string;
|
||||
resolveWorkspace(input: { serverId: string; workspaceId: string }): string | null;
|
||||
createBrowser(input: { initialUrl: string }): { browserId: string };
|
||||
focusHost(serverId: string): void;
|
||||
}
|
||||
|
||||
export function createPluginHostNavigation(
|
||||
serverId: string,
|
||||
owner: HostNavigationOwner,
|
||||
): NonNullable<PluginSurfaceProps["navigation"]> {
|
||||
const focusRouteHost = (route: string) => {
|
||||
const destinationServerId = parseServerIdFromPathname(route);
|
||||
if (destinationServerId && owner.isHostRegistered(destinationServerId)) {
|
||||
owner.focusHost(destinationServerId);
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
openAgent: ({ agentId, serverId: targetServerId }) =>
|
||||
owner.openAgent({ serverId: targetServerId ?? serverId, agentId }),
|
||||
openWorkspace: ({ workspaceId, serverId: targetServerId }) =>
|
||||
owner.openWorkspace({ serverId: targetServerId ?? serverId, workspaceId }),
|
||||
supportsFocusHost: true,
|
||||
openAgent: ({ agentId, serverId: targetServerId, focusHost }) => {
|
||||
const route = owner.openAgent({ serverId: targetServerId ?? serverId, agentId });
|
||||
if (focusHost) focusRouteHost(route);
|
||||
},
|
||||
openWorkspace: ({ workspaceId, serverId: targetServerId, focusHost }) => {
|
||||
const route = owner.openWorkspace({ serverId: targetServerId ?? serverId, workspaceId });
|
||||
if (focusHost) focusRouteHost(route);
|
||||
},
|
||||
openBrowser: owner.browserAvailable
|
||||
? ({ url, workspaceId, serverId: targetServerId }) => {
|
||||
if (!isHttpUrl(url)) throw new Error("Only absolute HTTP(S) URLs are supported.");
|
||||
|
||||
@@ -1,25 +1,58 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { buildHostAgentDetailRoute, buildHostWorkspaceRoute } from "@/utils/host-routes";
|
||||
import { createPluginHostNavigation } from "./host-navigation-model";
|
||||
import { useSidebarViewStore } from "../stores/sidebar-view-store";
|
||||
|
||||
describe("plugin host navigation", () => {
|
||||
function setup(electron = true) {
|
||||
const destinations: unknown[] = [];
|
||||
const browsers: string[] = [];
|
||||
const focusedHosts: string[] = [];
|
||||
const workspaces = new Set(["selected:one", "remote:two"]);
|
||||
const navigation = createPluginHostNavigation("selected", {
|
||||
browserAvailable: electron,
|
||||
isHostRegistered: (serverId: string) => serverId === "selected" || serverId === "remote",
|
||||
resolveWorkspace: ({ serverId, workspaceId }) =>
|
||||
workspaces.has(`${serverId}:${workspaceId}`) ? workspaceId : null,
|
||||
openAgent: (input) => destinations.push(input),
|
||||
openWorkspace: (input) => destinations.push(input),
|
||||
openAgent: (input) => {
|
||||
destinations.push(input);
|
||||
return buildHostAgentDetailRoute(input.serverId, input.agentId);
|
||||
},
|
||||
openWorkspace: (input) => {
|
||||
destinations.push(input);
|
||||
return buildHostWorkspaceRoute(input.serverId, input.workspaceId);
|
||||
},
|
||||
focusHost: (serverId) => {
|
||||
focusedHosts.push(serverId);
|
||||
useSidebarViewStore.getState().focusHost(serverId);
|
||||
},
|
||||
createBrowser: ({ initialUrl }) => {
|
||||
browsers.push(initialUrl);
|
||||
return { browserId: `browser-${browsers.length}` };
|
||||
},
|
||||
});
|
||||
return { navigation, destinations, browsers, workspaces };
|
||||
return { navigation, destinations, browsers, workspaces, focusedHosts };
|
||||
}
|
||||
|
||||
it("focuses the destination host and clears filters that could hide its workspace", () => {
|
||||
useSidebarViewStore.setState({
|
||||
groupMode: "status",
|
||||
hostFilters: ["selected", "other"],
|
||||
projectFilters: ["old-project"],
|
||||
labelFilter: { labels: ["urgent"] },
|
||||
});
|
||||
const { navigation, destinations, focusedHosts } = setup(false);
|
||||
navigation.openAgent({ serverId: "remote", agentId: "agent-2", focusHost: true });
|
||||
expect(focusedHosts).toEqual(["remote"]);
|
||||
expect(destinations).toEqual([{ serverId: "remote", agentId: "agent-2" }]);
|
||||
expect(useSidebarViewStore.getState()).toMatchObject({
|
||||
groupMode: "status",
|
||||
hostFilters: ["remote"],
|
||||
projectFilters: [],
|
||||
labelFilter: { labels: [] },
|
||||
});
|
||||
});
|
||||
|
||||
it("creates and focuses a local browser in the selected or explicit host workspace", () => {
|
||||
const { navigation, destinations, browsers } = setup();
|
||||
navigation.openBrowser!({ url: "https://example.com/one", workspaceId: "one" });
|
||||
@@ -43,6 +76,110 @@ describe("plugin host navigation", () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it("can return from a remote workspace to the installation host without toggling it off", () => {
|
||||
const { navigation, destinations, focusedHosts } = setup();
|
||||
navigation.openWorkspace({ serverId: "remote", workspaceId: "two", focusHost: true });
|
||||
navigation.openWorkspace({ workspaceId: "one", focusHost: true });
|
||||
navigation.openWorkspace({ workspaceId: "one", focusHost: true });
|
||||
expect(focusedHosts).toEqual(["remote", "selected", "selected"]);
|
||||
expect(destinations).toEqual([
|
||||
{ serverId: "remote", workspaceId: "two" },
|
||||
{ serverId: "selected", workspaceId: "one" },
|
||||
{ serverId: "selected", workspaceId: "one" },
|
||||
]);
|
||||
expect(useSidebarViewStore.getState().hostFilters).toEqual(["selected"]);
|
||||
});
|
||||
|
||||
it("focuses the host in the returned route for padded host IDs", () => {
|
||||
const { navigation, destinations, focusedHosts } = setup();
|
||||
navigation.openAgent({ serverId: " remote ", agentId: "agent-2", focusHost: true });
|
||||
navigation.openWorkspace({ serverId: " selected ", workspaceId: "one", focusHost: true });
|
||||
|
||||
expect(destinations).toEqual([
|
||||
{ serverId: " remote ", agentId: "agent-2" },
|
||||
{ serverId: " selected ", workspaceId: "one" },
|
||||
]);
|
||||
expect(focusedHosts).toEqual(["remote", "selected"]);
|
||||
expect(useSidebarViewStore.getState().hostFilters).toEqual(["selected"]);
|
||||
});
|
||||
|
||||
it("leaves existing sidebar filters alone unless explicitly requested", () => {
|
||||
useSidebarViewStore.setState({
|
||||
hostFilters: ["remote"],
|
||||
projectFilters: ["pinned-project"],
|
||||
labelFilter: { labels: ["urgent"] },
|
||||
});
|
||||
const { navigation, destinations, focusedHosts } = setup();
|
||||
navigation.openAgent({ agentId: "agent-1", serverId: " remote " });
|
||||
navigation.openWorkspace({ workspaceId: "one", serverId: " selected ", focusHost: false });
|
||||
expect(destinations).toEqual([
|
||||
{ serverId: " remote ", agentId: "agent-1" },
|
||||
{ serverId: " selected ", workspaceId: "one" },
|
||||
]);
|
||||
expect(focusedHosts).toEqual([]);
|
||||
expect(useSidebarViewStore.getState()).toMatchObject({
|
||||
hostFilters: ["remote"],
|
||||
projectFilters: ["pinned-project"],
|
||||
labelFilter: { labels: ["urgent"] },
|
||||
});
|
||||
expect(navigation.supportsFocusHost).toBe(true);
|
||||
});
|
||||
|
||||
it("preserves sidebar filters when the navigation route has no destination", () => {
|
||||
const filters = {
|
||||
hostFilters: ["selected"],
|
||||
projectFilters: ["pinned-project"],
|
||||
labelFilter: { labels: ["urgent"] },
|
||||
};
|
||||
useSidebarViewStore.setState(filters);
|
||||
const { navigation } = setup();
|
||||
navigation.openAgent({ serverId: "remote", agentId: " ", focusHost: true });
|
||||
navigation.openWorkspace({ serverId: "remote", workspaceId: "", focusHost: true });
|
||||
|
||||
expect(useSidebarViewStore.getState()).toMatchObject(filters);
|
||||
});
|
||||
|
||||
it("preserves sidebar filters when the destination host has been removed", () => {
|
||||
const filters = {
|
||||
hostFilters: ["selected"],
|
||||
projectFilters: ["pinned-project"],
|
||||
labelFilter: { labels: ["urgent"] },
|
||||
};
|
||||
useSidebarViewStore.setState(filters);
|
||||
const { navigation, destinations } = setup();
|
||||
navigation.openAgent({ serverId: "removed", agentId: "agent-2", focusHost: true });
|
||||
navigation.openWorkspace({ serverId: "removed", workspaceId: "two", focusHost: true });
|
||||
|
||||
expect(useSidebarViewStore.getState()).toMatchObject(filters);
|
||||
expect(destinations).toEqual([
|
||||
{ serverId: "removed", agentId: "agent-2" },
|
||||
{ serverId: "removed", workspaceId: "two" },
|
||||
]);
|
||||
});
|
||||
|
||||
it("does not change the filter when navigation rejects the target", () => {
|
||||
const focusedHosts: string[] = [];
|
||||
const unavailable = () => {
|
||||
throw new Error("Target unavailable");
|
||||
};
|
||||
const navigation = createPluginHostNavigation("selected", {
|
||||
browserAvailable: false,
|
||||
isHostRegistered: () => true,
|
||||
resolveWorkspace: () => null,
|
||||
openAgent: unavailable,
|
||||
openWorkspace: unavailable,
|
||||
createBrowser: unavailable,
|
||||
focusHost: (serverId) => focusedHosts.push(serverId),
|
||||
});
|
||||
expect(() => navigation.openAgent({ agentId: "missing", focusHost: true })).toThrow(
|
||||
"Target unavailable",
|
||||
);
|
||||
expect(() => navigation.openWorkspace({ workspaceId: "missing", focusHost: true })).toThrow(
|
||||
"Target unavailable",
|
||||
);
|
||||
expect(focusedHosts).toEqual([]);
|
||||
});
|
||||
|
||||
it("refuses unknown or removed workspaces before creating browser records", () => {
|
||||
const { navigation, destinations, browsers, workspaces } = setup();
|
||||
expect(() =>
|
||||
|
||||
@@ -4,10 +4,12 @@ import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
|
||||
import { useMemo } from "react";
|
||||
import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
|
||||
import { navigateToAgent } from "@/utils/navigate-to-agent";
|
||||
import { getHostRuntimeStore } from "@/runtime/host-runtime";
|
||||
|
||||
import { getIsElectron } from "@/constants/platform";
|
||||
import { createWorkspaceBrowser } from "@/desktop/browser/store";
|
||||
import { createPluginHostNavigation } from "./host-navigation-model";
|
||||
import { useSidebarViewStore } from "@/stores/sidebar-view-store";
|
||||
|
||||
export function usePluginHostNavigation(
|
||||
serverId: string,
|
||||
@@ -16,9 +18,14 @@ export function usePluginHostNavigation(
|
||||
() =>
|
||||
createPluginHostNavigation(serverId, {
|
||||
browserAvailable: getIsElectron(),
|
||||
isHostRegistered: (targetServerId) =>
|
||||
getHostRuntimeStore()
|
||||
.getHosts()
|
||||
.some((host) => host.serverId === targetServerId),
|
||||
openAgent: navigateToAgent,
|
||||
openWorkspace: navigateToWorkspace,
|
||||
createBrowser: createWorkspaceBrowser,
|
||||
focusHost: (targetServerId) => useSidebarViewStore.getState().focusHost(targetServerId),
|
||||
resolveWorkspace: ({ serverId: targetServerId, workspaceId }) =>
|
||||
resolveWorkspaceMapKeyByIdentity({
|
||||
workspaces: useSessionStore.getState().sessions[targetServerId]?.workspaces,
|
||||
|
||||
@@ -20,8 +20,6 @@ afterEach(async () => {
|
||||
await act(async () => root.render(null));
|
||||
usePanelStore.setState(initialPanel, true);
|
||||
});
|
||||
const noop = () => {};
|
||||
const explorerState = { expanded: false };
|
||||
const geometry: WindowLayout = {
|
||||
bounds: { x: 0, y: 0, width: window.innerWidth, height: window.innerHeight },
|
||||
verticalBarEdge: "trailing",
|
||||
@@ -42,9 +40,8 @@ it("updates compact header actions on panel changes without rendering the worksp
|
||||
title="Workspace"
|
||||
subtitle="Project"
|
||||
isSubtitleDistinct
|
||||
onToggleExplorer={noop}
|
||||
explorerToggleLabel="Explorer"
|
||||
explorerToggleAccessibilityState={explorerState}
|
||||
explorerAction={null}
|
||||
inDesktopTitlebar={false}
|
||||
tabSwitcher={null}
|
||||
headerVariant="full"
|
||||
>
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
import { Fragment, useMemo, type ReactNode } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { usePanelStore } from "@/stores/panel-store";
|
||||
import { CompactHeader } from "@/components/headers/compact-header";
|
||||
import {
|
||||
EXPLORER_TOGGLE_KEYS,
|
||||
WorkspaceExplorerToggle,
|
||||
} from "@/screens/workspace/workspace-explorer-toggle";
|
||||
import { WorkspaceHeaderProjectRow } from "@/screens/workspace/workspace-header-project-row";
|
||||
import {
|
||||
useWindowLayout,
|
||||
@@ -23,10 +18,9 @@ interface CompactWorkspaceHeaderProps {
|
||||
title: string;
|
||||
subtitle: string;
|
||||
isSubtitleDistinct: boolean;
|
||||
onToggleExplorer: () => void;
|
||||
explorerToggleLabel: string;
|
||||
explorerToggleAccessibilityState: { expanded: boolean };
|
||||
explorerAction: ReactNode;
|
||||
tabSwitcher: ReactNode;
|
||||
inDesktopTitlebar: boolean;
|
||||
/** Workspace overflow menu. */
|
||||
children: ReactNode;
|
||||
headerVariant: "compact" | "full";
|
||||
@@ -40,17 +34,15 @@ export function CompactWorkspaceHeader({
|
||||
title,
|
||||
subtitle,
|
||||
isSubtitleDistinct,
|
||||
onToggleExplorer,
|
||||
explorerToggleLabel,
|
||||
explorerToggleAccessibilityState,
|
||||
explorerAction,
|
||||
children,
|
||||
tabSwitcher,
|
||||
inDesktopTitlebar,
|
||||
serverId,
|
||||
headerVariant,
|
||||
isRouteFocused,
|
||||
isCompact,
|
||||
}: CompactWorkspaceHeaderProps) {
|
||||
const { t } = useTranslation();
|
||||
const actionsInBar = resolveWorkspaceActionPlacement(useWindowLayout()) === "vertical-bar";
|
||||
const projectRow = useMemo(
|
||||
() => (
|
||||
@@ -65,16 +57,7 @@ export function CompactWorkspaceHeader({
|
||||
const symbols = {
|
||||
"tab-count": tabSwitcher,
|
||||
overflow: children,
|
||||
explorer: (
|
||||
<WorkspaceExplorerToggle
|
||||
onPress={onToggleExplorer}
|
||||
label={explorerToggleLabel}
|
||||
tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
|
||||
tooltipKeys={EXPLORER_TOGGLE_KEYS}
|
||||
accessibilityState={explorerToggleAccessibilityState}
|
||||
mobile
|
||||
/>
|
||||
),
|
||||
explorer: explorerAction,
|
||||
};
|
||||
const actions = resolveWorkspaceBarActions(headerVariant).map((symbol) => (
|
||||
<Fragment key={symbol}>{symbols[symbol]}</Fragment>
|
||||
@@ -85,6 +68,7 @@ export function CompactWorkspaceHeader({
|
||||
{headerVariant === "compact" ? (
|
||||
<CompactHeader
|
||||
navigation="menu"
|
||||
inDesktopTitlebar={inDesktopTitlebar}
|
||||
title={title}
|
||||
titleTestID="workspace-header-title"
|
||||
subtitle={projectRow}
|
||||
|
||||
@@ -1,47 +1,37 @@
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { PanelRight } from "lucide-react-native";
|
||||
import { type StyleProp, type ViewStyle } from "react-native";
|
||||
import { withUnistyles } from "react-native-unistyles";
|
||||
import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
|
||||
import { View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { WINDOW_NO_DRAG_DATASET } from "@/components/desktop/titlebar-drag-region";
|
||||
import { HeaderToggleButton, headerIconSlotStyle } from "@/components/headers/header-toggle-button";
|
||||
import { SidebarCloseButton } from "@/components/headers/sidebar-close-button";
|
||||
import {
|
||||
extraMutedIconColorMapping,
|
||||
iconButtonChromeGlyphSize,
|
||||
mutedIconColorMapping,
|
||||
} from "@/components/ui/icon-button-chrome";
|
||||
import { WORKSPACE_SECONDARY_HEADER_HEIGHT } from "@/constants/layout";
|
||||
import { useHasWindowChromeObstruction } from "@/utils/desktop-window";
|
||||
import type { ShortcutKey } from "@/utils/format-shortcut";
|
||||
|
||||
const ThemedPanelRight = withUnistyles(PanelRight);
|
||||
|
||||
export const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
|
||||
const EXPLORER_TOGGLE_KEYS: ShortcutKey[] = ["mod", "E"];
|
||||
|
||||
interface WorkspaceExplorerToggleProps {
|
||||
onPress: () => void;
|
||||
label: string;
|
||||
tooltipLabel: string;
|
||||
tooltipKeys: ShortcutKey[];
|
||||
accessibilityState: { expanded: boolean };
|
||||
mobile: boolean;
|
||||
style?: StyleProp<ViewStyle>;
|
||||
}
|
||||
|
||||
export type WorkspaceExplorerToggleOwner = "mobile" | "header" | "window";
|
||||
|
||||
export function resolveWorkspaceExplorerToggleOwner({
|
||||
isMobile,
|
||||
hasMacTrafficLights,
|
||||
}: {
|
||||
isMobile: boolean;
|
||||
hasMacTrafficLights: boolean;
|
||||
}): WorkspaceExplorerToggleOwner {
|
||||
if (isMobile) return "mobile";
|
||||
return hasMacTrafficLights ? "window" : "header";
|
||||
}
|
||||
|
||||
export function WorkspaceExplorerToggle({
|
||||
function WorkspaceExplorerToggle({
|
||||
onPress,
|
||||
label,
|
||||
tooltipLabel,
|
||||
tooltipKeys,
|
||||
accessibilityState,
|
||||
mobile,
|
||||
style,
|
||||
@@ -51,7 +41,7 @@ export function WorkspaceExplorerToggle({
|
||||
testID="workspace-explorer-toggle"
|
||||
onPress={onPress}
|
||||
tooltipLabel={tooltipLabel}
|
||||
tooltipKeys={tooltipKeys}
|
||||
tooltipKeys={EXPLORER_TOGGLE_KEYS}
|
||||
tooltipSide="left"
|
||||
style={style}
|
||||
accessible
|
||||
@@ -68,42 +58,97 @@ export function WorkspaceExplorerToggle({
|
||||
);
|
||||
}
|
||||
|
||||
interface DesktopWorkspaceExplorerToggleProps extends Omit<WorkspaceExplorerToggleProps, "mobile"> {
|
||||
owner: WorkspaceExplorerToggleOwner;
|
||||
export function useWorkspaceExplorerControls({
|
||||
hasWorkspace,
|
||||
compact,
|
||||
focusMode,
|
||||
expanded,
|
||||
onToggle,
|
||||
}: {
|
||||
hasWorkspace: boolean;
|
||||
compact: boolean;
|
||||
focusMode: boolean;
|
||||
expanded: boolean;
|
||||
onToggle: () => void;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const hasLeadingWindowControls = useHasWindowChromeObstruction("top-left");
|
||||
const inDesktopTitlebar = hasLeadingWindowControls && hasWorkspace && !compact && !focusMode;
|
||||
|
||||
return useMemo(() => {
|
||||
const props = {
|
||||
label: expanded
|
||||
? t("workspace.tabs.explorerSidebar.close")
|
||||
: t("workspace.tabs.explorerSidebar.open"),
|
||||
tooltipLabel: t("workspace.tabs.explorerSidebar.toggle"),
|
||||
onPress: onToggle,
|
||||
accessibilityState: { expanded },
|
||||
};
|
||||
|
||||
if (inDesktopTitlebar) {
|
||||
// Keep the button in the header Tab order. The active rail carves its slot out of the drag region.
|
||||
const headerSlot = expanded ? null : (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={[headerIconSlotStyle.slot, styles.headerAction]}
|
||||
dataSet={WINDOW_NO_DRAG_DATASET}
|
||||
/>
|
||||
);
|
||||
return {
|
||||
inDesktopTitlebar,
|
||||
headerAction: headerSlot,
|
||||
compactAction: headerSlot,
|
||||
dockAction: (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={[headerIconSlotStyle.slot, styles.dockAction]}
|
||||
dataSet={WINDOW_NO_DRAG_DATASET}
|
||||
/>
|
||||
),
|
||||
titlebarAction: (
|
||||
<View pointerEvents="box-none" style={styles.titlebarSlot}>
|
||||
<WorkspaceExplorerToggle {...props} mobile={false} />
|
||||
</View>
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
inDesktopTitlebar,
|
||||
headerAction: compact ? null : (
|
||||
<WorkspaceExplorerToggle {...props} mobile={false} style={styles.headerAction} />
|
||||
),
|
||||
compactAction: <WorkspaceExplorerToggle {...props} mobile />,
|
||||
dockAction: compact ? (
|
||||
<SidebarCloseButton
|
||||
label={props.label}
|
||||
onPress={onToggle}
|
||||
testID="workspace-explorer-toggle"
|
||||
accessibilityState={props.accessibilityState}
|
||||
/>
|
||||
) : null,
|
||||
titlebarAction: null,
|
||||
};
|
||||
}, [compact, expanded, inDesktopTitlebar, onToggle, t]);
|
||||
}
|
||||
|
||||
export function WorkspaceHeaderExplorerToggle({
|
||||
owner,
|
||||
accessibilityState,
|
||||
style,
|
||||
...toggleProps
|
||||
}: DesktopWorkspaceExplorerToggleProps) {
|
||||
if (owner === "mobile" || (owner === "window" && accessibilityState.expanded)) return null;
|
||||
return (
|
||||
<WorkspaceExplorerToggle
|
||||
{...toggleProps}
|
||||
accessibilityState={accessibilityState}
|
||||
mobile={false}
|
||||
style={style}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export function WorkspaceExplorerSidebarToggle({
|
||||
owner,
|
||||
...toggleProps
|
||||
}: DesktopWorkspaceExplorerToggleProps) {
|
||||
if (owner === "header") return null;
|
||||
if (owner === "mobile") {
|
||||
// The compact Explorer is an overlay like the compact agent list, so it closes with the same X.
|
||||
return (
|
||||
<SidebarCloseButton
|
||||
label={toggleProps.label}
|
||||
onPress={toggleProps.onPress}
|
||||
testID="workspace-explorer-toggle"
|
||||
accessibilityState={toggleProps.accessibilityState}
|
||||
/>
|
||||
);
|
||||
}
|
||||
return <WorkspaceExplorerToggle {...toggleProps} mobile={false} />;
|
||||
}
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
headerAction: {
|
||||
marginRight: { xs: 0, md: -theme.spacing[2] },
|
||||
},
|
||||
dockAction: {
|
||||
// The dock divider is absolutely positioned. Match the other headers' content center.
|
||||
marginBottom: theme.borderWidth[1],
|
||||
},
|
||||
titlebarSlot: {
|
||||
position: "absolute",
|
||||
top: 0,
|
||||
right: theme.spacing[1],
|
||||
height: WORKSPACE_SECONDARY_HEADER_HEIGHT,
|
||||
// Center with the bordered workspace header and Explorer tabs row.
|
||||
borderBottomWidth: theme.borderWidth[1],
|
||||
borderBottomColor: "transparent",
|
||||
justifyContent: "center",
|
||||
zIndex: 1,
|
||||
},
|
||||
}));
|
||||
|
||||
@@ -157,17 +157,8 @@ import {
|
||||
} from "@/screens/workspace/workspace-desktop-tabs-row";
|
||||
import { useDesktopBrowserNewTabRequests } from "@/desktop/browser/new-tab-requests";
|
||||
import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
|
||||
import {
|
||||
resolveWorkspaceExplorerToggleOwner,
|
||||
EXPLORER_TOGGLE_KEYS,
|
||||
WorkspaceExplorerSidebarToggle,
|
||||
WorkspaceHeaderExplorerToggle,
|
||||
} from "@/screens/workspace/workspace-explorer-toggle";
|
||||
import {
|
||||
useHasWindowChromeObstruction,
|
||||
WindowChromeRegion,
|
||||
WindowChromeSafeArea,
|
||||
} from "@/utils/desktop-window";
|
||||
import { useWorkspaceExplorerControls } from "@/screens/workspace/workspace-explorer-toggle";
|
||||
import { WindowChromeRegion, WindowChromeSafeArea } from "@/utils/desktop-window";
|
||||
import {
|
||||
resolveWorkspaceHeaderRenderState,
|
||||
type WorkspaceHeaderCheckoutState,
|
||||
@@ -1058,12 +1049,8 @@ function WorkspaceScreenContent({
|
||||
const isMobile = useIsCompactFormFactor();
|
||||
const canRenderDesktopPaneSplits = supportsDesktopPaneSplits();
|
||||
const layoutMode = useWorkspaceLayoutStore((state) => state.layoutMode);
|
||||
const hasMacTrafficLights = useHasWindowChromeObstruction("top-left");
|
||||
const explorerToggleOwner = resolveWorkspaceExplorerToggleOwner({
|
||||
isMobile,
|
||||
hasMacTrafficLights,
|
||||
});
|
||||
const isFocusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled);
|
||||
const desktopFocusModeEnabled = isFocusModeEnabled && !isMobile;
|
||||
const toggleFocusMode = usePanelStore((state) => state.toggleFocusMode);
|
||||
|
||||
const normalizedServerId = useMemo(() => trimNonEmpty(decodeSegment(serverId)) ?? "", [serverId]);
|
||||
@@ -1308,11 +1295,6 @@ function WorkspaceScreenContent({
|
||||
explorerOpen: isExplorerSidebarShowing,
|
||||
});
|
||||
|
||||
const explorerSidebarToggleAccessibilityState = useMemo(
|
||||
() => ({ expanded: isExplorerSidebarShowing }),
|
||||
[isExplorerSidebarShowing],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
// Back dismisses the compact overlay only. On a wide native layout the
|
||||
// explorer is a tab, `showMobileAgent` has no rendered consumer, and
|
||||
@@ -1820,9 +1802,6 @@ function WorkspaceScreenContent({
|
||||
}),
|
||||
[t],
|
||||
);
|
||||
const explorerSidebarToggleLabel = isExplorerSidebarShowing
|
||||
? t("workspace.tabs.explorerSidebar.close")
|
||||
: t("workspace.tabs.explorerSidebar.open");
|
||||
|
||||
const activeTabKey = useMemo(() => activeTabId ?? "", [activeTabId]);
|
||||
const handleCreateDraftTab = useCallback(
|
||||
@@ -3228,6 +3207,13 @@ function WorkspaceScreenContent({
|
||||
workspaceKey: persistenceKey,
|
||||
});
|
||||
|
||||
const explorerControls = useWorkspaceExplorerControls({
|
||||
hasWorkspace: !!workspaceDirectory,
|
||||
compact: isMobile,
|
||||
focusMode: desktopFocusModeEnabled,
|
||||
expanded: isExplorerSidebarShowing,
|
||||
onToggle: handleToggleExplorerSidebar,
|
||||
});
|
||||
const headerRight = useMemo(
|
||||
() => (
|
||||
<View style={styles.headerRight}>
|
||||
@@ -3254,17 +3240,7 @@ function WorkspaceScreenContent({
|
||||
{workspaceDirectory ? (
|
||||
<>
|
||||
<WorkspaceActions serverId={normalizedServerId} cwd={workspaceDirectory} />
|
||||
{workspaceActionsInBar ? null : (
|
||||
<WorkspaceHeaderExplorerToggle
|
||||
owner={explorerToggleOwner}
|
||||
onPress={handleToggleExplorerSidebar}
|
||||
label={explorerSidebarToggleLabel}
|
||||
tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
|
||||
tooltipKeys={EXPLORER_TOGGLE_KEYS}
|
||||
style={styles.compactHeaderActionButton}
|
||||
accessibilityState={explorerSidebarToggleAccessibilityState}
|
||||
/>
|
||||
)}
|
||||
{workspaceActionsInBar ? null : explorerControls.headerAction}
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
@@ -3279,12 +3255,8 @@ function WorkspaceScreenContent({
|
||||
scriptActions,
|
||||
handleViewScriptTerminal,
|
||||
handleOpenUrlInBrowserTab,
|
||||
handleToggleExplorerSidebar,
|
||||
explorerSidebarToggleLabel,
|
||||
explorerSidebarToggleAccessibilityState,
|
||||
explorerToggleOwner,
|
||||
explorerControls.headerAction,
|
||||
workspaceActionsInBar,
|
||||
t,
|
||||
],
|
||||
);
|
||||
|
||||
@@ -3292,25 +3264,6 @@ function WorkspaceScreenContent({
|
||||
() => shouldShowWorkspaceScreenHeader({ isFocusModeEnabled, isMobile }),
|
||||
[isFocusModeEnabled, isMobile],
|
||||
);
|
||||
const renderExplorerSidebarHeaderAction = useCallback(
|
||||
() => (
|
||||
<WorkspaceExplorerSidebarToggle
|
||||
owner={explorerToggleOwner}
|
||||
onPress={handleToggleExplorerSidebar}
|
||||
label={explorerSidebarToggleLabel}
|
||||
tooltipLabel={t("workspace.tabs.explorerSidebar.toggle")}
|
||||
tooltipKeys={EXPLORER_TOGGLE_KEYS}
|
||||
accessibilityState={explorerSidebarToggleAccessibilityState}
|
||||
/>
|
||||
),
|
||||
[
|
||||
explorerSidebarToggleAccessibilityState,
|
||||
explorerSidebarToggleLabel,
|
||||
explorerToggleOwner,
|
||||
handleToggleExplorerSidebar,
|
||||
t,
|
||||
],
|
||||
);
|
||||
const createTerminalDisabled = useMemo(
|
||||
() => createTerminalMutation.isPending || pendingTerminalCreateInput !== null,
|
||||
[createTerminalMutation.isPending, pendingTerminalCreateInput],
|
||||
@@ -3333,10 +3286,6 @@ function WorkspaceScreenContent({
|
||||
],
|
||||
);
|
||||
const focusedPaneIdOrUndefined = useMemo(() => focusedPaneId ?? undefined, [focusedPaneId]);
|
||||
const desktopFocusModeEnabled = useMemo(
|
||||
() => isFocusModeEnabled && !isMobile,
|
||||
[isFocusModeEnabled, isMobile],
|
||||
);
|
||||
const workspaceFloatingPanelPortalHostName = useMemo(
|
||||
() =>
|
||||
`${WORKSPACE_FLOATING_PANEL_PORTAL_HOST_PREFIX}:${normalizedServerId}:${normalizedWorkspaceId}`,
|
||||
@@ -3460,14 +3409,13 @@ function WorkspaceScreenContent({
|
||||
isRouteFocused={isRouteFocused}
|
||||
isCompact={isMobile}
|
||||
tabSwitcher={tabSwitcher}
|
||||
inDesktopTitlebar={explorerControls.inDesktopTitlebar}
|
||||
explorerAction={explorerControls.compactAction}
|
||||
isLoading={isWorkspaceHeaderLoading}
|
||||
title={workspaceHeaderTitle}
|
||||
subtitle={workspaceHeaderSubtitle}
|
||||
isSubtitleDistinct={isWorkspaceHeaderSubtitleDistinct}
|
||||
serverId={normalizedServerId}
|
||||
onToggleExplorer={handleToggleExplorerSidebar}
|
||||
explorerToggleLabel={explorerSidebarToggleLabel}
|
||||
explorerToggleAccessibilityState={explorerSidebarToggleAccessibilityState}
|
||||
>
|
||||
<WorkspaceHeaderMenuMobile
|
||||
pane={paneTabs?.actions.pane}
|
||||
@@ -3493,20 +3441,19 @@ function WorkspaceScreenContent({
|
||||
},
|
||||
[
|
||||
renderWorkspaceTabSwitcher,
|
||||
explorerControls.inDesktopTitlebar,
|
||||
explorerControls.compactAction,
|
||||
isFocusModeEnabled,
|
||||
toggleFocusMode,
|
||||
canOpenImportSheet,
|
||||
compactHeaderScripts,
|
||||
createTerminalDisabled,
|
||||
currentBranchName,
|
||||
explorerSidebarToggleAccessibilityState,
|
||||
explorerSidebarToggleLabel,
|
||||
handleCopyBranchName,
|
||||
handleCopyWorkspacePath,
|
||||
handleCreateBrowserTab,
|
||||
handleCreateTerminalWithProfile,
|
||||
handleOpenSetupTab,
|
||||
handleToggleExplorerSidebar,
|
||||
isMobile,
|
||||
isRouteFocused,
|
||||
isWorkspaceHeaderLoading,
|
||||
@@ -3734,7 +3681,7 @@ function WorkspaceScreenContent({
|
||||
onExitFocusMode={toggleFocusMode}
|
||||
onReorderTabsInPane={handleReorderTabsInPane}
|
||||
buildPaneContentModel={buildDesktopPaneContentModel}
|
||||
headerAction={renderExplorerSidebarHeaderAction()}
|
||||
headerAction={explorerControls.dockAction}
|
||||
/>
|
||||
);
|
||||
return (
|
||||
@@ -3775,7 +3722,7 @@ function WorkspaceScreenContent({
|
||||
toggleFocusMode,
|
||||
handleReorderTabsInPane,
|
||||
buildDesktopPaneContentModel,
|
||||
renderExplorerSidebarHeaderAction,
|
||||
explorerControls.dockAction,
|
||||
desktopFocusModeEnabled,
|
||||
]);
|
||||
|
||||
@@ -3849,6 +3796,7 @@ function WorkspaceScreenContent({
|
||||
onReorderTabsInPane={handleReorderTabsInPane}
|
||||
onSplitPane={handleSplitPane}
|
||||
>
|
||||
{explorerControls.titlebarAction}
|
||||
{workspaceCenterColumn}
|
||||
{sharedExplorer}
|
||||
</WorkspaceTabDragScope>
|
||||
@@ -3986,12 +3934,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
md: theme.spacing[2],
|
||||
},
|
||||
},
|
||||
compactHeaderActionButton: {
|
||||
marginRight: {
|
||||
xs: 0,
|
||||
md: -theme.spacing[2],
|
||||
},
|
||||
},
|
||||
compactHeaderMenuCluster: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
import { buildDesktopFrameStyle } from "@/components/ui/combobox-frame-style";
|
||||
import {
|
||||
WorkspaceHeaderExplorerToggle,
|
||||
WorkspaceExplorerSidebarToggle,
|
||||
} from "./workspace-explorer-toggle";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { SidebarCloseButton } from "@/components/headers/sidebar-close-button";
|
||||
import { resolveWorkspaceTabChipBackdrop } from "@/screens/workspace/workspace-tab-chip-backdrop";
|
||||
import { darkPureBlackTheme, darkTheme, lightTheme } from "@/styles/theme";
|
||||
import {
|
||||
@@ -190,37 +185,6 @@ describe("retainWorkspaceTabMeasuredWidth", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("Explorer toggle ownership", () => {
|
||||
const toggleProps = {
|
||||
onPress: () => {},
|
||||
label: "Close Explorer sidebar",
|
||||
tooltipLabel: "Toggle Explorer sidebar",
|
||||
tooltipKeys: [],
|
||||
accessibilityState: { expanded: true },
|
||||
};
|
||||
|
||||
it("keeps only the header toggle when window controls do not obstruct it", () => {
|
||||
expect(WorkspaceHeaderExplorerToggle({ ...toggleProps, owner: "header" })).not.toBeNull();
|
||||
expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "header" })).toBeNull();
|
||||
});
|
||||
|
||||
it("keeps the dock toggle for window-owned and compact overlay chrome", () => {
|
||||
for (const owner of ["window", "mobile"] as const) {
|
||||
expect(WorkspaceHeaderExplorerToggle({ ...toggleProps, owner })).toBeNull();
|
||||
expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner })).not.toBeNull();
|
||||
}
|
||||
});
|
||||
|
||||
it("closes the compact overlay with the same X as the compact agent list", () => {
|
||||
expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "mobile" })?.type).toBe(
|
||||
SidebarCloseButton,
|
||||
);
|
||||
expect(WorkspaceExplorerSidebarToggle({ ...toggleProps, owner: "window" })?.type).not.toBe(
|
||||
SidebarCloseButton,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("resolveWorkspaceTabChipBackdrop", () => {
|
||||
const themes = { light: lightTheme, dark: darkTheme, pureBlack: darkPureBlackTheme };
|
||||
const rails = {
|
||||
|
||||
@@ -69,6 +69,7 @@ interface SidebarViewStoreState {
|
||||
setWorkspaceSort: (sort: WorkspaceSort) => void;
|
||||
toggleHostFilter: (serverId: string) => void;
|
||||
clearHostFilters: () => void;
|
||||
focusHost: (serverId: string) => void;
|
||||
toggleProjectFilter: (viewKey: string) => void;
|
||||
clearProjectFilters: () => void;
|
||||
toggleLabelFilter: (name: string) => void;
|
||||
@@ -205,6 +206,9 @@ export const useSidebarViewStore = create<SidebarViewStoreState>()(
|
||||
toggleHostFilter: (serverId) =>
|
||||
set((state) => ({ hostFilters: toggleFilterEntry(state.hostFilters, serverId) })),
|
||||
clearHostFilters: () => set({ hostFilters: [] }),
|
||||
// An explicit navigation target must not be hidden by another host's facets.
|
||||
focusHost: (serverId) =>
|
||||
set({ hostFilters: [serverId], projectFilters: [], labelFilter: emptyLabelFilter() }),
|
||||
toggleProjectFilter: (viewKey) =>
|
||||
set((state) => ({ projectFilters: toggleFilterEntry(state.projectFilters, viewKey) })),
|
||||
clearProjectFilters: () => set({ projectFilters: [] }),
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Text, View } from "react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { CornerUpLeft } from "lucide-react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
import { StatusIcon } from "@/components/status-icon";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { FOOTER_HEIGHT } from "@/constants/layout";
|
||||
@@ -37,7 +38,7 @@ export function ParentAgentCallout({
|
||||
const parent = useParentAgent(serverId, parentAgentId);
|
||||
|
||||
return (
|
||||
<View style={styles.rail}>
|
||||
<View style={styles.rail} dataSet={CHAT_COLUMN_RAIL_DATASET}>
|
||||
<View style={styles.callout} testID="parent-agent-callout">
|
||||
<StatusIcon statusBucket={parent.statusBucket} size={ICON_SIZE} backdrop="surface1">
|
||||
<ThemedParentIcon icon={parent.icon} size={ICON_SIZE} uniProps={foregroundColorMapping} />
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
import type { Locator, Page } from "@playwright/test";
|
||||
import { expect, test } from "../../app/e2e/support/fixtures";
|
||||
import { gotoWorkspace } from "../../app/e2e/support/helpers/launcher";
|
||||
|
||||
function explorerSidebar(page: Page) {
|
||||
return page.getByTestId("workspace-explorer-sidebar").filter({ visible: true });
|
||||
}
|
||||
|
||||
async function useDesktopWindowChrome(page: Page, mode: "native-mac" | "custom-windows") {
|
||||
await page.addInitScript((windowChromeMode) => {
|
||||
Object.assign(window, {
|
||||
paseoDesktop: {
|
||||
platform: windowChromeMode === "native-mac" ? "darwin" : "win32",
|
||||
windowChromeMode,
|
||||
invoke: async () => null,
|
||||
events: { on: async () => () => undefined },
|
||||
getPendingOpenProject: async () => null,
|
||||
window: {
|
||||
getCurrentWindow: () => ({
|
||||
isFullscreen: async () => false,
|
||||
onResized: async () => () => undefined,
|
||||
}),
|
||||
},
|
||||
},
|
||||
});
|
||||
}, mode);
|
||||
}
|
||||
|
||||
function explorerToggle(page: Page, expanded: boolean) {
|
||||
return page.getByRole("button", {
|
||||
name: expanded ? "Close Explorer sidebar" : "Open Explorer sidebar",
|
||||
exact: true,
|
||||
expanded,
|
||||
});
|
||||
}
|
||||
|
||||
async function recordExplorerToggle(button: Locator) {
|
||||
const recording = await button.evaluateHandle((target) => {
|
||||
const measure = () => {
|
||||
const glyph = target.querySelector("svg")?.getBoundingClientRect();
|
||||
return {
|
||||
connected: target.isConnected,
|
||||
x: glyph?.x,
|
||||
y: glyph?.y,
|
||||
width: glyph?.width,
|
||||
height: glyph?.height,
|
||||
};
|
||||
};
|
||||
const before = measure();
|
||||
const frames: ReturnType<typeof measure>[] = [];
|
||||
const done = new Promise<void>((resolve) => {
|
||||
target.addEventListener(
|
||||
"click",
|
||||
() => {
|
||||
const start = performance.now();
|
||||
const sample = () => {
|
||||
frames.push(measure());
|
||||
if (performance.now() - start < 300) requestAnimationFrame(sample);
|
||||
else resolve();
|
||||
};
|
||||
requestAnimationFrame(sample);
|
||||
},
|
||||
{ once: true },
|
||||
);
|
||||
});
|
||||
return { before, frames, done };
|
||||
});
|
||||
try {
|
||||
await button.click();
|
||||
return await recording.evaluate(async ({ before, frames, done }) => {
|
||||
await done;
|
||||
return { before, frames };
|
||||
});
|
||||
} finally {
|
||||
await recording.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
async function expectExplorerToggleHasNativeClickArea(toggle: Locator) {
|
||||
const regions = await toggle.evaluate((button) => {
|
||||
const rect = button.getBoundingClientRect();
|
||||
const x = rect.x + rect.width / 2;
|
||||
const y = rect.y + rect.height / 2;
|
||||
return [
|
||||
...document.querySelectorAll('[style*="app-region"], [data-window-no-drag], [role="button"]'),
|
||||
]
|
||||
.filter((element) => {
|
||||
const bounds = element.getBoundingClientRect();
|
||||
return bounds.left <= x && x < bounds.right && bounds.top <= y && y < bounds.bottom;
|
||||
})
|
||||
.map((element) => getComputedStyle(element).getPropertyValue("-webkit-app-region"))
|
||||
.filter((region) => region === "drag" || region === "no-drag");
|
||||
});
|
||||
expect(regions).toContain("drag");
|
||||
expect(regions.at(-1)).toBe("no-drag");
|
||||
}
|
||||
|
||||
async function expectExplorerToggleInHeaderTabOrder(page: Page, expanded: boolean) {
|
||||
const toggle = explorerToggle(page, expanded);
|
||||
await toggle.focus();
|
||||
await page.keyboard.press("Tab");
|
||||
await expect(page.getByRole("button", { name: "Workspace actions", exact: true })).toBeFocused();
|
||||
await page.keyboard.press("Shift+Tab");
|
||||
await expect(toggle).toBeFocused();
|
||||
}
|
||||
|
||||
async function expectExplorerToggleToHoldPosition(page: Page, expanded: boolean) {
|
||||
const toggle = explorerToggle(page, expanded);
|
||||
await expect(toggle).toBeVisible();
|
||||
await expectExplorerToggleHasNativeClickArea(toggle);
|
||||
const { before, frames } = await recordExplorerToggle(toggle);
|
||||
await expect(explorerToggle(page, !expanded)).toBeVisible();
|
||||
expect(before.width).toBeGreaterThan(0);
|
||||
expect(frames.find((frame) => JSON.stringify(frame) !== JSON.stringify(before))).toBeUndefined();
|
||||
}
|
||||
|
||||
test("keeps the Mac Explorer toggle in place across open and close", async ({
|
||||
page,
|
||||
withWorkspace,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 1440, height: 900 });
|
||||
await useDesktopWindowChrome(page, "native-mac");
|
||||
|
||||
const { workspaceId } = await withWorkspace();
|
||||
await gotoWorkspace(page, workspaceId);
|
||||
await expectExplorerToggleInHeaderTabOrder(page, false);
|
||||
await expectExplorerToggleToHoldPosition(page, false);
|
||||
await expectExplorerToggleInHeaderTabOrder(page, true);
|
||||
await expectExplorerToggleToHoldPosition(page, true);
|
||||
|
||||
await page.setViewportSize({ width: 930, height: 900 });
|
||||
await expectExplorerToggleToHoldPosition(page, false);
|
||||
await expectExplorerToggleToHoldPosition(page, true);
|
||||
});
|
||||
|
||||
async function expectClearOfWindowControls(page: Page, action: Locator) {
|
||||
const minimize = page.getByRole("button", { name: "Minimize window", exact: true });
|
||||
await expect(minimize).toBeVisible();
|
||||
await expect(action).toBeVisible();
|
||||
const controlBounds = await minimize.boundingBox();
|
||||
const actionBounds = await action.boundingBox();
|
||||
expect(actionBounds!.x + actionBounds!.width).toBeLessThanOrEqual(controlBounds!.x);
|
||||
}
|
||||
|
||||
test("keeps the Explorer actions clear of Windows controls", async ({ page, withWorkspace }) => {
|
||||
await page.setViewportSize({ width: 1440, height: 900 });
|
||||
await useDesktopWindowChrome(page, "custom-windows");
|
||||
|
||||
const { workspaceId } = await withWorkspace();
|
||||
await gotoWorkspace(page, workspaceId);
|
||||
const open = explorerToggle(page, false);
|
||||
await expectClearOfWindowControls(page, open);
|
||||
await open.click();
|
||||
|
||||
const close = explorerToggle(page, true);
|
||||
const newExplorerTab = explorerSidebar(page).getByRole("button", {
|
||||
name: "New tab",
|
||||
exact: true,
|
||||
});
|
||||
await expectClearOfWindowControls(page, close);
|
||||
await expectClearOfWindowControls(page, newExplorerTab);
|
||||
await close.click();
|
||||
await expect(open).toBeVisible();
|
||||
});
|
||||
@@ -49,16 +49,25 @@ export interface PluginHostProps {
|
||||
interface PluginNavigableHostProps extends PluginHostProps {
|
||||
/** Client-owned navigation. Undefined on older hosts; hide dependent affordances when absent. */
|
||||
readonly navigation?: {
|
||||
/** This client supports the focusHost option on agent/workspace navigation. */
|
||||
readonly supportsFocusHost?: boolean;
|
||||
/** Present only on Electron. The browser runs locally; serverId selects workspace ownership. */
|
||||
readonly openBrowser?: (input: {
|
||||
readonly url: string;
|
||||
readonly workspaceId: string;
|
||||
readonly serverId?: string;
|
||||
}) => void;
|
||||
readonly openAgent: (input: { readonly agentId: string; readonly serverId?: string }) => void;
|
||||
readonly openAgent: (input: {
|
||||
readonly agentId: string;
|
||||
readonly serverId?: string;
|
||||
/** Select only the destination host in the sidebar and clear project/label filters. */
|
||||
readonly focusHost?: boolean;
|
||||
}) => void;
|
||||
readonly openWorkspace: (input: {
|
||||
readonly workspaceId: string;
|
||||
readonly serverId?: string;
|
||||
/** Select only the destination host in the sidebar and clear project/label filters. */
|
||||
readonly focusHost?: boolean;
|
||||
}) => void;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10175,6 +10175,8 @@ test("a sender's start wait follows its prompt across a stale-session retry", as
|
||||
|
||||
test("a sender's start wait follows its prompt when the session is stale before the wait begins", async () => {
|
||||
const workdir = mkdtempSync(join(tmpdir(), "agent-manager-immediate-stale-start-"));
|
||||
const resumeEntered = deferred<void>();
|
||||
const releaseResume = deferred<void>();
|
||||
class StaleStartSession extends TestAgentSession {
|
||||
override async startTurn(): Promise<{ turnId: string }> {
|
||||
throw new StaleProviderSessionError("stale-bridge");
|
||||
@@ -10184,6 +10186,15 @@ test("a sender's start wait follows its prompt when the session is stale before
|
||||
override async createSession(config: AgentSessionConfig): Promise<AgentSession> {
|
||||
return new StaleStartSession(config);
|
||||
}
|
||||
|
||||
override async resumeSession(
|
||||
handle: AgentPersistenceHandle,
|
||||
config?: Partial<AgentSessionConfig>,
|
||||
): Promise<AgentSession> {
|
||||
resumeEntered.resolve();
|
||||
await releaseResume.promise;
|
||||
return await super.resumeSession(handle, config);
|
||||
}
|
||||
}
|
||||
const client = new StaleStartClient();
|
||||
const storage = new AgentStorage(join(workdir, "agents"), logger);
|
||||
@@ -10196,9 +10207,11 @@ test("a sender's start wait follows its prompt when the session is stale before
|
||||
runOptions: { clientMessageId: "immediate-stale-start" },
|
||||
});
|
||||
// The stale start has failed and been cleared before the sender begins waiting.
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
await resumeEntered.promise;
|
||||
expect(manager.hasInFlightRun(agent.id)).toBe(false);
|
||||
await expect(dispatchStarted(dispatch)).resolves.toBeUndefined();
|
||||
const senderWait = dispatchStarted(dispatch);
|
||||
releaseResume.resolve();
|
||||
await expect(senderWait).resolves.toBeUndefined();
|
||||
await client.waitForRetryStart();
|
||||
expect(manager.getTimeline(agent.id).filter((item) => item.type === "user_message")).toEqual([
|
||||
expect.objectContaining({
|
||||
@@ -10207,6 +10220,7 @@ test("a sender's start wait follows its prompt when the session is stale before
|
||||
}),
|
||||
]);
|
||||
} finally {
|
||||
releaseResume.resolve();
|
||||
manager.prepareForShutdown();
|
||||
await Promise.all(manager.listAgents().map((agent) => manager.closeAgent(agent.id)));
|
||||
await manager.flushForShutdown();
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import { readFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { FORGE_IDS } from "@getpaseo/protocol/forge-manifest";
|
||||
import type { Logger } from "pino";
|
||||
import { z } from "zod";
|
||||
import type { ChangeRequestRouter } from "../../../services/change-request-router.js";
|
||||
import {
|
||||
changeRequestStatusSchema,
|
||||
type ChangeRequestSnapshot,
|
||||
type ChangeRequestSource,
|
||||
} from "../../../services/change-request-source.js";
|
||||
import type { AgentMessageDelivery } from "../agent-messages/index.js";
|
||||
import type {
|
||||
@@ -15,13 +16,17 @@ import type {
|
||||
import { writeJsonFileAtomic } from "../../atomic-file.js";
|
||||
|
||||
const DIGEST_WINDOW_MS = 30_000;
|
||||
const watchGroupSchema = z.object({
|
||||
const LEGACY_DEFAULT_FORGE = "github";
|
||||
const LEGACY_INFERENCE_FORGES = ["github", "gitlab"] as const;
|
||||
const persistedWatchGroupSchema = z.object({
|
||||
forge: z.string().min(1).optional(),
|
||||
url: z.url(),
|
||||
snapshot: changeRequestStatusSchema,
|
||||
seenActivity: z.array(z.string()),
|
||||
watchers: z.array(z.object({ agentId: z.string(), startedAt: z.string().optional() })),
|
||||
});
|
||||
type WatchGroup = z.infer<typeof watchGroupSchema>;
|
||||
type PersistedWatchGroup = z.infer<typeof persistedWatchGroupSchema>;
|
||||
type WatchGroup = Omit<PersistedWatchGroup, "forge"> & { forge: string };
|
||||
type Watcher = WatchGroup["watchers"][number];
|
||||
interface DigestWindow {
|
||||
dueAt: number;
|
||||
@@ -35,7 +40,7 @@ interface Observation {
|
||||
release(): void;
|
||||
}
|
||||
interface Dependencies {
|
||||
source: ChangeRequestSource;
|
||||
router: ChangeRequestRouter;
|
||||
paseoHome: string;
|
||||
logger: Logger;
|
||||
isActive(agentId: string): Promise<boolean>;
|
||||
@@ -73,7 +78,7 @@ function describeUpdate(group: WatchGroup, next: ChangeRequestSnapshot) {
|
||||
}
|
||||
for (const activity of next.activity) {
|
||||
if (seen.has(activity.id)) continue;
|
||||
changes.push(`New ${activity.kind}: ${activity.url}`);
|
||||
changes.push(activity.message ?? `New ${activity.kind}: ${activity.url}`);
|
||||
seen.add(activity.id);
|
||||
}
|
||||
if (next.state !== "open") changes.push(`Change request ${next.state}.`);
|
||||
@@ -85,6 +90,7 @@ export type ChangeRequestWatches = ReturnType<typeof createChangeRequestWatches>
|
||||
export function createChangeRequestWatches(deps: Dependencies) {
|
||||
const file = join(deps.paseoHome, "change-request-watches.json");
|
||||
const groups = new Map<string, WatchGroup>();
|
||||
const unrestored: WatchGroup[] = [];
|
||||
const observations = new Map<string, Observation>();
|
||||
const registrations = new Map<string, number>();
|
||||
let mutations = Promise.resolve();
|
||||
@@ -156,32 +162,47 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
}
|
||||
}
|
||||
|
||||
function withdraw(agentId: string, url?: string): boolean {
|
||||
let removed = false;
|
||||
for (const [address, window] of windows) {
|
||||
if (url && address !== url) continue;
|
||||
removed = window.recipients.delete(agentId) || removed;
|
||||
function withdraw(agentId: string, matches: (url: string) => boolean): string | undefined {
|
||||
let withdrawn: string | undefined;
|
||||
for (const [url, window] of windows) {
|
||||
if (!window.recipients.has(agentId) || !matches(url)) continue;
|
||||
window.recipients.delete(agentId);
|
||||
withdrawn ??= url;
|
||||
if (!window.recipients.size) {
|
||||
clearTimeout(window.timer);
|
||||
windows.delete(address);
|
||||
windows.delete(url);
|
||||
}
|
||||
}
|
||||
const queued = deps
|
||||
.messages()
|
||||
.withdrawPending(
|
||||
agentId,
|
||||
(source) => source.kind === "change-request-update" && (!url || source.url === url),
|
||||
);
|
||||
return removed || queued > 0;
|
||||
deps.messages().withdrawPending(agentId, (source) => {
|
||||
if (source.kind !== "change-request-update" || !matches(source.url)) return false;
|
||||
withdrawn ??= source.url;
|
||||
return true;
|
||||
});
|
||||
return withdrawn;
|
||||
}
|
||||
|
||||
function withdrawByInput(agentId: string, input: string): string | undefined {
|
||||
const trimmed = input.trim();
|
||||
const candidates = new Set([trimmed]);
|
||||
for (const forge of FORGE_IDS) {
|
||||
const source = deps.router.source(forge);
|
||||
if (!source) continue;
|
||||
try {
|
||||
candidates.add(source.resolve(trimmed));
|
||||
} catch {
|
||||
// This source does not recognize the URL.
|
||||
}
|
||||
}
|
||||
return withdraw(agentId, (url) => candidates.has(url));
|
||||
}
|
||||
|
||||
async function commit(...updates: WatchGroup[]): Promise<void> {
|
||||
const next = new Map(groups);
|
||||
for (const group of updates) next.set(group.url, group);
|
||||
await writeJsonFileAtomic(
|
||||
file,
|
||||
[...next.values()].filter(({ watchers }) => watchers.length),
|
||||
);
|
||||
await writeJsonFileAtomic(file, [
|
||||
...[...next.values()].filter(({ watchers }) => watchers.length),
|
||||
...unrestored,
|
||||
]);
|
||||
for (const group of updates) {
|
||||
const previous = groups.get(group.url);
|
||||
// An in-flight subscription still needs the committed baseline and its observation.
|
||||
@@ -195,7 +216,20 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
}
|
||||
}
|
||||
|
||||
function syncBackgroundWork({ url, watchers }: WatchGroup, previous: Watcher[] = []): void {
|
||||
function describeWatch(forge: string, url: string): string {
|
||||
const source = deps.router.source(forge);
|
||||
if (!source) return url;
|
||||
try {
|
||||
return source.describe(url);
|
||||
} catch {
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
function syncBackgroundWork(
|
||||
{ forge, url, watchers }: WatchGroup,
|
||||
previous: Watcher[] = [],
|
||||
): void {
|
||||
if (previous === watchers) return;
|
||||
const current = new Set(watchers);
|
||||
for (const watcher of previous) {
|
||||
@@ -209,7 +243,7 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
deps.backgroundWork.setDaemonBackgroundWork({
|
||||
...backgroundWorkKey(watcher.agentId, url),
|
||||
kind: "monitor",
|
||||
description: deps.source.describe(url),
|
||||
description: describeWatch(forge, url),
|
||||
startedAt: watcher.startedAt ?? new Date().toISOString(),
|
||||
stop: async () => {
|
||||
await unsubscribe(watcher.agentId, url, watcher);
|
||||
@@ -218,9 +252,13 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
}
|
||||
}
|
||||
|
||||
function observe(url: string): Observation {
|
||||
function observe(forge: string, url: string): Observation {
|
||||
const existing = observations.get(url);
|
||||
if (existing) return existing;
|
||||
const source = deps.router.source(forge);
|
||||
if (!source) {
|
||||
throw new Error(`Change request watches are not supported for ${forge}.`);
|
||||
}
|
||||
let resolve!: (snapshot: ChangeRequestSnapshot) => void;
|
||||
let reject!: (error: unknown) => void;
|
||||
const ready = new Promise<ChangeRequestSnapshot>((accept, fail) => {
|
||||
@@ -228,7 +266,7 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
reject = fail;
|
||||
});
|
||||
void ready.catch(() => undefined);
|
||||
const release = deps.source.observe(url, {
|
||||
const release = source.observe(url, {
|
||||
knownActivity: () => new Set(groups.get(url)?.seenActivity),
|
||||
snapshot: (snapshot) =>
|
||||
serialize(async () => {
|
||||
@@ -266,14 +304,14 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
}),
|
||||
error(error) {
|
||||
if (!observation.stale) {
|
||||
deps.logger.warn({ err: error, url }, "Change request observation became stale");
|
||||
deps.logger.warn({ err: error, url, forge }, "Change request observation became stale");
|
||||
}
|
||||
observation.stale = true;
|
||||
if (!groups.has(url)) {
|
||||
reject(error);
|
||||
stopObserving(url);
|
||||
}
|
||||
deps.logger.debug({ err: error, url }, "Change request observation failed");
|
||||
deps.logger.debug({ err: error, url, forge }, "Change request observation failed");
|
||||
},
|
||||
});
|
||||
const observation: Observation = {
|
||||
@@ -288,16 +326,62 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
return observation;
|
||||
}
|
||||
|
||||
async function subscribe(agentId: string, input: string) {
|
||||
if (closed) throw new Error("Change request watches are closed");
|
||||
const url = deps.source.resolve(input);
|
||||
if (recoveryError)
|
||||
throw new Error("Change request watches could not recover.", { cause: recoveryError });
|
||||
function matchActiveGroup(input: string): { forge: string; url: string } | null {
|
||||
const trimmed = input.trim();
|
||||
const direct = groups.get(trimmed);
|
||||
if (direct) return { forge: direct.forge, url: direct.url };
|
||||
const sourcesTried = new Set<string>();
|
||||
for (const group of groups.values()) {
|
||||
if (sourcesTried.has(group.forge)) continue;
|
||||
sourcesTried.add(group.forge);
|
||||
const source = deps.router.source(group.forge);
|
||||
if (!source) continue;
|
||||
try {
|
||||
const canonical = source.resolve(trimmed);
|
||||
const matched = groups.get(canonical);
|
||||
if (matched && matched.forge === group.forge) {
|
||||
return { forge: matched.forge, url: matched.url };
|
||||
}
|
||||
} catch {
|
||||
// Input did not belong to this forge.
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function subscribe(agentId: string, input: string) {
|
||||
if (closed) return Promise.reject(new Error("Change request watches are closed"));
|
||||
if (recoveryError) {
|
||||
return Promise.reject(
|
||||
new Error("Change request watches could not recover.", { cause: recoveryError }),
|
||||
);
|
||||
}
|
||||
const active = matchActiveGroup(input);
|
||||
if (active) {
|
||||
return subscribeResolved(agentId, active.forge, active.url);
|
||||
}
|
||||
return deps.router
|
||||
.resolve(input)
|
||||
.then(({ forge, url }) => subscribeResolved(agentId, forge, url));
|
||||
}
|
||||
|
||||
function subscribeResolved(agentId: string, forge: string, url: string) {
|
||||
registrations.set(url, (registrations.get(url) ?? 0) + 1);
|
||||
try {
|
||||
const existing = groups.get(url);
|
||||
const initial = existing ? { ...existing.snapshot, activity: [] } : await observe(url).ready;
|
||||
return await serialize(async () => {
|
||||
const existing = groups.get(url);
|
||||
const finish = () => {
|
||||
const remaining = registrations.get(url)! - 1;
|
||||
if (remaining) {
|
||||
registrations.set(url, remaining);
|
||||
} else {
|
||||
registrations.delete(url);
|
||||
if (!groups.get(url)?.watchers.length) {
|
||||
groups.delete(url);
|
||||
stopObserving(url);
|
||||
}
|
||||
}
|
||||
};
|
||||
const commitSubscription = (initial: ChangeRequestSnapshot) =>
|
||||
serialize(async () => {
|
||||
if (closed || !(await deps.isActive(agentId))) throw new Error("Agent is no longer active");
|
||||
const group = groups.get(url);
|
||||
const { activity, ...initialStatus } = initial;
|
||||
@@ -305,6 +389,7 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
const subscribed = snapshot.state === "open";
|
||||
if (subscribed && !group?.watchers.some((watcher) => watcher.agentId === agentId)) {
|
||||
await commit({
|
||||
forge: group?.forge ?? forge,
|
||||
url,
|
||||
snapshot,
|
||||
seenActivity: group?.seenActivity ?? activity.map(({ id }) => id),
|
||||
@@ -322,21 +407,13 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
checks: snapshot.checks,
|
||||
reviewDecision: snapshot.reviewDecision,
|
||||
subscribed,
|
||||
stale: observations.get(url)?.stale ?? false,
|
||||
stale: observations.get(url)?.stale ?? Boolean(existing),
|
||||
};
|
||||
});
|
||||
} finally {
|
||||
const remaining = registrations.get(url)! - 1;
|
||||
if (remaining) {
|
||||
registrations.set(url, remaining);
|
||||
} else {
|
||||
registrations.delete(url);
|
||||
if (!groups.get(url)?.watchers.length) {
|
||||
groups.delete(url);
|
||||
stopObserving(url);
|
||||
}
|
||||
}
|
||||
}
|
||||
const pending = existing
|
||||
? commitSubscription({ ...existing.snapshot, activity: [] })
|
||||
: observe(forge, url).ready.then(commitSubscription);
|
||||
return pending.finally(finish);
|
||||
}
|
||||
|
||||
function removeWatcher(group: WatchGroup, agentId: string): Promise<void> {
|
||||
@@ -355,15 +432,15 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
throw new Error("Background work is no longer available to stop");
|
||||
}
|
||||
if (group && watcher) await removeWatcher(group, agentId);
|
||||
const withdrawn = withdraw(agentId, url);
|
||||
return { url, removed: Boolean(watcher) || withdrawn };
|
||||
const withdrawn = withdraw(agentId, (address) => address === url);
|
||||
return { url, removed: Boolean(watcher || withdrawn) };
|
||||
});
|
||||
}
|
||||
|
||||
function archive(agentId: string): Promise<void> {
|
||||
return serialize(async () => {
|
||||
if (closed) return;
|
||||
withdraw(agentId);
|
||||
withdraw(agentId, () => true);
|
||||
const updates: WatchGroup[] = [];
|
||||
for (const group of groups.values()) {
|
||||
const watchers = group.watchers.filter((watcher) => watcher.agentId !== agentId);
|
||||
@@ -373,6 +450,20 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
});
|
||||
}
|
||||
|
||||
function inferLegacyForge(url: string): string {
|
||||
for (const candidate of LEGACY_INFERENCE_FORGES) {
|
||||
const source = deps.router.source(candidate);
|
||||
if (!source) continue;
|
||||
try {
|
||||
source.resolve(url);
|
||||
return candidate;
|
||||
} catch {
|
||||
// URL does not match this forge's canonical path shape.
|
||||
}
|
||||
}
|
||||
return LEGACY_DEFAULT_FORGE;
|
||||
}
|
||||
|
||||
return {
|
||||
async start() {
|
||||
const active: WatchGroup[] = [];
|
||||
@@ -382,8 +473,12 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
if (error.code === "ENOENT") return "[]";
|
||||
throw error;
|
||||
});
|
||||
const restored = z.array(watchGroupSchema).parse(JSON.parse(stored));
|
||||
for (const group of restored) {
|
||||
const restored = z.array(persistedWatchGroupSchema).parse(JSON.parse(stored));
|
||||
for (const record of restored) {
|
||||
const group: WatchGroup = {
|
||||
...record,
|
||||
forge: record.forge ?? inferLegacyForge(record.url),
|
||||
};
|
||||
if (group.snapshot.state !== "open") {
|
||||
pruned = true;
|
||||
continue;
|
||||
@@ -393,7 +488,17 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
if (await deps.isActive(watcher.agentId)) watchers.push(watcher);
|
||||
}
|
||||
pruned ||= watchers.length !== group.watchers.length;
|
||||
if (watchers.length) active.push({ ...group, watchers });
|
||||
if (!watchers.length) continue;
|
||||
const nextGroup = { ...group, watchers };
|
||||
if (!deps.router.source(nextGroup.forge)) {
|
||||
deps.logger.warn(
|
||||
{ forge: nextGroup.forge, url: nextGroup.url },
|
||||
"Skipping persisted change request watch for unsupported forge",
|
||||
);
|
||||
unrestored.push(nextGroup);
|
||||
continue;
|
||||
}
|
||||
active.push(nextGroup);
|
||||
}
|
||||
} catch (error) {
|
||||
recoveryError = error;
|
||||
@@ -402,7 +507,7 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
}
|
||||
if (pruned) {
|
||||
try {
|
||||
await writeJsonFileAtomic(file, active);
|
||||
await writeJsonFileAtomic(file, [...active, ...unrestored]);
|
||||
} catch (error) {
|
||||
deps.logger.warn({ err: error, file }, "Could not prune archived change request watches");
|
||||
}
|
||||
@@ -410,12 +515,24 @@ export function createChangeRequestWatches(deps: Dependencies) {
|
||||
for (const group of active) {
|
||||
groups.set(group.url, group);
|
||||
syncBackgroundWork(group);
|
||||
observe(group.url);
|
||||
try {
|
||||
observe(group.forge, group.url);
|
||||
} catch (error) {
|
||||
deps.logger.warn(
|
||||
{ err: error, forge: group.forge, url: group.url },
|
||||
"Could not start observing restored change request watch",
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
subscribe,
|
||||
unsubscribe(agentId: string, input: string) {
|
||||
return unsubscribe(agentId, deps.source.resolve(input));
|
||||
async unsubscribe(agentId: string, input: string) {
|
||||
const active = matchActiveGroup(input);
|
||||
if (active) return unsubscribe(agentId, active.url);
|
||||
const withdrawn = await serialize(async () => withdrawByInput(agentId, input));
|
||||
if (withdrawn) return { url: withdrawn, removed: true };
|
||||
const { url } = await deps.router.resolve(input);
|
||||
return unsubscribe(agentId, url);
|
||||
},
|
||||
archive,
|
||||
async close() {
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
import { mkdir, mkdtemp, readFile, rename, rm } from "node:fs/promises";
|
||||
import { mkdir, mkdtemp, readFile, rename, rm, writeFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import pino from "pino";
|
||||
import { afterEach, expect, test, vi } from "vitest";
|
||||
import { createChangeRequestWatches } from "./index.js";
|
||||
import { AgentBackgroundWorkStore } from "../background-work/index.js";
|
||||
import { createAgentMessageDelivery, parseAgentMessages } from "../agent-messages/index.js";
|
||||
import type { ChangeRequestRouter } from "../../../services/change-request-router.js";
|
||||
import type {
|
||||
ChangeRequestSnapshot,
|
||||
ChangeRequestSource,
|
||||
} from "../../../services/change-request-source.js";
|
||||
|
||||
const url = "https://github.com/owner/repo/pull/42";
|
||||
const gitlabUrl = "https://gitlab.com/org/sub/app/-/merge_requests/9";
|
||||
const reviewUrl = url + "#pullrequestreview-1";
|
||||
const initial: ChangeRequestSnapshot = {
|
||||
state: "open",
|
||||
@@ -31,13 +33,19 @@ async function createTestHome() {
|
||||
|
||||
function createHarness(
|
||||
home: string,
|
||||
{ isActive = async (_id: string) => true, observationFails = false } = {},
|
||||
{
|
||||
isActive = async (_id: string) => true,
|
||||
observationFails = false,
|
||||
resolveFails = false,
|
||||
extraSources = {} as Record<string, ChangeRequestSource>,
|
||||
} = {},
|
||||
) {
|
||||
const observations = new Map<string, Parameters<ChangeRequestSource["observe"]>[1]>();
|
||||
const backgroundWork = new AgentBackgroundWorkStore();
|
||||
const busy = new Set<string>();
|
||||
const turns: { recipientId: string; prompt: string }[] = [];
|
||||
const listeners = new Set<(id: string) => void>();
|
||||
const resolveCalls: string[] = [];
|
||||
const messages = createAgentMessageDelivery({
|
||||
isRunning: (id) => busy.has(id),
|
||||
subscribe(listener) {
|
||||
@@ -52,10 +60,16 @@ function createHarness(
|
||||
throw error;
|
||||
},
|
||||
});
|
||||
const watches = createChangeRequestWatches({
|
||||
source: {
|
||||
resolve: (input) => input,
|
||||
describe: () => "owner/repo #42",
|
||||
function createFakeSource(
|
||||
describe: (address: string) => string,
|
||||
accepts: (input: string) => boolean,
|
||||
): ChangeRequestSource {
|
||||
return {
|
||||
resolve: (input) => {
|
||||
if (!accepts(input)) throw new Error("Unsupported URL for fake forge");
|
||||
return input.replace(/\/+$/, "");
|
||||
},
|
||||
describe,
|
||||
observe(address, callbacks) {
|
||||
observations.set(address, callbacks);
|
||||
queueMicrotask(() => {
|
||||
@@ -64,7 +78,34 @@ function createHarness(
|
||||
});
|
||||
return () => observations.delete(address);
|
||||
},
|
||||
};
|
||||
}
|
||||
const sources: Record<string, ChangeRequestSource> = {
|
||||
github: createFakeSource(
|
||||
() => "owner/repo #42",
|
||||
(input) => input.includes("/pull/"),
|
||||
),
|
||||
gitlab: createFakeSource(
|
||||
() => "org/sub/app !9",
|
||||
(input) => input.includes("/merge_requests/"),
|
||||
),
|
||||
...extraSources,
|
||||
};
|
||||
const router: ChangeRequestRouter = {
|
||||
async resolve(input) {
|
||||
resolveCalls.push(input);
|
||||
if (resolveFails) throw new Error("Host probe failed");
|
||||
const forge = input.includes("gitlab") ? "gitlab" : "github";
|
||||
const source = sources[forge];
|
||||
if (!source) throw new Error(`Unsupported forge: ${forge}`);
|
||||
return { forge, url: source.resolve(input) };
|
||||
},
|
||||
source(forge) {
|
||||
return sources[forge] ?? null;
|
||||
},
|
||||
};
|
||||
const watches = createChangeRequestWatches({
|
||||
router,
|
||||
paseoHome: home,
|
||||
logger: pino({ enabled: false }),
|
||||
isActive,
|
||||
@@ -78,6 +119,7 @@ function createHarness(
|
||||
messages,
|
||||
watches,
|
||||
backgroundWork,
|
||||
resolveCalls,
|
||||
idle(id: string) {
|
||||
busy.delete(id);
|
||||
for (const listener of listeners) listener(id);
|
||||
@@ -255,6 +297,47 @@ test("can withdraw a terminal digest after its observation has stopped", async (
|
||||
}
|
||||
});
|
||||
|
||||
test.each([0, 32_000])(
|
||||
"withdraws a terminal update without a host probe after %i ms",
|
||||
async (elapsed) => {
|
||||
vi.useFakeTimers();
|
||||
const home = await createTestHome();
|
||||
const enterpriseUrl = "https://github.example.com/owner/repo/pull/42";
|
||||
const { activity: _activity, ...snapshot } = initial;
|
||||
await writeFile(
|
||||
join(home, "change-request-watches.json"),
|
||||
JSON.stringify([
|
||||
{
|
||||
forge: "github",
|
||||
url: enterpriseUrl,
|
||||
snapshot,
|
||||
seenActivity: [],
|
||||
watchers: [{ agentId: "first" }],
|
||||
},
|
||||
]),
|
||||
);
|
||||
const h = createHarness(home, { resolveFails: true });
|
||||
try {
|
||||
h.busy.add("first");
|
||||
await h.watches.start();
|
||||
await h.observations.get(enterpriseUrl)!.snapshot({ ...initial, state: "merged" });
|
||||
expect(h.observations.has(enterpriseUrl)).toBe(false);
|
||||
await vi.advanceTimersByTimeAsync(elapsed);
|
||||
await expect(h.watches.unsubscribe("first", `${enterpriseUrl}/`)).resolves.toEqual({
|
||||
url: enterpriseUrl,
|
||||
removed: true,
|
||||
});
|
||||
expect(h.resolveCalls).toEqual([]);
|
||||
h.idle("first");
|
||||
await vi.advanceTimersByTimeAsync(32_000);
|
||||
expect(h.turns).toEqual([]);
|
||||
} finally {
|
||||
await h.close();
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
test("retains the current observation as the last subscriber leaves and a new one joins", async () => {
|
||||
const home = await createTestHome();
|
||||
const h = createHarness(home);
|
||||
@@ -343,3 +426,119 @@ test("recovers active watches even when pruning archived watchers cannot be writ
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("persists forge ids, restores legacy GitHub watches without probing, and preserves unknown forges", async () => {
|
||||
const home = await createTestHome();
|
||||
const file = join(home, "change-request-watches.json");
|
||||
const legacyRecord = {
|
||||
url,
|
||||
snapshot: {
|
||||
state: "open",
|
||||
headSha: "aaa",
|
||||
checksState: "pending",
|
||||
checks: [],
|
||||
reviewDecision: null,
|
||||
},
|
||||
seenActivity: [],
|
||||
watchers: [{ agentId: "legacy-agent", startedAt: "2026-01-01T00:00:00.000Z" }],
|
||||
};
|
||||
const unknownForgeRecord = {
|
||||
forge: "futureforge",
|
||||
url: "https://future.example.com/team/repo/cr/5",
|
||||
snapshot: legacyRecord.snapshot,
|
||||
seenActivity: [],
|
||||
watchers: [{ agentId: "future-agent", startedAt: "2026-01-01T00:00:00.000Z" }],
|
||||
};
|
||||
const strippedGitLabRecord = {
|
||||
url: gitlabUrl,
|
||||
snapshot: legacyRecord.snapshot,
|
||||
seenActivity: [],
|
||||
watchers: [{ agentId: "gitlab-agent", startedAt: "2026-01-01T00:00:00.000Z" }],
|
||||
};
|
||||
await writeFile(
|
||||
file,
|
||||
JSON.stringify([legacyRecord, strippedGitLabRecord, unknownForgeRecord]),
|
||||
"utf8",
|
||||
);
|
||||
|
||||
const h = createHarness(home, { resolveFails: true });
|
||||
try {
|
||||
await h.watches.start();
|
||||
expect(h.resolveCalls).toEqual([]);
|
||||
expect(h.backgroundWork.list("legacy-agent")).toEqual([
|
||||
expect.objectContaining({ description: "owner/repo #42", kind: "monitor" }),
|
||||
]);
|
||||
expect(h.backgroundWork.list("gitlab-agent")).toEqual([
|
||||
expect.objectContaining({ description: "org/sub/app !9", kind: "monitor" }),
|
||||
]);
|
||||
expect(h.observations.has(url)).toBe(true);
|
||||
expect(h.observations.has(gitlabUrl)).toBe(true);
|
||||
|
||||
// Unsubscribing an active watch succeeds even when host resolution is temporarily down.
|
||||
await expect(h.watches.unsubscribe("legacy-agent", `${url}/`)).resolves.toEqual({
|
||||
url,
|
||||
removed: true,
|
||||
});
|
||||
expect(h.backgroundWork.list("legacy-agent")).toEqual([]);
|
||||
const persisted = JSON.parse(await readFile(file, "utf8")) as Array<{
|
||||
forge?: string;
|
||||
url: string;
|
||||
}>;
|
||||
expect(persisted).toEqual([
|
||||
expect.objectContaining({ forge: "gitlab", url: gitlabUrl }),
|
||||
unknownForgeRecord,
|
||||
]);
|
||||
} finally {
|
||||
await h.close();
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("watches multiple forges concurrently with forge-native descriptions and custom approval messages", async () => {
|
||||
vi.useFakeTimers();
|
||||
const home = await createTestHome();
|
||||
const file = join(home, "change-request-watches.json");
|
||||
const h = createHarness(home);
|
||||
try {
|
||||
await h.watches.start();
|
||||
await h.watches.subscribe("agent-1", url);
|
||||
await h.watches.subscribe("agent-1", gitlabUrl);
|
||||
expect(h.backgroundWork.list("agent-1").map((item) => item.description)).toEqual([
|
||||
"owner/repo #42",
|
||||
"org/sub/app !9",
|
||||
]);
|
||||
|
||||
const persisted = JSON.parse(await readFile(file, "utf8")) as Array<{
|
||||
forge?: string;
|
||||
url: string;
|
||||
}>;
|
||||
expect(persisted.map(({ forge, url: entryUrl }) => ({ forge, url: entryUrl }))).toEqual([
|
||||
{ forge: "github", url },
|
||||
{ forge: "gitlab", url: gitlabUrl },
|
||||
]);
|
||||
|
||||
await h.observations.get(gitlabUrl)!.snapshot({
|
||||
...initial,
|
||||
activity: [
|
||||
{
|
||||
id: "approval-note:77",
|
||||
kind: "approval",
|
||||
url: `${gitlabUrl}#note_77`,
|
||||
message: `Merge request approved by @alice (1/1 approvals): ${gitlabUrl}#note_77`,
|
||||
},
|
||||
],
|
||||
});
|
||||
await vi.advanceTimersByTimeAsync(32_000);
|
||||
expect(h.turns).toEqual([
|
||||
{
|
||||
recipientId: "agent-1",
|
||||
prompt: expect.stringContaining(
|
||||
`Merge request approved by @alice (1/1 approvals): ${gitlabUrl}#note_77`,
|
||||
),
|
||||
},
|
||||
]);
|
||||
} finally {
|
||||
await h.close();
|
||||
await rm(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2728,13 +2728,19 @@ function createToolCatalog(
|
||||
|
||||
if (options.changeRequestWatches) {
|
||||
const watches = options.changeRequestWatches;
|
||||
const inputSchema = { url: z.string().trim().min(1).describe("URL of a GitHub pull request.") };
|
||||
const inputSchema = {
|
||||
url: z
|
||||
.string()
|
||||
.trim()
|
||||
.min(1)
|
||||
.describe("URL of a pull request or merge request on a supported forge."),
|
||||
};
|
||||
registerTool(
|
||||
"subscribe_change_request",
|
||||
{
|
||||
title: "Watch change request",
|
||||
description:
|
||||
"Watch a pull request for check failures, passing checks, new comments, reviews, and closure. Returns the current state and sends future updates after your current turn.",
|
||||
"Watch a pull request or merge request for check failures, passing checks, new comments, reviews, approvals, and closure. Returns the current state and sends future updates after your current turn.",
|
||||
inputSchema,
|
||||
outputSchema: {
|
||||
url: z.string(),
|
||||
|
||||
@@ -132,6 +132,9 @@ export async function fanOutReconciledWorkspaceUpdates(input: {
|
||||
import { VoiceAssistantWebSocketServer, isDaemonOriginAllowed } from "./websocket-server.js";
|
||||
import { WorkspaceSetupRuntime } from "./workspace-setup-runtime.js";
|
||||
import { createWorkspaceLabelService } from "./workspace-labels/index.js";
|
||||
import { createChangeRequestRouter } from "../services/change-request-router.js";
|
||||
import { createForgeService } from "../services/forge-registry.js";
|
||||
import { createForgeResolver } from "../services/forge-resolver.js";
|
||||
import { createGitHubService } from "../services/github-service.js";
|
||||
import { createPaseoWorktree as createRegisteredPaseoWorktree } from "./paseo-worktree-service.js";
|
||||
import { createWorkspaceProvisioningService } from "./session/workspace-provisioning/workspace-provisioning-service.js";
|
||||
@@ -954,12 +957,15 @@ export async function createPaseoDaemon(
|
||||
workspaceRegistry,
|
||||
});
|
||||
const github = createGitHubService();
|
||||
const forgeResolver = createForgeResolver({
|
||||
createService: (forge) => (forge === "github" ? github : createForgeService(forge)),
|
||||
});
|
||||
const workspaceGitService = new WorkspaceGitServiceImpl({
|
||||
logger,
|
||||
paseoHome: config.paseoHome,
|
||||
worktreesRoot: config.worktreesRoot,
|
||||
deps: {
|
||||
forgeOverrides: { github },
|
||||
forgeResolver,
|
||||
},
|
||||
});
|
||||
const workspaceRuntimeStore = createWorkspaceRuntimeStore();
|
||||
@@ -1472,7 +1478,7 @@ export async function createPaseoDaemon(
|
||||
await scheduleService.start();
|
||||
|
||||
const changeRequestWatches = createChangeRequestWatches({
|
||||
source: github.changeRequests,
|
||||
router: createChangeRequestRouter({ forgeResolver }),
|
||||
backgroundWork: agentManager,
|
||||
paseoHome: config.paseoHome,
|
||||
logger,
|
||||
@@ -2056,6 +2062,7 @@ export async function createPaseoDaemon(
|
||||
if (wsServer) {
|
||||
await wsServer.close();
|
||||
}
|
||||
forgeResolver.dispose();
|
||||
await serviceProxy.stopStandalone();
|
||||
// Force-drop remaining sockets so httpServer.close() resolves promptly.
|
||||
// We've already closed wsServer (which sent ws-layer close frames) and
|
||||
|
||||
@@ -22,9 +22,16 @@ import type { SkillSelectionStore } from "./selection-store";
|
||||
import { createSkillsController, type SkillsController } from "./controller";
|
||||
import { beginSkillsTransaction } from "./transaction";
|
||||
|
||||
interface TestSkillTargets extends SkillTargets {
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
antigravityDir: string;
|
||||
installDirs: string[];
|
||||
}
|
||||
|
||||
interface Harness {
|
||||
root: string;
|
||||
targets: SkillTargets;
|
||||
targets: TestSkillTargets;
|
||||
controller: SkillsController;
|
||||
selectionStore: SkillSelectionStore;
|
||||
}
|
||||
@@ -33,11 +40,17 @@ const BUNDLED_SKILLS = ["paseo", "paseo-advisor", "paseo-loop"];
|
||||
|
||||
async function makeHarness(selectionStore?: SkillSelectionStore): Promise<Harness> {
|
||||
const root = await mkdtemp(path.join(os.tmpdir(), "paseo-skills-controller-"));
|
||||
const targets: SkillTargets = {
|
||||
const agentsDir = path.join(root, "home", ".agents", "skills");
|
||||
const claudeDir = path.join(root, "home", ".claude", "skills");
|
||||
const codexDir = path.join(root, "home", ".codex", "skills");
|
||||
const antigravityDir = path.join(root, "home", ".gemini", "config", "skills");
|
||||
const targets: TestSkillTargets = {
|
||||
sourceDir: path.join(root, "bundle"),
|
||||
agentsDir: path.join(root, "home", ".agents", "skills"),
|
||||
claudeDir: path.join(root, "home", ".claude", "skills"),
|
||||
codexDir: path.join(root, "home", ".codex", "skills"),
|
||||
installDirs: [agentsDir, claudeDir, antigravityDir],
|
||||
agentsDir,
|
||||
claudeDir,
|
||||
codexDir,
|
||||
antigravityDir,
|
||||
};
|
||||
for (const name of BUNDLED_SKILLS) {
|
||||
await mkdir(path.join(targets.sourceDir, name), { recursive: true });
|
||||
@@ -146,17 +159,26 @@ async function installedSkills(dir: string): Promise<string[]> {
|
||||
.sort();
|
||||
}
|
||||
|
||||
async function installedEverywhere(targets: SkillTargets): Promise<string[][]> {
|
||||
return Promise.all([targets.agentsDir, targets.claudeDir, targets.codexDir].map(installedSkills));
|
||||
async function installedEverywhere(targets: TestSkillTargets): Promise<string[][]> {
|
||||
return Promise.all(
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir, targets.antigravityDir].map(
|
||||
installedSkills,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
async function writeUserFile(
|
||||
targets: SkillTargets,
|
||||
targets: TestSkillTargets,
|
||||
skill: string,
|
||||
relativePath: string,
|
||||
contents: string,
|
||||
): Promise<void> {
|
||||
for (const dir of [targets.agentsDir, targets.claudeDir, targets.codexDir]) {
|
||||
for (const dir of [
|
||||
targets.agentsDir,
|
||||
targets.claudeDir,
|
||||
targets.codexDir,
|
||||
targets.antigravityDir,
|
||||
]) {
|
||||
const file = path.join(dir, skill, relativePath);
|
||||
await mkdir(path.dirname(file), { recursive: true });
|
||||
await writeFile(file, contents);
|
||||
@@ -164,30 +186,33 @@ async function writeUserFile(
|
||||
}
|
||||
|
||||
async function readUserFile(
|
||||
targets: SkillTargets,
|
||||
targets: TestSkillTargets,
|
||||
skill: string,
|
||||
relativePath: string,
|
||||
): Promise<Array<string | null>> {
|
||||
return Promise.all(
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir].map((dir) =>
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir, targets.antigravityDir].map((dir) =>
|
||||
readFile(path.join(dir, skill, relativePath), "utf8").catch(() => null),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/** Anything the transaction staged and failed to clean up sits beside the skills tree. */
|
||||
async function backupArtifacts(targets: SkillTargets): Promise<string[][]> {
|
||||
async function backupArtifacts(targets: TestSkillTargets): Promise<string[][]> {
|
||||
return Promise.all(
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir].map(async (dir) => {
|
||||
const parentEntries = await readdir(path.dirname(dir)).catch(() => []);
|
||||
const rootEntries = await readdir(dir).catch(() => []);
|
||||
return [
|
||||
...parentEntries.filter(
|
||||
(entry) => entry !== path.basename(dir) && !entry.startsWith(".paseo-skills-recovered-"),
|
||||
),
|
||||
...rootEntries.filter((entry) => entry.startsWith(".paseo-skills-transaction-")),
|
||||
].sort();
|
||||
}),
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir, targets.antigravityDir].map(
|
||||
async (dir) => {
|
||||
const parentEntries = await readdir(path.dirname(dir)).catch(() => []);
|
||||
const rootEntries = await readdir(dir).catch(() => []);
|
||||
return [
|
||||
...parentEntries.filter(
|
||||
(entry) =>
|
||||
entry !== path.basename(dir) && !entry.startsWith(".paseo-skills-recovered-"),
|
||||
),
|
||||
...rootEntries.filter((entry) => entry.startsWith(".paseo-skills-transaction-")),
|
||||
].sort();
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -203,14 +228,14 @@ async function waitForTransactionDirectory(parent: string): Promise<void> {
|
||||
}
|
||||
|
||||
/** Puts a regular file where the agents skills tree goes, so convergence fails with ENOTDIR. */
|
||||
async function blockAgentsDir(targets: SkillTargets): Promise<void> {
|
||||
async function blockAgentsDir(targets: TestSkillTargets): Promise<void> {
|
||||
await rm(targets.agentsDir, { recursive: true, force: true });
|
||||
await mkdir(path.dirname(targets.agentsDir), { recursive: true });
|
||||
await writeFile(targets.agentsDir, "not a directory");
|
||||
}
|
||||
|
||||
async function isInstalled(targets: SkillTargets, name: string): Promise<boolean> {
|
||||
const dirs = [targets.agentsDir, targets.claudeDir];
|
||||
async function isInstalled(targets: TestSkillTargets, name: string): Promise<boolean> {
|
||||
const dirs = [targets.agentsDir, targets.claudeDir, targets.antigravityDir];
|
||||
const present = await Promise.all(
|
||||
dirs.map((dir) =>
|
||||
access(path.join(dir, name))
|
||||
@@ -251,7 +276,7 @@ describe("skills controller", () => {
|
||||
selection: { mode: "custom", skills: ["paseo", "paseo-loop"] },
|
||||
},
|
||||
);
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
let harness: Harness;
|
||||
@@ -299,6 +324,7 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -455,13 +481,15 @@ describe("skills controller", () => {
|
||||
["paseo", "paseo-loop"],
|
||||
["paseo", "paseo-loop"],
|
||||
["paseo-loop"],
|
||||
["paseo", "paseo-loop"],
|
||||
]);
|
||||
expect(await readUserFile(readOnly.targets, "paseo-loop", "notes/mine.md")).toEqual([
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
]);
|
||||
expect(await backupArtifacts(readOnly.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(readOnly.targets)).toEqual([[], [], [], []]);
|
||||
await rm(readOnly.root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
@@ -482,6 +510,7 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
await rm(readOnly.root, { recursive: true, force: true });
|
||||
});
|
||||
@@ -506,6 +535,7 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
await rm(readOnly.root, { recursive: true, force: true });
|
||||
});
|
||||
@@ -534,11 +564,13 @@ describe("skills controller", () => {
|
||||
"restore this",
|
||||
"restore this",
|
||||
"restore this",
|
||||
"restore this",
|
||||
]);
|
||||
expect(await readUserFile(readOnly.targets, "paseo-loop", "notes/concurrent.md")).toEqual([
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
await rm(readOnly.root, { recursive: true, force: true });
|
||||
});
|
||||
@@ -562,6 +594,7 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
expect(await isInstalled(harness.targets, "paseo-loop")).toBe(true);
|
||||
});
|
||||
@@ -580,6 +613,7 @@ describe("skills controller", () => {
|
||||
harness.targets.agentsDir,
|
||||
harness.targets.claudeDir,
|
||||
harness.targets.codexDir,
|
||||
harness.targets.antigravityDir,
|
||||
].map((root) => path.join(root, "paseo-loop"));
|
||||
for (const live of livePaths) await chmod(live, 0o700);
|
||||
const before = await Promise.all(livePaths.map(lstat));
|
||||
@@ -591,7 +625,7 @@ describe("skills controller", () => {
|
||||
|
||||
const after = await Promise.all(livePaths.map(lstat));
|
||||
expect(after.map((entry) => entry.ino)).toEqual(before.map((entry) => entry.ino));
|
||||
expect(after.map((entry) => entry.mode & 0o777)).toEqual([0o700, 0o700, 0o700]);
|
||||
expect(after.map((entry) => entry.mode & 0o777)).toEqual([0o700, 0o700, 0o700, 0o700]);
|
||||
},
|
||||
);
|
||||
|
||||
@@ -622,8 +656,9 @@ describe("skills controller", () => {
|
||||
"paseo-loop-v1",
|
||||
"paseo-loop-v1",
|
||||
null,
|
||||
"paseo-loop-v1",
|
||||
]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({ selection: previous });
|
||||
});
|
||||
|
||||
@@ -656,8 +691,9 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
null,
|
||||
"keep this",
|
||||
]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({ selection: previous });
|
||||
});
|
||||
|
||||
@@ -693,7 +729,7 @@ describe("skills controller", () => {
|
||||
expect(
|
||||
await readFile(path.join(harness.targets.codexDir, recovered!, "notes", "mine.md"), "utf8"),
|
||||
).toBe("staged notes");
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({ selection: previous });
|
||||
});
|
||||
|
||||
@@ -732,8 +768,9 @@ describe("skills controller", () => {
|
||||
null,
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({ selection: previous });
|
||||
});
|
||||
|
||||
@@ -775,7 +812,7 @@ describe("skills controller", () => {
|
||||
|
||||
expect(await readFile(entry!.livePath, "utf8")).toBe("external replacement");
|
||||
expect(await readFile(path.join(recovered, "notes", "mine.md"), "utf8")).toBe("captured notes");
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it("preserves a directory that replaces a captured file before recovery", async () => {
|
||||
@@ -806,7 +843,7 @@ describe("skills controller", () => {
|
||||
expect(
|
||||
await readFile(path.join(path.dirname(harness.targets.agentsDir), recovered!), "utf8"),
|
||||
).toBe("captured file");
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it.skipIf(process.platform !== "linux")(
|
||||
@@ -815,6 +852,7 @@ describe("skills controller", () => {
|
||||
const crossFilesystemRoot = await mkdtemp("/dev/shm/paseo-skills-controller-");
|
||||
try {
|
||||
harness.targets.claudeDir = path.join(crossFilesystemRoot, "skills");
|
||||
harness.targets.installDirs[1] = harness.targets.claudeDir;
|
||||
const previous: SkillSelection = {
|
||||
mode: "custom",
|
||||
skills: ["paseo", "paseo-loop"],
|
||||
@@ -926,6 +964,7 @@ describe("skills controller", () => {
|
||||
readOnly.targets.agentsDir,
|
||||
readOnly.targets.claudeDir,
|
||||
readOnly.targets.codexDir,
|
||||
readOnly.targets.antigravityDir,
|
||||
]) {
|
||||
const notes = path.join(root, "paseo-loop", "notes");
|
||||
await mkdir(notes, { recursive: true });
|
||||
@@ -946,6 +985,7 @@ describe("skills controller", () => {
|
||||
readOnly.targets.agentsDir,
|
||||
readOnly.targets.claudeDir,
|
||||
readOnly.targets.codexDir,
|
||||
readOnly.targets.antigravityDir,
|
||||
]) {
|
||||
const restored = path.join(root, "paseo-loop", "notes", "latest.md");
|
||||
expect((await lstat(restored)).isSymbolicLink()).toBe(true);
|
||||
@@ -970,6 +1010,7 @@ describe("skills controller", () => {
|
||||
readOnly.targets.agentsDir,
|
||||
readOnly.targets.claudeDir,
|
||||
readOnly.targets.codexDir,
|
||||
readOnly.targets.antigravityDir,
|
||||
]) {
|
||||
await chmod(path.join(root, "paseo-loop", "hooks", "run.sh"), 0o751);
|
||||
}
|
||||
@@ -987,6 +1028,7 @@ describe("skills controller", () => {
|
||||
readOnly.targets.agentsDir,
|
||||
readOnly.targets.claudeDir,
|
||||
readOnly.targets.codexDir,
|
||||
readOnly.targets.antigravityDir,
|
||||
]) {
|
||||
const restored = await lstat(path.join(root, "paseo-loop", "hooks", "run.sh"));
|
||||
expect(restored.mode & 0o777).toBe(0o751);
|
||||
@@ -998,7 +1040,7 @@ describe("skills controller", () => {
|
||||
it("leaves no backup artifacts behind after a successful save", async () => {
|
||||
await harness.controller.save({ mode: "custom", skills: ["paseo"] });
|
||||
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
@@ -1025,7 +1067,7 @@ describe("skills controller", () => {
|
||||
expect(outcome.ok).toBe(true);
|
||||
expect(await gated.store.get()).toEqual(next);
|
||||
await blocked.controller.status();
|
||||
expect(await backupArtifacts(blocked.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(blocked.targets)).toEqual([[], [], [], []]);
|
||||
await rm(blocked.root, { recursive: true, force: true });
|
||||
},
|
||||
);
|
||||
@@ -1061,6 +1103,7 @@ describe("skills controller", () => {
|
||||
harness.targets.agentsDir,
|
||||
harness.targets.claudeDir,
|
||||
harness.targets.codexDir,
|
||||
harness.targets.antigravityDir,
|
||||
]) {
|
||||
await rm(path.join(root, "paseo-loop"), { recursive: true, force: true });
|
||||
}
|
||||
@@ -1071,8 +1114,9 @@ describe("skills controller", () => {
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it("does not roll back an interrupted transaction after the selection committed", async () => {
|
||||
@@ -1092,6 +1136,7 @@ describe("skills controller", () => {
|
||||
harness.targets.agentsDir,
|
||||
harness.targets.claudeDir,
|
||||
harness.targets.codexDir,
|
||||
harness.targets.antigravityDir,
|
||||
]) {
|
||||
await rm(path.join(root, "paseo-loop"), { recursive: true, force: true });
|
||||
}
|
||||
@@ -1101,7 +1146,7 @@ describe("skills controller", () => {
|
||||
|
||||
expect(snapshot.selection).toEqual(next);
|
||||
expect(await isInstalled(harness.targets, "paseo-loop")).toBe(false);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it("asks for confirmation naming the directories a save would delete", async () => {
|
||||
@@ -1119,6 +1164,7 @@ describe("skills controller", () => {
|
||||
["paseo", "paseo-advisor", "paseo-loop"],
|
||||
["paseo", "paseo-advisor", "paseo-loop"],
|
||||
["paseo-advisor"],
|
||||
["paseo", "paseo-advisor", "paseo-loop"],
|
||||
]);
|
||||
expect(result.selection).toEqual({ mode: "custom", skills: ["paseo", "paseo-loop"] });
|
||||
});
|
||||
@@ -1134,7 +1180,12 @@ describe("skills controller", () => {
|
||||
|
||||
expect(result.confirmationRequired).toBeNull();
|
||||
expect(result.selection).toEqual({ mode: "custom", skills: ["paseo"] });
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([
|
||||
["paseo"],
|
||||
["paseo"],
|
||||
[],
|
||||
["paseo"],
|
||||
]);
|
||||
});
|
||||
|
||||
it("asks again when another directory appears before the retry", async () => {
|
||||
@@ -1154,6 +1205,7 @@ describe("skills controller", () => {
|
||||
["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
|
||||
["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
|
||||
["paseo-chat"],
|
||||
["paseo", "paseo-advisor", "paseo-chat", "paseo-loop"],
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -1175,6 +1227,7 @@ describe("skills controller", () => {
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
"hand written",
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -1182,7 +1235,12 @@ describe("skills controller", () => {
|
||||
const result = await harness.controller.save({ mode: "custom", skills: ["paseo"] });
|
||||
|
||||
expect(result.confirmationRequired).toBeNull();
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([
|
||||
["paseo"],
|
||||
["paseo"],
|
||||
[],
|
||||
["paseo"],
|
||||
]);
|
||||
});
|
||||
|
||||
it("preserves a regular file at a skill path when save convergence fails", async () => {
|
||||
@@ -1195,6 +1253,131 @@ describe("skills controller", () => {
|
||||
expect(await readFile(collision, "utf8")).toBe("keep this file");
|
||||
});
|
||||
|
||||
it("rolls back earlier targets when writing to Antigravity fails", async () => {
|
||||
await mkdir(harness.targets.antigravityDir, { recursive: true });
|
||||
const collision = path.join(harness.targets.antigravityDir, "paseo");
|
||||
await writeFile(collision, "keep this file");
|
||||
|
||||
await expect(harness.controller.save({ mode: "custom", skills: ["paseo"] })).rejects.toThrow();
|
||||
|
||||
expect(await readFile(collision, "utf8")).toBe("keep this file");
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([[], [], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it("rolls back cleanly without locking later calls when an Antigravity parent is a file", async () => {
|
||||
const geminiConfig = path.dirname(harness.targets.antigravityDir);
|
||||
await mkdir(path.dirname(geminiConfig), { recursive: true });
|
||||
await writeFile(geminiConfig, "not a directory");
|
||||
|
||||
await expect(harness.controller.save({ mode: "custom", skills: ["paseo"] })).rejects.toThrow();
|
||||
|
||||
expect(await readFile(geminiConfig, "utf8")).toBe("not a directory");
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([[], [], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({
|
||||
state: "not-installed",
|
||||
selection: { mode: "all" },
|
||||
});
|
||||
await expect(harness.controller.uninstall()).resolves.toMatchObject({
|
||||
state: "not-installed",
|
||||
});
|
||||
});
|
||||
|
||||
it.skipIf(process.platform === "win32" || process.getuid?.() === 0)(
|
||||
"rolls back cleanly and still updates other targets when ~/.gemini is unwritable",
|
||||
async () => {
|
||||
const geminiHome = path.dirname(path.dirname(harness.targets.antigravityDir));
|
||||
await mkdir(geminiHome, { recursive: true });
|
||||
await chmod(geminiHome, 0o000);
|
||||
try {
|
||||
await expect(
|
||||
harness.controller.save({ mode: "custom", skills: ["paseo"] }),
|
||||
).rejects.toThrow();
|
||||
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([[], [], [], []]);
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
await expect(harness.controller.status()).resolves.toMatchObject({
|
||||
state: "not-installed",
|
||||
selection: { mode: "all" },
|
||||
});
|
||||
} finally {
|
||||
await chmod(geminiHome, 0o755);
|
||||
}
|
||||
|
||||
// Install v1 everywhere, remove ~/.gemini/config so ~/.gemini (0555) blocks
|
||||
// Antigravity writes with EACCES, then upgrade bundle to v2 and autoUpdate.
|
||||
await harness.controller.install();
|
||||
await rm(path.dirname(harness.targets.antigravityDir), { recursive: true, force: true });
|
||||
for (const name of BUNDLED_SKILLS) {
|
||||
await writeFile(path.join(harness.targets.sourceDir, name, "SKILL.md"), `${name}-v2`);
|
||||
}
|
||||
await chmod(geminiHome, 0o555);
|
||||
try {
|
||||
await expect(harness.controller.autoUpdate()).rejects.toThrow();
|
||||
for (const root of [harness.targets.agentsDir, harness.targets.claudeDir]) {
|
||||
for (const name of BUNDLED_SKILLS) {
|
||||
expect(await readFile(path.join(root, name, "SKILL.md"), "utf8")).toBe(`${name}-v2`);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
await chmod(geminiHome, 0o755);
|
||||
}
|
||||
|
||||
// With ~/.gemini unreadable (0000), uninstall still removes every skill from healthy targets.
|
||||
await chmod(geminiHome, 0o000);
|
||||
try {
|
||||
await expect(harness.controller.uninstall()).rejects.toThrow();
|
||||
expect(await installedSkills(harness.targets.agentsDir)).toEqual([]);
|
||||
expect(await installedSkills(harness.targets.claudeDir)).toEqual([]);
|
||||
} finally {
|
||||
await chmod(geminiHome, 0o755);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
it("recovers a pre-upgrade transaction manifest that recorded codex at root index 2", async () => {
|
||||
const previous: SkillSelection = { mode: "custom", skills: ["paseo"] };
|
||||
const next: SkillSelection = { mode: "all" };
|
||||
await harness.controller.save(previous);
|
||||
|
||||
const transactionDir = path.join(
|
||||
path.dirname(harness.targets.agentsDir),
|
||||
".paseo-skills-transaction-legacy-codex-index",
|
||||
);
|
||||
const codexBackup = path.join(transactionDir, "backup", "2", "paseo");
|
||||
await mkdir(path.join(codexBackup, "notes"), { recursive: true });
|
||||
await writeFile(path.join(codexBackup, "notes", "codex.md"), "restored codex note");
|
||||
await writeFile(
|
||||
path.join(transactionDir, "transaction.json"),
|
||||
`${JSON.stringify(
|
||||
{
|
||||
owner: "paseo-skills-transaction",
|
||||
version: 1,
|
||||
phase: "converging",
|
||||
previousSelection: previous,
|
||||
nextSelection: next,
|
||||
entries: [
|
||||
{
|
||||
livePath: path.join(harness.targets.codexDir, "paseo"),
|
||||
kind: "update",
|
||||
backupPath: path.join("backup", "2", "paseo"),
|
||||
},
|
||||
],
|
||||
},
|
||||
null,
|
||||
2,
|
||||
)}\n`,
|
||||
);
|
||||
|
||||
await harness.controller.status();
|
||||
|
||||
expect(
|
||||
await readFile(path.join(harness.targets.codexDir, "paseo", "notes", "codex.md"), "utf8"),
|
||||
).toBe("restored codex note");
|
||||
expect(await backupArtifacts(harness.targets)).toEqual([[], [], [], []]);
|
||||
});
|
||||
|
||||
it("serializes startup convergence with an interactive save", async () => {
|
||||
await harness.controller.install();
|
||||
// Startup finds drift it wants to repair while the user narrows the
|
||||
@@ -1214,7 +1397,12 @@ describe("skills controller", () => {
|
||||
]);
|
||||
|
||||
expect(saved.selection).toEqual({ mode: "custom", skills: ["paseo"] });
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([["paseo"], ["paseo"], []]);
|
||||
expect(await installedEverywhere(harness.targets)).toEqual([
|
||||
["paseo"],
|
||||
["paseo"],
|
||||
[],
|
||||
["paseo"],
|
||||
]);
|
||||
expect(await harness.controller.status()).toEqual({
|
||||
state: "up-to-date",
|
||||
ops: [],
|
||||
@@ -1247,6 +1435,7 @@ describe("skills controller", () => {
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
"keep this",
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -21,18 +21,31 @@ function only(...skills: string[]): SkillSelection {
|
||||
return { mode: "custom", skills };
|
||||
}
|
||||
|
||||
interface TestSkillTargets extends SkillTargets {
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
antigravityDir: string;
|
||||
installDirs: string[];
|
||||
}
|
||||
|
||||
interface Sandbox {
|
||||
root: string;
|
||||
targets: SkillTargets;
|
||||
targets: TestSkillTargets;
|
||||
}
|
||||
|
||||
async function makeSandbox(): Promise<Sandbox> {
|
||||
const root = await fs.mkdtemp(path.join(os.tmpdir(), "paseo-skills-"));
|
||||
const targets: SkillTargets = {
|
||||
const agentsDir = path.join(root, "home", ".agents", "skills");
|
||||
const claudeDir = path.join(root, "home", ".claude", "skills");
|
||||
const codexDir = path.join(root, "home", ".codex", "skills");
|
||||
const antigravityDir = path.join(root, "home", ".gemini", "config", "skills");
|
||||
const targets: TestSkillTargets = {
|
||||
sourceDir: path.join(root, "bundle"),
|
||||
agentsDir: path.join(root, "home", ".agents", "skills"),
|
||||
claudeDir: path.join(root, "home", ".claude", "skills"),
|
||||
codexDir: path.join(root, "home", ".codex", "skills"),
|
||||
installDirs: [agentsDir, claudeDir, antigravityDir],
|
||||
agentsDir,
|
||||
claudeDir,
|
||||
codexDir,
|
||||
antigravityDir,
|
||||
};
|
||||
await fs.mkdir(targets.sourceDir, { recursive: true });
|
||||
return { root, targets };
|
||||
@@ -63,7 +76,7 @@ async function writeOnDiskSkill(
|
||||
}
|
||||
|
||||
async function writeOnDiskSkillToAllTargets(
|
||||
targets: SkillTargets,
|
||||
targets: TestSkillTargets,
|
||||
name: string,
|
||||
files: Record<string, string>,
|
||||
): Promise<void> {
|
||||
@@ -71,6 +84,7 @@ async function writeOnDiskSkillToAllTargets(
|
||||
writeOnDiskSkill(targets.agentsDir, name, files),
|
||||
writeOnDiskSkill(targets.claudeDir, name, files),
|
||||
writeOnDiskSkill(targets.codexDir, name, files),
|
||||
writeOnDiskSkill(targets.antigravityDir, name, files),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -86,9 +100,9 @@ async function pathExists(p: string): Promise<boolean> {
|
||||
.catch(() => false);
|
||||
}
|
||||
|
||||
async function installedIn(targets: SkillTargets, name: string): Promise<boolean[]> {
|
||||
async function installedIn(targets: TestSkillTargets, name: string): Promise<boolean[]> {
|
||||
return Promise.all(
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir].map((dir) =>
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir, targets.antigravityDir].map((dir) =>
|
||||
pathExists(path.join(dir, name)),
|
||||
),
|
||||
);
|
||||
@@ -196,6 +210,10 @@ describe("getSkillsStatus", () => {
|
||||
"SKILL.md": "paseo-v1",
|
||||
"hooks/guard.sh": "user guard",
|
||||
});
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo", {
|
||||
"SKILL.md": "paseo-v1",
|
||||
"notes/local.md": "user notes",
|
||||
});
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
@@ -212,6 +230,7 @@ describe("getSkillsStatus", () => {
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo", { "SKILL.md": "stale" });
|
||||
await writeOnDiskSkill(sandbox.targets.claudeDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.codexDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkillToAllTargets(sandbox.targets, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
@@ -228,6 +247,8 @@ describe("getSkillsStatus", () => {
|
||||
await writeOnDiskSkill(sandbox.targets.claudeDir, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.codexDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.codexDir, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
@@ -235,6 +256,35 @@ describe("getSkillsStatus", () => {
|
||||
expect(status.ops).toEqual([{ kind: "update", name: "paseo" }]);
|
||||
});
|
||||
|
||||
it("returns drift when Antigravity is missing or stale", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.claudeDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.claudeDir, "paseo-loop", { "SKILL.md": "loop-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo", { "SKILL.md": "stale" });
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
expect(status.state).toBe("drift");
|
||||
expect(status.ops).toEqual([
|
||||
{ kind: "update", name: "paseo" },
|
||||
{ kind: "add", name: "paseo-loop" },
|
||||
]);
|
||||
});
|
||||
|
||||
it("returns not-installed when only user-personal skills exist in Antigravity", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "my-agy-skill", {
|
||||
"SKILL.md": "user-agy",
|
||||
});
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
expect(status.state).toBe("not-installed");
|
||||
expect(status.installed).toEqual([]);
|
||||
});
|
||||
|
||||
it("returns drift with add ops for the bundled skills missing from disk", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await writeOnDiskSkillToAllTargets(sandbox.targets, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
@@ -262,6 +312,7 @@ describe("getSkillsStatus", () => {
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo", { "SKILL.md": "stale" });
|
||||
await writeOnDiskSkill(sandbox.targets.claudeDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.codexDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "paseo", { "SKILL.md": "paseo-v1" });
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "paseo-chat", { "SKILL.md": "chat-old" });
|
||||
|
||||
const status = await getSkillsStatus(sandbox.targets, ALL_SKILLS);
|
||||
@@ -299,9 +350,14 @@ describe("custom skill selection", () => {
|
||||
available: ["paseo", "paseo-advisor", "paseo-loop"],
|
||||
installed: ["paseo", "paseo-loop"],
|
||||
});
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([true, true, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false, true]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([true, true, false, true]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
]);
|
||||
});
|
||||
|
||||
it("reports up-to-date while an unselected bundled skill is absent", async () => {
|
||||
@@ -323,9 +379,14 @@ describe("custom skill selection", () => {
|
||||
const status = await installSkills(sandbox.targets, only("paseo"));
|
||||
|
||||
expect(status.state).toBe("up-to-date");
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([true, true, false, true]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([false, false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-advisor")).toEqual([
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
]);
|
||||
});
|
||||
|
||||
it("reports a delete op for a deselected skill before it is applied", async () => {
|
||||
@@ -339,12 +400,21 @@ describe("custom skill selection", () => {
|
||||
|
||||
it("leaves unrelated user skills untouched", async () => {
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "unslop", { "SKILL.md": "user-unslop" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "custom-agy", {
|
||||
"SKILL.md": "user-agy",
|
||||
});
|
||||
|
||||
await installSkills(sandbox.targets, only("paseo"));
|
||||
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.agentsDir, "unslop", "SKILL.md"), "utf-8"),
|
||||
).toBe("user-unslop");
|
||||
expect(
|
||||
await fs.readFile(
|
||||
path.join(sandbox.targets.antigravityDir, "custom-agy", "SKILL.md"),
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("user-agy");
|
||||
});
|
||||
|
||||
it("treats an empty custom selection as no managed skills installed", async () => {
|
||||
@@ -358,8 +428,8 @@ describe("custom skill selection", () => {
|
||||
available: ["paseo", "paseo-advisor", "paseo-loop"],
|
||||
installed: [],
|
||||
});
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([false, false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-loop")).toEqual([false, false, false, false]);
|
||||
});
|
||||
|
||||
it("ignores selected names that the bundle does not ship", async () => {
|
||||
@@ -371,7 +441,7 @@ describe("custom skill selection", () => {
|
||||
available: ["paseo", "paseo-advisor", "paseo-loop"],
|
||||
installed: ["paseo"],
|
||||
});
|
||||
expect(await installedIn(sandbox.targets, "not-a-skill")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "not-a-skill")).toEqual([false, false, false, false]);
|
||||
});
|
||||
|
||||
it("still deletes legacy skill names that are not selectable", async () => {
|
||||
@@ -381,7 +451,12 @@ describe("custom skill selection", () => {
|
||||
|
||||
await installSkills(sandbox.targets, only("paseo"));
|
||||
|
||||
expect(await installedIn(sandbox.targets, "paseo-orchestrator")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-orchestrator")).toEqual([
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -396,9 +471,12 @@ describe("installSkills / updateSkills", () => {
|
||||
await fs.rm(sandbox.root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it("installs into shared and Claude roots without duplicating Codex discovery", async () => {
|
||||
it("installs into shared, Claude, and Antigravity roots without duplicating Codex discovery", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, "unslop", { "SKILL.md": "user-unslop" });
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "custom-agy", {
|
||||
"SKILL.md": "user-agy",
|
||||
});
|
||||
|
||||
const status = await installSkills(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
@@ -409,15 +487,25 @@ describe("installSkills / updateSkills", () => {
|
||||
installed: ["paseo", "paseo-loop"],
|
||||
});
|
||||
for (const name of ["paseo", "paseo-loop"]) {
|
||||
const expected = name === "paseo" ? "paseo-v1" : "loop-v1";
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.agentsDir, name, "SKILL.md"), "utf-8"),
|
||||
).toBe(name === "paseo" ? "paseo-v1" : "loop-v1");
|
||||
).toBe(expected);
|
||||
expect(await pathExists(path.join(sandbox.targets.codexDir, name, "SKILL.md"))).toBe(false);
|
||||
expect(await pathExists(path.join(sandbox.targets.claudeDir, name))).toBe(true);
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.antigravityDir, name, "SKILL.md"), "utf-8"),
|
||||
).toBe(expected);
|
||||
}
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.agentsDir, "unslop", "SKILL.md"), "utf-8"),
|
||||
).toBe("user-unslop");
|
||||
expect(
|
||||
await fs.readFile(
|
||||
path.join(sandbox.targets.antigravityDir, "custom-agy", "SKILL.md"),
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("user-agy");
|
||||
});
|
||||
|
||||
it("retires unchanged managed Codex copies while preserving personal files", async () => {
|
||||
@@ -469,14 +557,23 @@ describe("installSkills / updateSkills", () => {
|
||||
});
|
||||
|
||||
it.each([
|
||||
{ alias: "codex", target: "agents" },
|
||||
{ alias: "codex", target: "claude" },
|
||||
{ alias: "claude", target: "codex" },
|
||||
{ alias: "codex", target: "agents", expected: [true, true, true, true] },
|
||||
{ alias: "codex", target: "claude", expected: [true, true, true, true] },
|
||||
{ alias: "claude", target: "codex", expected: [true, true, true, true] },
|
||||
{ alias: "codex", target: "antigravity", expected: [true, true, true, true] },
|
||||
{ alias: "antigravity", target: "codex", expected: [true, true, true, true] },
|
||||
{ alias: "antigravity", target: "agents", expected: [true, true, false, true] },
|
||||
{ alias: "antigravity", target: "claude", expected: [true, true, false, true] },
|
||||
] as const)(
|
||||
"keeps installed skills when the $alias root links to the $target root",
|
||||
async ({ alias, target }) => {
|
||||
async ({ alias, target, expected }) => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
const rootOf = { agents: "agentsDir", claude: "claudeDir", codex: "codexDir" } as const;
|
||||
const rootOf = {
|
||||
agents: "agentsDir",
|
||||
claude: "claudeDir",
|
||||
codex: "codexDir",
|
||||
antigravity: "antigravityDir",
|
||||
} as const;
|
||||
const aliasRoot = sandbox.targets[rootOf[alias]];
|
||||
const targetRoot = sandbox.targets[rootOf[target]];
|
||||
await fs.mkdir(targetRoot, { recursive: true });
|
||||
@@ -488,12 +585,36 @@ describe("installSkills / updateSkills", () => {
|
||||
|
||||
expect(installed.state).toBe("up-to-date");
|
||||
expect(updated.state).toBe("up-to-date");
|
||||
expect((await fs.lstat(aliasRoot)).isSymbolicLink()).toBe(true);
|
||||
for (const name of ["paseo", "paseo-loop"]) {
|
||||
expect(await installedIn(sandbox.targets, name)).toEqual([true, true, true]);
|
||||
expect(await installedIn(sandbox.targets, name)).toEqual([...expected]);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
it("keeps an installed skill when its Antigravity directory links to the shared copy", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await fs.mkdir(path.join(sandbox.targets.agentsDir, "paseo"), { recursive: true });
|
||||
await fs.mkdir(sandbox.targets.antigravityDir, { recursive: true });
|
||||
await fs.symlink(
|
||||
path.join(sandbox.targets.agentsDir, "paseo"),
|
||||
path.join(sandbox.targets.antigravityDir, "paseo"),
|
||||
"dir",
|
||||
);
|
||||
|
||||
const installed = await installSkills(sandbox.targets, ALL_SKILLS);
|
||||
const updated = await autoUpdateInstalledSkills(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
expect(installed.state).toBe("up-to-date");
|
||||
expect(updated.state).toBe("up-to-date");
|
||||
expect(
|
||||
(await fs.lstat(path.join(sandbox.targets.antigravityDir, "paseo"))).isSymbolicLink(),
|
||||
).toBe(true);
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.antigravityDir, "paseo", "SKILL.md"), "utf8"),
|
||||
).toBe("paseo-v1");
|
||||
});
|
||||
|
||||
it("keeps an installed skill when its Codex directory links to the shared copy", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await fs.mkdir(path.join(sandbox.targets.agentsDir, "paseo"), { recursive: true });
|
||||
@@ -604,6 +725,15 @@ describe("installSkills / updateSkills", () => {
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.claudeDir, "paseo-loop", "SKILL.md"), "utf-8"),
|
||||
).toBe("loop-v1");
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.antigravityDir, "paseo", "SKILL.md"), "utf-8"),
|
||||
).toBe("paseo-v1");
|
||||
expect(
|
||||
await fs.readFile(
|
||||
path.join(sandbox.targets.antigravityDir, "paseo-loop", "SKILL.md"),
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("loop-v1");
|
||||
});
|
||||
|
||||
it("auto-updates drifted installed skills", async () => {
|
||||
@@ -626,6 +756,9 @@ describe("installSkills / updateSkills", () => {
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("user guard");
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.antigravityDir, "paseo", "SKILL.md"), "utf-8"),
|
||||
).toBe("paseo-v1");
|
||||
});
|
||||
|
||||
it("does not auto-install skills on a clean machine", async () => {
|
||||
@@ -642,7 +775,7 @@ describe("installSkills / updateSkills", () => {
|
||||
available: ["paseo", "paseo-loop"],
|
||||
installed: [],
|
||||
});
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo")).toEqual([false, false, false, false]);
|
||||
});
|
||||
|
||||
it("is idempotent — running install twice keeps state at up-to-date", async () => {
|
||||
@@ -667,24 +800,51 @@ describe("uninstallSkills", () => {
|
||||
await fs.rm(sandbox.root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it("removes every Paseo skill from all three targets and preserves user dirs", async () => {
|
||||
it("removes every Paseo skill from all targets and preserves user dirs and symlinks", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
await installSkills(sandbox.targets, ALL_SKILLS);
|
||||
for (const name of ["unslop", "tdd", "devbox"]) {
|
||||
await writeOnDiskSkill(sandbox.targets.agentsDir, name, { "SKILL.md": `user-${name}` });
|
||||
}
|
||||
await writeOnDiskSkill(sandbox.targets.antigravityDir, "user-agy-skill", {
|
||||
"SKILL.md": "user-agy",
|
||||
});
|
||||
const linkedSource = path.join(sandbox.root, "external-user-skill");
|
||||
await writeFiles(linkedSource, { "SKILL.md": "linked-user-skill" });
|
||||
await fs.symlink(
|
||||
linkedSource,
|
||||
path.join(sandbox.targets.antigravityDir, "linked-user-skill"),
|
||||
"dir",
|
||||
);
|
||||
|
||||
const status = await uninstallSkills(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
expect(status.state).toBe("not-installed");
|
||||
for (const name of ["paseo", "paseo-loop", ...LEGACY_SKILL_NAMES]) {
|
||||
expect(await installedIn(sandbox.targets, name)).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, name)).toEqual([false, false, false, false]);
|
||||
}
|
||||
for (const name of ["unslop", "tdd", "devbox"]) {
|
||||
expect(
|
||||
await fs.readFile(path.join(sandbox.targets.agentsDir, name, "SKILL.md"), "utf-8"),
|
||||
).toBe(`user-${name}`);
|
||||
}
|
||||
expect(
|
||||
await fs.readFile(
|
||||
path.join(sandbox.targets.antigravityDir, "user-agy-skill", "SKILL.md"),
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("user-agy");
|
||||
expect(
|
||||
(
|
||||
await fs.lstat(path.join(sandbox.targets.antigravityDir, "linked-user-skill"))
|
||||
).isSymbolicLink(),
|
||||
).toBe(true);
|
||||
expect(
|
||||
await fs.readFile(
|
||||
path.join(sandbox.targets.antigravityDir, "linked-user-skill", "SKILL.md"),
|
||||
"utf-8",
|
||||
),
|
||||
).toBe("linked-user-skill");
|
||||
});
|
||||
|
||||
it("is a no-op when nothing is installed", async () => {
|
||||
@@ -695,12 +855,13 @@ describe("uninstallSkills", () => {
|
||||
expect(status.state).toBe("not-installed");
|
||||
});
|
||||
|
||||
it("cleans up legacy skill names that linger in agents, claude, and codex", async () => {
|
||||
it("cleans up legacy skill names that linger in agents, claude, codex, and antigravity", async () => {
|
||||
await writeCurrentBundle(sandbox.targets.sourceDir);
|
||||
for (const dir of [
|
||||
sandbox.targets.agentsDir,
|
||||
sandbox.targets.claudeDir,
|
||||
sandbox.targets.codexDir,
|
||||
sandbox.targets.antigravityDir,
|
||||
]) {
|
||||
await writeOnDiskSkill(dir, "paseo-chat", { "SKILL.md": "chat-old" });
|
||||
}
|
||||
@@ -708,6 +869,6 @@ describe("uninstallSkills", () => {
|
||||
const status = await uninstallSkills(sandbox.targets, ALL_SKILLS);
|
||||
|
||||
expect(status.state).toBe("not-installed");
|
||||
expect(await installedIn(sandbox.targets, "paseo-chat")).toEqual([false, false, false]);
|
||||
expect(await installedIn(sandbox.targets, "paseo-chat")).toEqual([false, false, false, false]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -35,8 +35,12 @@ export interface SkillsStatus {
|
||||
|
||||
export interface SkillTargets {
|
||||
sourceDir: string;
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
/**
|
||||
* Ordered active install roots. Append new roots to the end so transaction
|
||||
* backup indices remain stable across daemon upgrades.
|
||||
*/
|
||||
installDirs: readonly string[];
|
||||
/** Legacy dedicated Codex root, retired on sync unless it aliases an install root. */
|
||||
codexDir: string;
|
||||
}
|
||||
|
||||
@@ -163,13 +167,11 @@ export async function getSkillsStatus(
|
||||
): Promise<SkillsStatus> {
|
||||
const available = await listBundledSkills(targets.sourceDir);
|
||||
const names = managedSkillNames(available);
|
||||
const [bundle, agentsDisk, claudeDisk, codexDisk] = await Promise.all([
|
||||
const [bundle, codexDisk, ...disks] = await Promise.all([
|
||||
hashSkills(targets.sourceDir, available),
|
||||
hashSkills(targets.agentsDir, names),
|
||||
hashSkills(targets.claudeDir, names),
|
||||
hashSkills(targets.codexDir, names),
|
||||
...targets.installDirs.map((root) => hashSkills(root, names)),
|
||||
]);
|
||||
const disks = [agentsDisk, claudeDisk];
|
||||
const desired = resolveDesiredSkills(selection, available);
|
||||
const ops = diff(bundle, disks, names, desired);
|
||||
for (const name of codexDisk.keys()) {
|
||||
@@ -203,8 +205,7 @@ async function applySkills(
|
||||
if (writes.length > 0) {
|
||||
await syncSkills({
|
||||
sourceDir: targets.sourceDir,
|
||||
agentsDir: targets.agentsDir,
|
||||
claudeDir: targets.claudeDir,
|
||||
installDirs: targets.installDirs,
|
||||
codexDir: targets.codexDir,
|
||||
skillNames: writes,
|
||||
});
|
||||
@@ -213,8 +214,7 @@ async function applySkills(
|
||||
for (const op of status.ops) {
|
||||
if (op.kind !== "delete") continue;
|
||||
await removeSkill(op.name, {
|
||||
agentsDir: targets.agentsDir,
|
||||
claudeDir: targets.claudeDir,
|
||||
installDirs: targets.installDirs,
|
||||
codexDir: targets.codexDir,
|
||||
});
|
||||
}
|
||||
@@ -259,12 +259,21 @@ export async function uninstallSkills(
|
||||
selection: SkillSelection,
|
||||
): Promise<SkillsStatus> {
|
||||
const available = await listBundledSkills(targets.sourceDir);
|
||||
let hasError = false;
|
||||
let firstError: unknown = null;
|
||||
for (const name of managedSkillNames(available)) {
|
||||
await removeSkill(name, {
|
||||
agentsDir: targets.agentsDir,
|
||||
claudeDir: targets.claudeDir,
|
||||
codexDir: targets.codexDir,
|
||||
});
|
||||
try {
|
||||
await removeSkill(name, {
|
||||
installDirs: targets.installDirs,
|
||||
codexDir: targets.codexDir,
|
||||
});
|
||||
} catch (error) {
|
||||
if (!hasError) {
|
||||
hasError = true;
|
||||
firstError = error;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (hasError) throw firstError;
|
||||
return getSkillsStatus(targets, selection);
|
||||
}
|
||||
|
||||
@@ -45,8 +45,11 @@ describe("orchestration skill paths", () => {
|
||||
const home = os.homedir();
|
||||
|
||||
expect(resolveSkillTargets()).toMatchObject({
|
||||
agentsDir: path.join(home, ".agents", "skills"),
|
||||
claudeDir: path.join(home, ".claude", "skills"),
|
||||
installDirs: [
|
||||
path.join(home, ".agents", "skills"),
|
||||
path.join(home, ".claude", "skills"),
|
||||
path.join(home, ".gemini", "config", "skills"),
|
||||
],
|
||||
codexDir: path.join(home, ".codex", "skills"),
|
||||
});
|
||||
});
|
||||
|
||||
@@ -17,8 +17,13 @@ export function resolveBundledSkillsDir(moduleUrl: string | URL = import.meta.ur
|
||||
export function resolveSkillTargets(home: string = os.homedir()): SkillTargets {
|
||||
return {
|
||||
sourceDir: resolveBundledSkillsDir(),
|
||||
agentsDir: path.join(home, ".agents", "skills"),
|
||||
claudeDir: path.join(home, ".claude", "skills"),
|
||||
// Append new install roots to the end — transaction backups reference roots
|
||||
// by index, so existing positions must remain stable across upgrades.
|
||||
installDirs: [
|
||||
path.join(home, ".agents", "skills"),
|
||||
path.join(home, ".claude", "skills"),
|
||||
path.join(home, ".gemini", "config", "skills"),
|
||||
],
|
||||
codexDir: path.join(home, ".codex", "skills"),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,6 +10,8 @@ interface Sandbox {
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
codexDir: string;
|
||||
antigravityDir: string;
|
||||
installDirs: string[];
|
||||
}
|
||||
|
||||
async function makeSandbox(): Promise<Sandbox> {
|
||||
@@ -18,8 +20,10 @@ async function makeSandbox(): Promise<Sandbox> {
|
||||
const agentsDir = path.join(root, "home", ".agents", "skills");
|
||||
const claudeDir = path.join(root, "home", ".claude", "skills");
|
||||
const codexDir = path.join(root, "home", ".codex", "skills");
|
||||
const antigravityDir = path.join(root, "home", ".gemini", "config", "skills");
|
||||
const installDirs = [agentsDir, claudeDir, antigravityDir];
|
||||
await fs.mkdir(sourceDir, { recursive: true });
|
||||
return { root, sourceDir, agentsDir, claudeDir, codexDir };
|
||||
return { root, sourceDir, agentsDir, claudeDir, codexDir, antigravityDir, installDirs };
|
||||
}
|
||||
|
||||
async function writeBundleSkill(
|
||||
@@ -57,8 +61,7 @@ describe("syncSkills", () => {
|
||||
|
||||
const result = await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -75,6 +78,11 @@ describe("syncSkills", () => {
|
||||
"utf-8",
|
||||
);
|
||||
expect(claudeContent).toBe("new paseo content");
|
||||
const antigravityContent = await fs.readFile(
|
||||
path.join(sandbox.antigravityDir, "paseo", "SKILL.md"),
|
||||
"utf-8",
|
||||
);
|
||||
expect(antigravityContent).toBe("new paseo content");
|
||||
await expect(fs.stat(path.join(sandbox.codexDir, "paseo", "SKILL.md"))).rejects.toMatchObject({
|
||||
code: "ENOENT",
|
||||
});
|
||||
@@ -88,8 +96,7 @@ describe("syncSkills", () => {
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo-committee"],
|
||||
});
|
||||
@@ -115,6 +122,15 @@ describe("syncSkills", () => {
|
||||
expect(await fs.readFile(path.join(claudeSkillDir, "references", "roles.md"), "utf-8")).toBe(
|
||||
"roles content",
|
||||
);
|
||||
|
||||
const antigravitySkillDir = path.join(sandbox.antigravityDir, "paseo-committee");
|
||||
expect((await fs.lstat(antigravitySkillDir)).isDirectory()).toBe(true);
|
||||
expect(await fs.readFile(path.join(antigravitySkillDir, "SKILL.md"), "utf-8")).toBe(
|
||||
"committee content",
|
||||
);
|
||||
expect(
|
||||
await fs.readFile(path.join(antigravitySkillDir, "references", "roles.md"), "utf-8"),
|
||||
).toBe("roles content");
|
||||
});
|
||||
|
||||
it("leaves on-disk skills not in the bundle untouched", async () => {
|
||||
@@ -122,16 +138,21 @@ describe("syncSkills", () => {
|
||||
const customSkill = path.join(sandbox.agentsDir, "user-custom-skill");
|
||||
await fs.mkdir(customSkill, { recursive: true });
|
||||
await fs.writeFile(path.join(customSkill, "SKILL.md"), "user content");
|
||||
const antigravityCustomSkill = path.join(sandbox.antigravityDir, "user-antigravity-skill");
|
||||
await fs.mkdir(antigravityCustomSkill, { recursive: true });
|
||||
await fs.writeFile(path.join(antigravityCustomSkill, "SKILL.md"), "antigravity user content");
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
|
||||
expect(await fs.readFile(path.join(customSkill, "SKILL.md"), "utf-8")).toBe("user content");
|
||||
expect(await fs.readFile(path.join(antigravityCustomSkill, "SKILL.md"), "utf-8")).toBe(
|
||||
"antigravity user content",
|
||||
);
|
||||
});
|
||||
|
||||
it("removes stale files previously written to managed skill dirs", async () => {
|
||||
@@ -143,8 +164,7 @@ describe("syncSkills", () => {
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -154,8 +174,7 @@ describe("syncSkills", () => {
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -163,6 +182,12 @@ describe("syncSkills", () => {
|
||||
expect(await fs.readFile(path.join(onDiskSkill, "SKILL.md"), "utf-8")).toBe("new");
|
||||
await expect(fs.access(path.join(onDiskSkill, "references", "stale.md"))).rejects.toThrow();
|
||||
await expect(fs.access(path.join(onDiskSkill, "references"))).rejects.toThrow();
|
||||
const antigravitySkill = path.join(sandbox.antigravityDir, "paseo");
|
||||
expect(await fs.readFile(path.join(antigravitySkill, "SKILL.md"), "utf-8")).toBe("new");
|
||||
await expect(
|
||||
fs.access(path.join(antigravitySkill, "references", "stale.md")),
|
||||
).rejects.toThrow();
|
||||
await expect(fs.access(path.join(antigravitySkill, "references"))).rejects.toThrow();
|
||||
});
|
||||
|
||||
it("preserves user-added files in managed skill dirs", async () => {
|
||||
@@ -172,11 +197,14 @@ describe("syncSkills", () => {
|
||||
await fs.writeFile(path.join(onDiskSkill, "SKILL.md"), "old");
|
||||
await fs.writeFile(path.join(onDiskSkill, "my-context.md"), "user context");
|
||||
await fs.writeFile(path.join(onDiskSkill, "references", "notes.md"), "user notes");
|
||||
const antigravitySkill = path.join(sandbox.antigravityDir, "paseo");
|
||||
await fs.mkdir(path.join(antigravitySkill, "references"), { recursive: true });
|
||||
await fs.writeFile(path.join(antigravitySkill, "SKILL.md"), "old");
|
||||
await fs.writeFile(path.join(antigravitySkill, "my-context.md"), "antigravity user context");
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -188,6 +216,10 @@ describe("syncSkills", () => {
|
||||
expect(await fs.readFile(path.join(onDiskSkill, "references", "notes.md"), "utf-8")).toBe(
|
||||
"user notes",
|
||||
);
|
||||
expect(await fs.readFile(path.join(antigravitySkill, "SKILL.md"), "utf-8")).toBe("new");
|
||||
expect(await fs.readFile(path.join(antigravitySkill, "my-context.md"), "utf-8")).toBe(
|
||||
"antigravity user context",
|
||||
);
|
||||
});
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
@@ -208,8 +240,39 @@ describe("syncSkills", () => {
|
||||
await expect(
|
||||
syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
}),
|
||||
).rejects.toThrow("Cannot sync through symbolic link");
|
||||
|
||||
expect(await fs.readFile(path.join(onDiskSkill, "SKILL.md"), "utf-8")).toBe("old skill");
|
||||
expect(await fs.readFile(path.join(externalReferences, "guide.md"), "utf-8")).toBe(
|
||||
"external guide",
|
||||
);
|
||||
expect((await fs.lstat(path.join(onDiskSkill, "references"))).isSymbolicLink()).toBe(true);
|
||||
},
|
||||
);
|
||||
|
||||
it.skipIf(process.platform === "win32")(
|
||||
"rejects managed paths that would write through a symlink in Antigravity",
|
||||
async () => {
|
||||
await writeBundleSkill(sandbox.sourceDir, "paseo", {
|
||||
"SKILL.md": "new skill",
|
||||
"references/guide.md": "new guide",
|
||||
});
|
||||
const onDiskSkill = path.join(sandbox.antigravityDir, "paseo");
|
||||
const externalReferences = path.join(sandbox.root, "external-antigravity-references");
|
||||
await fs.mkdir(onDiskSkill, { recursive: true });
|
||||
await fs.mkdir(externalReferences, { recursive: true });
|
||||
await fs.writeFile(path.join(onDiskSkill, "SKILL.md"), "old skill");
|
||||
await fs.writeFile(path.join(externalReferences, "guide.md"), "external guide");
|
||||
await fs.symlink(externalReferences, path.join(onDiskSkill, "references"), "dir");
|
||||
|
||||
await expect(
|
||||
syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
}),
|
||||
@@ -231,8 +294,7 @@ describe("syncSkills", () => {
|
||||
|
||||
const first = await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -240,8 +302,7 @@ describe("syncSkills", () => {
|
||||
|
||||
const second = await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
@@ -255,8 +316,7 @@ describe("syncSkills", () => {
|
||||
const errors: Array<{ name: string; error: unknown }> = [];
|
||||
const result = await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo", "paseo-removed"],
|
||||
onSkillError: (name, error) => errors.push({ name, error }),
|
||||
@@ -278,8 +338,7 @@ describe("syncSkills", () => {
|
||||
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo", "paseo-deprecated"],
|
||||
});
|
||||
@@ -293,8 +352,7 @@ describe("syncSkills", () => {
|
||||
const errors: string[] = [];
|
||||
const result = await syncSkills({
|
||||
sourceDir: missingSourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
onSkillError: (skillName) => errors.push(skillName),
|
||||
@@ -313,8 +371,7 @@ describe("syncSkills", () => {
|
||||
const errors: string[] = [];
|
||||
const result = await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
onSkillError: (skillName) => errors.push(skillName),
|
||||
@@ -336,32 +393,30 @@ describe("removeSkill", () => {
|
||||
await fs.rm(sandbox.root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
it("removes the skill from all three targets when present", async () => {
|
||||
it("removes the skill from all targets when present", async () => {
|
||||
await writeBundleSkill(sandbox.sourceDir, "paseo", { "SKILL.md": "content" });
|
||||
await syncSkills({
|
||||
sourceDir: sandbox.sourceDir,
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
skillNames: ["paseo"],
|
||||
});
|
||||
|
||||
await removeSkill("paseo", {
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
});
|
||||
|
||||
await expect(fs.access(path.join(sandbox.agentsDir, "paseo"))).rejects.toThrow();
|
||||
await expect(fs.access(path.join(sandbox.claudeDir, "paseo"))).rejects.toThrow();
|
||||
await expect(fs.access(path.join(sandbox.codexDir, "paseo"))).rejects.toThrow();
|
||||
await expect(fs.access(path.join(sandbox.antigravityDir, "paseo"))).rejects.toThrow();
|
||||
});
|
||||
|
||||
it("does not throw when targets are missing", async () => {
|
||||
await expect(
|
||||
removeSkill("does-not-exist", {
|
||||
agentsDir: sandbox.agentsDir,
|
||||
claudeDir: sandbox.claudeDir,
|
||||
installDirs: sandbox.installDirs,
|
||||
codexDir: sandbox.codexDir,
|
||||
}),
|
||||
).resolves.toBeUndefined();
|
||||
|
||||
@@ -4,8 +4,7 @@ import path from "node:path";
|
||||
|
||||
export interface SkillSyncOptions {
|
||||
sourceDir: string;
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
installDirs: readonly string[];
|
||||
codexDir: string;
|
||||
skillNames: readonly string[];
|
||||
onSkillError?: (skillName: string, error: unknown) => void;
|
||||
@@ -171,20 +170,29 @@ async function syncDirectoryFiles(srcDir: string, dstDir: string): Promise<numbe
|
||||
}
|
||||
|
||||
export interface RemoveSkillTargets {
|
||||
agentsDir: string;
|
||||
claudeDir: string;
|
||||
installDirs: readonly string[];
|
||||
codexDir: string;
|
||||
}
|
||||
|
||||
export async function removeSkill(skillName: string, targets: RemoveSkillTargets): Promise<void> {
|
||||
const paths = [
|
||||
path.join(targets.agentsDir, skillName),
|
||||
path.join(targets.claudeDir, skillName),
|
||||
path.join(targets.codexDir, skillName),
|
||||
];
|
||||
const paths = [...targets.installDirs, targets.codexDir].map((root) =>
|
||||
path.join(root, skillName),
|
||||
);
|
||||
let hasError = false;
|
||||
let firstError: unknown = null;
|
||||
for (const p of paths) {
|
||||
await fs.rm(p, { recursive: true, force: true });
|
||||
try {
|
||||
await fs.rm(p, { recursive: true, force: true });
|
||||
} catch (error) {
|
||||
// If an ancestor is a regular file, no skill directory can exist below it.
|
||||
if ((error as NodeJS.ErrnoException).code === "ENOTDIR") continue;
|
||||
if (!hasError) {
|
||||
hasError = true;
|
||||
firstError = error;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (hasError) throw firstError;
|
||||
}
|
||||
|
||||
async function isSameDirectory(a: string, b: string): Promise<boolean> {
|
||||
@@ -194,7 +202,7 @@ async function isSameDirectory(a: string, b: string): Promise<boolean> {
|
||||
|
||||
/**
|
||||
* Codex also discovers .agents/skills, so its dedicated copy is a leftover. When
|
||||
* the Codex skill directory resolves to the shared or Claude copy, it is that
|
||||
* the Codex skill directory resolves to an active install target, it is that
|
||||
* copy, and retiring it would delete the install.
|
||||
*/
|
||||
export async function isLegacyCodexCopy(
|
||||
@@ -202,7 +210,7 @@ export async function isLegacyCodexCopy(
|
||||
targets: RemoveSkillTargets,
|
||||
): Promise<boolean> {
|
||||
const codexSkillDir = path.join(targets.codexDir, skillName);
|
||||
for (const root of [targets.agentsDir, targets.claudeDir]) {
|
||||
for (const root of targets.installDirs) {
|
||||
if (await isSameDirectory(codexSkillDir, path.join(root, skillName))) return false;
|
||||
}
|
||||
return true;
|
||||
@@ -234,6 +242,8 @@ async function retireManagedSkill(dstDir: string): Promise<number> {
|
||||
export async function syncSkills(options: SkillSyncOptions): Promise<SkillSyncResult> {
|
||||
let changedFiles = 0;
|
||||
let processedSkills = 0;
|
||||
let hasError = false;
|
||||
let firstError: unknown = null;
|
||||
|
||||
for (const skillName of options.skillNames) {
|
||||
const bundleSkillDir = path.join(options.sourceDir, skillName);
|
||||
@@ -241,28 +251,47 @@ export async function syncSkills(options: SkillSyncOptions): Promise<SkillSyncRe
|
||||
const bundleStat = await fs.stat(bundleSkillDir).catch(() => null);
|
||||
if (!bundleStat?.isDirectory()) continue;
|
||||
|
||||
try {
|
||||
changedFiles += await syncDirectoryFiles(
|
||||
bundleSkillDir,
|
||||
path.join(options.agentsDir, skillName),
|
||||
);
|
||||
let skillFailed = false;
|
||||
let skillError: unknown = null;
|
||||
|
||||
changedFiles += await syncDirectoryFiles(
|
||||
bundleSkillDir,
|
||||
path.join(options.claudeDir, skillName),
|
||||
);
|
||||
|
||||
// Retain user edits to the old dedicated Codex copy.
|
||||
if (await isLegacyCodexCopy(skillName, options)) {
|
||||
changedFiles += await retireManagedSkill(path.join(options.codexDir, skillName));
|
||||
// Attempt every install root for every skill before throwing so one
|
||||
// unwritable target does not stop updates from reaching healthy targets.
|
||||
for (const installDir of options.installDirs) {
|
||||
try {
|
||||
changedFiles += await syncDirectoryFiles(bundleSkillDir, path.join(installDir, skillName));
|
||||
} catch (error) {
|
||||
if (!skillFailed) {
|
||||
skillFailed = true;
|
||||
skillError = error;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!skillFailed) {
|
||||
try {
|
||||
// Retain user edits to the old dedicated Codex copy.
|
||||
if (await isLegacyCodexCopy(skillName, options)) {
|
||||
changedFiles += await retireManagedSkill(path.join(options.codexDir, skillName));
|
||||
}
|
||||
} catch (error) {
|
||||
skillFailed = true;
|
||||
skillError = error;
|
||||
}
|
||||
}
|
||||
|
||||
if (skillFailed) {
|
||||
if (options.onSkillError) {
|
||||
options.onSkillError(skillName, skillError);
|
||||
} else if (!hasError) {
|
||||
hasError = true;
|
||||
firstError = skillError;
|
||||
}
|
||||
} else {
|
||||
processedSkills++;
|
||||
} catch (error) {
|
||||
if (!options.onSkillError) throw error;
|
||||
options.onSkillError(skillName, error);
|
||||
}
|
||||
}
|
||||
|
||||
if (hasError) throw firstError;
|
||||
|
||||
return { changedFiles, processedSkills };
|
||||
}
|
||||
|
||||
@@ -128,13 +128,28 @@ function selectionsEqual(left: SkillSelection, right: SkillSelection): boolean {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Ordered roots for transaction capture and recovery. Pre-0.17 manifests
|
||||
* recorded `[agents, claude, codex]` at indices 0–2, so `codexDir` stays at
|
||||
* index 2 and newer install roots follow at index 3+.
|
||||
*/
|
||||
function skillRoots(targets: SkillTargets): string[] {
|
||||
const [agentsDir, claudeDir, ...additionalInstallDirs] = targets.installDirs;
|
||||
return [
|
||||
...(agentsDir ? [agentsDir] : []),
|
||||
...(claudeDir ? [claudeDir] : []),
|
||||
targets.codexDir,
|
||||
...additionalInstallDirs,
|
||||
];
|
||||
}
|
||||
|
||||
async function validateEntries(
|
||||
targets: SkillTargets,
|
||||
transactionDir: string,
|
||||
entries: CapturedDirectory[],
|
||||
): Promise<boolean> {
|
||||
const names = new Set(await listManagedSkillNames(targets.sourceDir));
|
||||
const roots = [targets.agentsDir, targets.claudeDir, targets.codexDir];
|
||||
const roots = skillRoots(targets);
|
||||
return entries.every((entry) => {
|
||||
const rootIndex = roots.findIndex((root) => path.dirname(entry.livePath) === root);
|
||||
if (rootIndex === -1) return false;
|
||||
@@ -409,6 +424,10 @@ async function restore(
|
||||
continue;
|
||||
}
|
||||
const liveInfo = await lstat(entry.livePath).catch(() => null);
|
||||
// An add entry with no backup and no readable live path wrote nothing here
|
||||
// (absent, under a file, or under an unreadable parent). Skipping avoids
|
||||
// failing rollback with ENOTDIR/EACCES and leaving a stuck transaction.
|
||||
if (liveInfo === null && backup === null) continue;
|
||||
if (liveInfo !== null && !(await isDirectory(entry.livePath))) {
|
||||
// Add/update rollback has the same conflict state as delete rollback. A
|
||||
// recreated file or file symlink belongs to the external writer; preserve
|
||||
@@ -441,11 +460,7 @@ async function restore(
|
||||
}
|
||||
|
||||
function transactionParents(targets: SkillTargets): string[] {
|
||||
return [
|
||||
...new Set(
|
||||
[targets.agentsDir, targets.claudeDir, targets.codexDir].map((root) => path.dirname(root)),
|
||||
),
|
||||
];
|
||||
return [...new Set(skillRoots(targets).map((root) => path.dirname(root)))];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -493,7 +508,7 @@ export async function beginSkillsTransaction(
|
||||
nextSelection: SkillSelection,
|
||||
ops: readonly SkillOp[],
|
||||
): Promise<SkillsTransaction> {
|
||||
const roots = [targets.agentsDir, targets.claudeDir, targets.codexDir];
|
||||
const roots = skillRoots(targets);
|
||||
const seenRoots = new Set<string>();
|
||||
const uniqueRoots: Array<{ root: string; rootIndex: number }> = [];
|
||||
for (const [rootIndex, root] of roots.entries()) {
|
||||
|
||||
@@ -6661,3 +6661,77 @@ test("does not publish internal agents' background work to subscribed clients",
|
||||
await new Promise<void>((resolve) => setImmediate(resolve));
|
||||
expect(messages.some((message) => message.type === "agent.background_work.update")).toBe(false);
|
||||
});
|
||||
|
||||
test("deduplicates repeated command names in list_commands_response for live agents and drafts", async () => {
|
||||
const duplicateCommands = [
|
||||
{
|
||||
name: "goal",
|
||||
description: "Run until goal is finished",
|
||||
argumentHint: "",
|
||||
kind: "command" as const,
|
||||
},
|
||||
{
|
||||
name: "plan",
|
||||
description: "Plan carefully before executing a task.",
|
||||
argumentHint: "",
|
||||
kind: "command" as const,
|
||||
},
|
||||
{
|
||||
name: "plan",
|
||||
description: "Local plan skill description",
|
||||
argumentHint: "",
|
||||
kind: "skill" as const,
|
||||
},
|
||||
];
|
||||
const expected = [duplicateCommands[0], duplicateCommands[1]];
|
||||
|
||||
const liveMessages: SessionOutboundMessage[] = [];
|
||||
const liveSession = createSessionForTest({
|
||||
messages: liveMessages,
|
||||
agentManager: {
|
||||
waitForAgentClose: async () => undefined,
|
||||
getAgent: () =>
|
||||
({
|
||||
id: "agent-1",
|
||||
session: { listCommands: async () => duplicateCommands },
|
||||
}) as never,
|
||||
},
|
||||
});
|
||||
await liveSession.handleMessage({
|
||||
type: "list_commands_request",
|
||||
agentId: "agent-1",
|
||||
requestId: "req-live",
|
||||
});
|
||||
expect(findByType(liveMessages, "list_commands_response")).toMatchObject({
|
||||
payload: {
|
||||
agentId: "agent-1",
|
||||
requestId: "req-live",
|
||||
error: null,
|
||||
commands: expected,
|
||||
},
|
||||
});
|
||||
|
||||
const draftMessages: SessionOutboundMessage[] = [];
|
||||
const draftSession = createSessionForTest({
|
||||
messages: draftMessages,
|
||||
agentManager: {
|
||||
getAgent: () => undefined,
|
||||
listDraftCommands: async () => duplicateCommands,
|
||||
},
|
||||
agentStorage: { get: async () => null },
|
||||
});
|
||||
await draftSession.handleMessage({
|
||||
type: "list_commands_request",
|
||||
agentId: "draft-1",
|
||||
requestId: "req-draft",
|
||||
draftConfig: { provider: "antigravity", cwd: "/tmp/repo" },
|
||||
});
|
||||
expect(findByType(draftMessages, "list_commands_response")).toMatchObject({
|
||||
payload: {
|
||||
agentId: "draft-1",
|
||||
requestId: "req-draft",
|
||||
error: null,
|
||||
commands: expected,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5603,7 +5603,7 @@ export class Session {
|
||||
: null;
|
||||
|
||||
if (agent?.session?.listCommands) {
|
||||
const commands = await agent.session.listCommands();
|
||||
const commands = dedupeSlashCommands(await agent.session.listCommands());
|
||||
this.emit({
|
||||
type: "list_commands_response",
|
||||
payload: {
|
||||
@@ -5627,7 +5627,9 @@ export class Session {
|
||||
: {}),
|
||||
};
|
||||
|
||||
const commands = await this.agentManager.listDraftCommands(sessionConfig);
|
||||
const commands = dedupeSlashCommands(
|
||||
await this.agentManager.listDraftCommands(sessionConfig),
|
||||
);
|
||||
this.emit({
|
||||
type: "list_commands_response",
|
||||
payload: {
|
||||
@@ -9614,3 +9616,14 @@ function createHostSession(options: SessionOptions, session: Session): Connected
|
||||
function hostSource(options: SessionOptions): string {
|
||||
return options.sourceId ?? "owner";
|
||||
}
|
||||
|
||||
function dedupeSlashCommands<T extends { name: string }>(commands: readonly T[]): T[] {
|
||||
const seen = new Set<string>();
|
||||
const unique: T[] = [];
|
||||
for (const command of commands) {
|
||||
if (seen.has(command.name)) continue;
|
||||
seen.add(command.name);
|
||||
unique.push(command);
|
||||
}
|
||||
return unique;
|
||||
}
|
||||
|
||||
@@ -422,6 +422,8 @@ interface WorkspaceGitServiceDependencies {
|
||||
* fakes. Any forge not listed here is built (and cached once) by the registry.
|
||||
*/
|
||||
forgeOverrides?: Record<string, ForgeService>;
|
||||
/** Shared forge resolver when callers share adapter instances with other services. */
|
||||
forgeResolver?: ForgeResolver;
|
||||
/** Resolves an SSH config alias to its HostName; defaults to `ssh -G`. */
|
||||
resolveSshHostname?: SshHostnameResolver;
|
||||
resolveAbsoluteGitDir: (cwd: string) => Promise<string | null>;
|
||||
@@ -723,10 +725,12 @@ export class WorkspaceGitServiceImpl implements WorkspaceGitService {
|
||||
this.fileObserver.subscribe.bind(this.fileObserver),
|
||||
options.deps,
|
||||
);
|
||||
this.forgeResolver = createForgeResolver({
|
||||
createService: (forge) => this.deps.forgeOverrides?.[forge] ?? createForgeService(forge),
|
||||
resolveSshHostname: this.deps.resolveSshHostname,
|
||||
});
|
||||
this.forgeResolver =
|
||||
this.deps.forgeResolver ??
|
||||
createForgeResolver({
|
||||
createService: (forge) => this.deps.forgeOverrides?.[forge] ?? createForgeService(forge),
|
||||
resolveSshHostname: this.deps.resolveSshHostname,
|
||||
});
|
||||
}
|
||||
|
||||
resolveForge(cwd: string): Promise<ForgeResolution | null> {
|
||||
|
||||
@@ -0,0 +1,230 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import type { ChangeRequestSnapshot } from "./change-request-source.js";
|
||||
import {
|
||||
ChangeRequestRateLimitError,
|
||||
createPerHostChangeRequestPoller,
|
||||
parseCliHttpResponse,
|
||||
parseRetryAfterMs,
|
||||
} from "./change-request-poller.js";
|
||||
|
||||
const sampleSnapshot: ChangeRequestSnapshot = {
|
||||
state: "open",
|
||||
headSha: "abc123",
|
||||
checksState: "passed",
|
||||
checks: [],
|
||||
reviewDecision: null,
|
||||
activity: [],
|
||||
};
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
describe("parseCliHttpResponse", () => {
|
||||
it("parses status line, mixed line endings, redirect blocks, and JSON body", () => {
|
||||
const raw = [
|
||||
"HTTP/1.1 100 Continue\r\n\r\n",
|
||||
"HTTP/2.0 200 OK\n",
|
||||
"Content-Type: application/json\r\n",
|
||||
"X-Next-Page: 2\r\n",
|
||||
"Ratelimit-Remaining: 95\r\n",
|
||||
"Ratelimit-Reset: 1700000120\r\n",
|
||||
"\r\n",
|
||||
'{"ok":true}',
|
||||
].join("");
|
||||
const parsed = parseCliHttpResponse(raw);
|
||||
expect(parsed.status).toBe(200);
|
||||
expect(parsed.headers.get("x-next-page")).toBe("2");
|
||||
expect(parsed.headers.get("ratelimit-remaining")).toBe("95");
|
||||
expect(parsed.body).toBe('{"ok":true}');
|
||||
});
|
||||
|
||||
it("returns null status and raw body when headers are absent", () => {
|
||||
const parsed = parseCliHttpResponse('{"ok":true}');
|
||||
expect(parsed.status).toBeNull();
|
||||
expect(parsed.headers.size).toBe(0);
|
||||
expect(parsed.body).toBe('{"ok":true}');
|
||||
});
|
||||
});
|
||||
|
||||
describe("parseRetryAfterMs", () => {
|
||||
it("parses Retry-After seconds and exhausted Ratelimit-Reset headers", () => {
|
||||
const now = 1_700_000_000_000;
|
||||
expect(parseRetryAfterMs(new Map([["retry-after", "45"]]), now)).toBe(now + 45_000);
|
||||
expect(
|
||||
parseRetryAfterMs(
|
||||
new Map([
|
||||
["ratelimit-remaining", "0"],
|
||||
["ratelimit-reset", "1700000060"],
|
||||
]),
|
||||
now,
|
||||
),
|
||||
).toBe(1_700_000_060_000);
|
||||
expect(
|
||||
parseRetryAfterMs(
|
||||
new Map([
|
||||
["ratelimit-remaining", "50"],
|
||||
["ratelimit-reset", "1700000060"],
|
||||
]),
|
||||
now,
|
||||
),
|
||||
).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe("createPerHostChangeRequestPoller", () => {
|
||||
it("bounds concurrent reads per host and drains waiting watches as slots free", async () => {
|
||||
vi.useFakeTimers();
|
||||
let active = 0;
|
||||
let maxActive = 0;
|
||||
const resolvers = new Map<string, () => void>();
|
||||
const poller = createPerHostChangeRequestPoller({
|
||||
hostOf: (url) => new URL(url).hostname,
|
||||
maxConcurrencyPerHost: 2,
|
||||
pollIntervalMs: 20_000,
|
||||
async read({ url }) {
|
||||
active += 1;
|
||||
maxActive = Math.max(maxActive, active);
|
||||
await new Promise<void>((resolve) => {
|
||||
resolvers.set(url, resolve);
|
||||
});
|
||||
active -= 1;
|
||||
return sampleSnapshot;
|
||||
},
|
||||
});
|
||||
const received: string[] = [];
|
||||
try {
|
||||
for (const n of [1, 2, 3]) {
|
||||
const url = `https://gitlab.com/org/repo/-/merge_requests/${n}`;
|
||||
poller.observe(url, {
|
||||
async snapshot() {
|
||||
received.push(url);
|
||||
},
|
||||
error(error) {
|
||||
throw error;
|
||||
},
|
||||
});
|
||||
}
|
||||
await vi.advanceTimersByTimeAsync(25);
|
||||
expect(maxActive).toBe(2);
|
||||
expect(resolvers.size).toBe(2);
|
||||
|
||||
resolvers.get("https://gitlab.com/org/repo/-/merge_requests/1")?.();
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(maxActive).toBe(2);
|
||||
expect(resolvers.has("https://gitlab.com/org/repo/-/merge_requests/3")).toBe(true);
|
||||
|
||||
resolvers.get("https://gitlab.com/org/repo/-/merge_requests/2")?.();
|
||||
resolvers.get("https://gitlab.com/org/repo/-/merge_requests/3")?.();
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(received).toHaveLength(3);
|
||||
} finally {
|
||||
poller.dispose();
|
||||
}
|
||||
});
|
||||
|
||||
it("backs off exponentially on transient errors and resets after a successful poll", async () => {
|
||||
vi.useFakeTimers();
|
||||
let calls = 0;
|
||||
let shouldFail = true;
|
||||
const poller = createPerHostChangeRequestPoller({
|
||||
hostOf: (url) => new URL(url).hostname,
|
||||
pollIntervalMs: 10_000,
|
||||
maxErrorBackoffMs: 40_000,
|
||||
async read() {
|
||||
calls += 1;
|
||||
if (shouldFail) throw new Error(`fail ${calls}`);
|
||||
return sampleSnapshot;
|
||||
},
|
||||
});
|
||||
const errors: unknown[] = [];
|
||||
const snapshots: ChangeRequestSnapshot[] = [];
|
||||
try {
|
||||
poller.observe("https://gitlab.com/org/repo/-/merge_requests/1", {
|
||||
async snapshot(s) {
|
||||
snapshots.push(s);
|
||||
},
|
||||
error(err) {
|
||||
errors.push(err);
|
||||
},
|
||||
});
|
||||
await vi.advanceTimersByTimeAsync(25);
|
||||
expect(calls).toBe(1);
|
||||
expect(errors).toHaveLength(1);
|
||||
|
||||
// 1st failure -> 10s backoff
|
||||
await vi.advanceTimersByTimeAsync(9_999);
|
||||
expect(calls).toBe(1);
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
expect(calls).toBe(2);
|
||||
|
||||
// 2nd failure -> 20s backoff
|
||||
await vi.advanceTimersByTimeAsync(19_999);
|
||||
expect(calls).toBe(2);
|
||||
shouldFail = false;
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
expect(calls).toBe(3);
|
||||
expect(snapshots).toHaveLength(1);
|
||||
|
||||
// Reset to 10s base interval after success
|
||||
await vi.advanceTimersByTimeAsync(10_000);
|
||||
expect(calls).toBe(4);
|
||||
} finally {
|
||||
poller.dispose();
|
||||
}
|
||||
});
|
||||
|
||||
it("pauses all watches on a rate-limited host until resetAt and fast-fails new observers", async () => {
|
||||
vi.useFakeTimers();
|
||||
vi.setSystemTime(1_700_000_000_000);
|
||||
let calls = 0;
|
||||
const poller = createPerHostChangeRequestPoller({
|
||||
hostOf: (url) => new URL(url).hostname,
|
||||
pollIntervalMs: 10_000,
|
||||
async read() {
|
||||
calls += 1;
|
||||
if (calls === 1) {
|
||||
throw new ChangeRequestRateLimitError({
|
||||
host: "gitlab.com",
|
||||
resetAtMs: Date.now() + 60_000,
|
||||
});
|
||||
}
|
||||
return sampleSnapshot;
|
||||
},
|
||||
});
|
||||
const errors1: unknown[] = [];
|
||||
const errors2: unknown[] = [];
|
||||
const snapshots2: ChangeRequestSnapshot[] = [];
|
||||
try {
|
||||
poller.observe("https://gitlab.com/org/repo/-/merge_requests/1", {
|
||||
async snapshot() {},
|
||||
error(err) {
|
||||
errors1.push(err);
|
||||
},
|
||||
});
|
||||
await vi.advanceTimersByTimeAsync(25);
|
||||
expect(calls).toBe(1);
|
||||
expect(errors1[0]).toBeInstanceOf(ChangeRequestRateLimitError);
|
||||
|
||||
poller.observe("https://gitlab.com/org/repo/-/merge_requests/2", {
|
||||
async snapshot(s) {
|
||||
snapshots2.push(s);
|
||||
},
|
||||
error(err) {
|
||||
errors2.push(err);
|
||||
},
|
||||
});
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(errors2[0]).toBeInstanceOf(ChangeRequestRateLimitError);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(59_999);
|
||||
expect(calls).toBe(1);
|
||||
|
||||
await vi.advanceTimersByTimeAsync(1);
|
||||
expect(calls).toBe(3);
|
||||
expect(snapshots2).toHaveLength(1);
|
||||
} finally {
|
||||
poller.dispose();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,362 @@
|
||||
import type { ChangeRequestSnapshot, ChangeRequestSource } from "./change-request-source.js";
|
||||
|
||||
const DEFAULT_INITIAL_DELAY_MS = 25;
|
||||
const DEFAULT_POLL_INTERVAL_MS = 20_000;
|
||||
const DEFAULT_MAX_ERROR_BACKOFF_MS = 300_000;
|
||||
const DEFAULT_MAX_CONCURRENCY_PER_HOST = 2;
|
||||
const MIN_RATE_LIMIT_PAUSE_MS = 1_000;
|
||||
const MAX_RATE_LIMIT_PAUSE_MS = 15 * 60_000;
|
||||
|
||||
export interface ParsedCliHttpResponse {
|
||||
status: number | null;
|
||||
headers: Map<string, string>;
|
||||
body: string;
|
||||
}
|
||||
|
||||
const HTTP_STATUS_PREFIX = /^HTTP\/\d(?:\.\d)?\s+(\d{3})[^\r\n]*\r?\n/;
|
||||
const HEADER_BODY_SEPARATOR = /\r?\n\r?\n/;
|
||||
|
||||
/**
|
||||
* Parse output from CLI API commands invoked with `-i` / `--include`.
|
||||
* Consumes multiple leading HTTP response blocks (e.g. `100 Continue` or
|
||||
* redirect headers) and returns the final status code, lowercased headers,
|
||||
* and response body. Returns `status: null` when no HTTP header block is
|
||||
* present.
|
||||
*/
|
||||
export function parseCliHttpResponse(raw: string): ParsedCliHttpResponse {
|
||||
let remaining = raw.trimStart();
|
||||
let status: number | null = null;
|
||||
let headers = new Map<string, string>();
|
||||
|
||||
while (true) {
|
||||
const statusMatch = HTTP_STATUS_PREFIX.exec(remaining);
|
||||
if (!statusMatch) {
|
||||
break;
|
||||
}
|
||||
const separatorMatch = HEADER_BODY_SEPARATOR.exec(remaining);
|
||||
if (!separatorMatch) {
|
||||
status = Number(statusMatch[1]);
|
||||
headers = parseHeaderLines(remaining.slice(statusMatch[0].length));
|
||||
remaining = "";
|
||||
break;
|
||||
}
|
||||
status = Number(statusMatch[1]);
|
||||
const headerBlock = remaining.slice(statusMatch[0].length, separatorMatch.index);
|
||||
headers = parseHeaderLines(headerBlock);
|
||||
remaining = remaining.slice(separatorMatch.index + separatorMatch[0].length);
|
||||
}
|
||||
|
||||
return { status, headers, body: remaining.trim() };
|
||||
}
|
||||
|
||||
function parseHeaderLines(block: string): Map<string, string> {
|
||||
const headers = new Map<string, string>();
|
||||
for (const line of block.split(/\r?\n/)) {
|
||||
const colon = line.indexOf(":");
|
||||
if (colon <= 0) continue;
|
||||
const name = line.slice(0, colon).trim().toLowerCase();
|
||||
const value = line.slice(colon + 1).trim();
|
||||
if (!name) continue;
|
||||
const existing = headers.get(name);
|
||||
headers.set(name, existing ? `${existing}, ${value}` : value);
|
||||
}
|
||||
return headers;
|
||||
}
|
||||
|
||||
function clampPauseUntil(targetMs: number, nowMs: number): number {
|
||||
return Math.min(
|
||||
Math.max(targetMs, nowMs + MIN_RATE_LIMIT_PAUSE_MS),
|
||||
nowMs + MAX_RATE_LIMIT_PAUSE_MS,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract the timestamp (epoch ms) until which a host should pause polling
|
||||
* based on `Retry-After` or exhausted `Ratelimit-Remaining` / `Ratelimit-Reset`
|
||||
* headers. Returns null when no pause is signaled.
|
||||
*/
|
||||
export function parseRetryAfterMs(
|
||||
headers: ReadonlyMap<string, string>,
|
||||
nowMs: number,
|
||||
options: { forceOnMissing?: boolean; defaultPauseMs?: number } = {},
|
||||
): number | null {
|
||||
const retryAfter = headers.get("retry-after");
|
||||
if (retryAfter) {
|
||||
const seconds = Number(retryAfter);
|
||||
if (Number.isFinite(seconds) && seconds >= 0) {
|
||||
return clampPauseUntil(nowMs + Math.ceil(seconds * 1_000), nowMs);
|
||||
}
|
||||
const parsedDate = Date.parse(retryAfter);
|
||||
if (Number.isFinite(parsedDate)) {
|
||||
return clampPauseUntil(parsedDate, nowMs);
|
||||
}
|
||||
}
|
||||
|
||||
const remainingRaw = headers.get("ratelimit-remaining") ?? headers.get("x-ratelimit-remaining");
|
||||
const resetRaw = headers.get("ratelimit-reset") ?? headers.get("x-ratelimit-reset");
|
||||
const remaining = remainingRaw !== undefined ? Number(remainingRaw) : Number.NaN;
|
||||
const resetSec = resetRaw !== undefined ? Number(resetRaw) : Number.NaN;
|
||||
if (
|
||||
(options.forceOnMissing || (Number.isFinite(remaining) && remaining <= 1)) &&
|
||||
Number.isFinite(resetSec) &&
|
||||
resetSec > 0
|
||||
) {
|
||||
return clampPauseUntil(resetSec * 1_000, nowMs);
|
||||
}
|
||||
|
||||
if (options.forceOnMissing) {
|
||||
return clampPauseUntil(nowMs + (options.defaultPauseMs ?? 60_000), nowMs);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export class ChangeRequestRateLimitError extends Error {
|
||||
readonly host: string;
|
||||
readonly resetAtMs: number;
|
||||
|
||||
constructor(params: { host: string; resetAtMs: number; message?: string }) {
|
||||
super(
|
||||
params.message ??
|
||||
`Change request polling for ${params.host} is rate-limited until ${new Date(params.resetAtMs).toISOString()}`,
|
||||
);
|
||||
this.name = "ChangeRequestRateLimitError";
|
||||
this.host = params.host;
|
||||
this.resetAtMs = params.resetAtMs;
|
||||
}
|
||||
}
|
||||
|
||||
export interface PerHostReadContext {
|
||||
url: string;
|
||||
host: string;
|
||||
knownActivity(): ReadonlySet<string> | undefined;
|
||||
isObserved(): boolean;
|
||||
assertHostAvailable(): void;
|
||||
deferPollsUntil(untilMs: number): void;
|
||||
pauseHost(untilMs: number): void;
|
||||
}
|
||||
|
||||
export interface PerHostChangeRequestPollerOptions {
|
||||
hostOf(url: string): string;
|
||||
read(context: PerHostReadContext): Promise<ChangeRequestSnapshot>;
|
||||
now?: () => number;
|
||||
initialDelayMs?: number;
|
||||
pollIntervalMs?: number;
|
||||
maxErrorBackoffMs?: number;
|
||||
maxConcurrencyPerHost?: number;
|
||||
onError?(error: unknown, host: string): void;
|
||||
}
|
||||
|
||||
interface WatchedEntry {
|
||||
url: string;
|
||||
host: string;
|
||||
callbacks: Parameters<ChangeRequestSource["observe"]>[1];
|
||||
nextDueAt: number;
|
||||
consecutiveErrors: number;
|
||||
inFlight: boolean;
|
||||
}
|
||||
|
||||
export interface PerHostChangeRequestPoller {
|
||||
observe: ChangeRequestSource["observe"];
|
||||
dispose(): void;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bounded per-host polling loop shared by REST-backed forge watch adapters.
|
||||
* Limits concurrent reads per host, applies exponential backoff on transient
|
||||
* failures, and pauses all watches for a host when rate-limited.
|
||||
*/
|
||||
export function createPerHostChangeRequestPoller(
|
||||
options: PerHostChangeRequestPollerOptions,
|
||||
): PerHostChangeRequestPoller {
|
||||
const now = options.now ?? Date.now;
|
||||
const initialDelayMs = options.initialDelayMs ?? DEFAULT_INITIAL_DELAY_MS;
|
||||
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
|
||||
const maxErrorBackoffMs = options.maxErrorBackoffMs ?? DEFAULT_MAX_ERROR_BACKOFF_MS;
|
||||
const maxConcurrencyPerHost = options.maxConcurrencyPerHost ?? DEFAULT_MAX_CONCURRENCY_PER_HOST;
|
||||
|
||||
const watches = new Map<string, WatchedEntry>();
|
||||
const inFlightByHost = new Map<string, number>();
|
||||
const pausesByHost = new Map<string, { pollsUntil: number; requestsUntil: number }>();
|
||||
let timer: NodeJS.Timeout | null = null;
|
||||
let disposed = false;
|
||||
|
||||
function clearTimer(): void {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
timer = null;
|
||||
}
|
||||
}
|
||||
|
||||
function deferHost(host: string, untilMs: number, blockRequests: boolean): void {
|
||||
const current = pausesByHost.get(host) ?? { pollsUntil: 0, requestsUntil: 0 };
|
||||
pausesByHost.set(host, {
|
||||
pollsUntil: Math.max(current.pollsUntil, untilMs),
|
||||
requestsUntil: blockRequests
|
||||
? Math.max(current.requestsUntil, untilMs)
|
||||
: current.requestsUntil,
|
||||
});
|
||||
}
|
||||
|
||||
function hostPauseUntil(host: string, nowMs: number): number {
|
||||
const pause = pausesByHost.get(host);
|
||||
if (!pause) return 0;
|
||||
if (pause.pollsUntil > nowMs) return pause.pollsUntil;
|
||||
if (!pause.requestsUntil) pausesByHost.delete(host);
|
||||
return 0;
|
||||
}
|
||||
|
||||
function pollLimit(host: string): number {
|
||||
// After a 429, admit one poll until it has delivered a full snapshot.
|
||||
// This lets it use the reset quota without competing with another poll.
|
||||
return pausesByHost.get(host)?.requestsUntil ? 1 : maxConcurrencyPerHost;
|
||||
}
|
||||
|
||||
function armTimer(): void {
|
||||
clearTimer();
|
||||
if (disposed || watches.size === 0) return;
|
||||
|
||||
const nowMs = now();
|
||||
let earliestDue = Number.POSITIVE_INFINITY;
|
||||
for (const watch of watches.values()) {
|
||||
if (watch.inFlight) continue;
|
||||
if ((inFlightByHost.get(watch.host) ?? 0) >= pollLimit(watch.host)) continue;
|
||||
const dueAt = Math.max(watch.nextDueAt, hostPauseUntil(watch.host, nowMs));
|
||||
if (dueAt < earliestDue) {
|
||||
earliestDue = dueAt;
|
||||
}
|
||||
}
|
||||
if (!Number.isFinite(earliestDue)) return;
|
||||
|
||||
const delay = Math.max(0, earliestDue - nowMs);
|
||||
timer = setTimeout(() => {
|
||||
timer = null;
|
||||
drainDueWatches();
|
||||
}, delay);
|
||||
timer.unref();
|
||||
}
|
||||
|
||||
function drainDueWatches(): void {
|
||||
if (disposed) return;
|
||||
const nowMs = now();
|
||||
for (const watch of watches.values()) {
|
||||
if (watch.inFlight) continue;
|
||||
const inFlightCount = inFlightByHost.get(watch.host) ?? 0;
|
||||
if (inFlightCount >= pollLimit(watch.host)) continue;
|
||||
const dueAt = Math.max(watch.nextDueAt, hostPauseUntil(watch.host, nowMs));
|
||||
if (dueAt > nowMs) continue;
|
||||
startPoll(watch);
|
||||
}
|
||||
armTimer();
|
||||
}
|
||||
|
||||
function startPoll(watch: WatchedEntry): void {
|
||||
watch.inFlight = true;
|
||||
inFlightByHost.set(watch.host, (inFlightByHost.get(watch.host) ?? 0) + 1);
|
||||
const isObserved = () => !disposed && watches.get(watch.url) === watch;
|
||||
const recovering = Boolean(pausesByHost.get(watch.host)?.requestsUntil);
|
||||
let completed = false;
|
||||
|
||||
void (async () => {
|
||||
try {
|
||||
const snapshot = await options.read({
|
||||
url: watch.url,
|
||||
host: watch.host,
|
||||
knownActivity: () => watch.callbacks.knownActivity?.(),
|
||||
isObserved,
|
||||
assertHostAvailable() {
|
||||
const nowMs = now();
|
||||
const resetAtMs = pausesByHost.get(watch.host)?.requestsUntil ?? 0;
|
||||
if (resetAtMs > nowMs) {
|
||||
throw new ChangeRequestRateLimitError({ host: watch.host, resetAtMs });
|
||||
}
|
||||
},
|
||||
deferPollsUntil: (untilMs) => deferHost(watch.host, untilMs, false),
|
||||
pauseHost: (untilMs) => deferHost(watch.host, untilMs, true),
|
||||
});
|
||||
if (!isObserved()) return;
|
||||
watch.consecutiveErrors = 0;
|
||||
await watch.callbacks.snapshot(snapshot);
|
||||
if (!isObserved()) return;
|
||||
const nowMs = now();
|
||||
const pause = pausesByHost.get(watch.host);
|
||||
if (pause && pause.requestsUntil <= nowMs) pause.requestsUntil = 0;
|
||||
watch.nextDueAt = Math.max(nowMs + pollIntervalMs, hostPauseUntil(watch.host, nowMs));
|
||||
completed = true;
|
||||
} catch (error) {
|
||||
if (!isObserved()) return;
|
||||
options.onError?.(error, watch.host);
|
||||
const nowMs = now();
|
||||
if (error instanceof ChangeRequestRateLimitError) {
|
||||
deferHost(watch.host, error.resetAtMs, true);
|
||||
watch.nextDueAt = Math.max(nowMs + pollIntervalMs, error.resetAtMs);
|
||||
} else {
|
||||
watch.consecutiveErrors += 1;
|
||||
const backoff = Math.min(
|
||||
pollIntervalMs * 2 ** (watch.consecutiveErrors - 1),
|
||||
maxErrorBackoffMs,
|
||||
);
|
||||
watch.nextDueAt = nowMs + backoff;
|
||||
}
|
||||
watch.callbacks.error(error);
|
||||
} finally {
|
||||
// Rotate after a snapshot or a recovery attempt so a watch that
|
||||
// keeps failing cannot take every turn after a quota reset.
|
||||
if ((completed || recovering) && isObserved()) {
|
||||
watches.delete(watch.url);
|
||||
watches.set(watch.url, watch);
|
||||
}
|
||||
watch.inFlight = false;
|
||||
const remaining = (inFlightByHost.get(watch.host) ?? 1) - 1;
|
||||
if (remaining > 0) inFlightByHost.set(watch.host, remaining);
|
||||
else inFlightByHost.delete(watch.host);
|
||||
if (!disposed) {
|
||||
// Immediately admit any queued due watch on this host, then re-arm timer.
|
||||
drainDueWatches();
|
||||
}
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
return {
|
||||
observe(url, callbacks) {
|
||||
if (disposed) {
|
||||
queueMicrotask(() => callbacks.error(new Error("Change request poller is disposed")));
|
||||
return () => {};
|
||||
}
|
||||
const host = options.hostOf(url);
|
||||
const nowMs = now();
|
||||
const watch: WatchedEntry = {
|
||||
url,
|
||||
host,
|
||||
callbacks,
|
||||
nextDueAt: nowMs + initialDelayMs,
|
||||
consecutiveErrors: 0,
|
||||
inFlight: false,
|
||||
};
|
||||
watches.set(url, watch);
|
||||
const pauseUntil = hostPauseUntil(host, nowMs);
|
||||
if (pauseUntil > nowMs) {
|
||||
queueMicrotask(() => {
|
||||
if (!disposed && watches.get(url) === watch) {
|
||||
callbacks.error(new ChangeRequestRateLimitError({ host, resetAtMs: pauseUntil }));
|
||||
}
|
||||
});
|
||||
}
|
||||
armTimer();
|
||||
return () => {
|
||||
if (watches.get(url) === watch) {
|
||||
watches.delete(url);
|
||||
armTimer();
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
dispose() {
|
||||
disposed = true;
|
||||
clearTimer();
|
||||
watches.clear();
|
||||
inFlightByHost.clear();
|
||||
pausesByHost.clear();
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { createChangeRequestRouter } from "./change-request-router.js";
|
||||
import type { ChangeRequestSource } from "./change-request-source.js";
|
||||
import { createForgeResolver } from "./forge-resolver.js";
|
||||
import type { ForgeService } from "./forge-service.js";
|
||||
|
||||
function createFakeSource(
|
||||
forge: string,
|
||||
canonicalize: (url: string) => string,
|
||||
): ChangeRequestSource {
|
||||
return {
|
||||
resolve: canonicalize,
|
||||
describe: (url) => `${forge}:${url}`,
|
||||
observe: () => () => {},
|
||||
};
|
||||
}
|
||||
|
||||
function createFakeForgeService(changeRequests?: ChangeRequestSource): ForgeService {
|
||||
return {
|
||||
...(changeRequests ? { changeRequests } : {}),
|
||||
invalidate() {},
|
||||
} as unknown as ForgeService;
|
||||
}
|
||||
|
||||
describe("createChangeRequestRouter", () => {
|
||||
it("routes cloud hosts without probing and delegates canonicalization to the matched forge", async () => {
|
||||
const probeForge = vi.fn(async () => {
|
||||
throw new Error("cloud host must not trigger a probe");
|
||||
});
|
||||
const githubSource = createFakeSource(
|
||||
"github",
|
||||
(url) => `https://github.com/canonical/${new URL(url).pathname.split("/").at(-1)}`,
|
||||
);
|
||||
const gitlabSource = createFakeSource(
|
||||
"gitlab",
|
||||
(url) => `https://gitlab.com/canonical/${new URL(url).pathname.split("/").at(-1)}`,
|
||||
);
|
||||
const resolver = createForgeResolver({
|
||||
probeForge,
|
||||
createService: (forge) => {
|
||||
if (forge === "github") return createFakeForgeService(githubSource);
|
||||
if (forge === "gitlab") return createFakeForgeService(gitlabSource);
|
||||
return null;
|
||||
},
|
||||
});
|
||||
const router = createChangeRequestRouter({ forgeResolver: resolver });
|
||||
|
||||
await expect(router.resolve("https://GitHub.com/Org/Repo/pull/7")).resolves.toEqual({
|
||||
forge: "github",
|
||||
url: "https://github.com/canonical/7",
|
||||
});
|
||||
await expect(
|
||||
router.resolve("https://gitlab.com/org/sub/repo/-/merge_requests/12"),
|
||||
).resolves.toEqual({
|
||||
forge: "gitlab",
|
||||
url: "https://gitlab.com/canonical/12",
|
||||
});
|
||||
expect(probeForge).not.toHaveBeenCalled();
|
||||
expect(router.source("github")).toBe(githubSource);
|
||||
expect(router.source("gitlab")).toBe(gitlabSource);
|
||||
});
|
||||
|
||||
it("probes self-hosted hosts before parsing the URL path", async () => {
|
||||
const probeForge = vi.fn(async (host: string) =>
|
||||
host === "git.corp.internal" ? "gitlab" : null,
|
||||
);
|
||||
const gitlabResolve = vi.fn(() => "https://git.corp.internal/team/app/-/merge_requests/9");
|
||||
const githubResolve = vi.fn(() => {
|
||||
throw new Error("github must not parse a gitlab host");
|
||||
});
|
||||
const resolver = createForgeResolver({
|
||||
probeForge,
|
||||
createService: (forge) => {
|
||||
if (forge === "github")
|
||||
return createFakeForgeService(createFakeSource("github", githubResolve));
|
||||
if (forge === "gitlab")
|
||||
return createFakeForgeService(createFakeSource("gitlab", gitlabResolve));
|
||||
return null;
|
||||
},
|
||||
});
|
||||
const router = createChangeRequestRouter({ forgeResolver: resolver });
|
||||
|
||||
await expect(
|
||||
router.resolve("https://git.corp.internal/team/app/-/merge_requests/9"),
|
||||
).resolves.toEqual({
|
||||
forge: "gitlab",
|
||||
url: "https://git.corp.internal/team/app/-/merge_requests/9",
|
||||
});
|
||||
expect(probeForge).toHaveBeenCalledWith("git.corp.internal");
|
||||
expect(gitlabResolve).toHaveBeenCalledTimes(1);
|
||||
expect(githubResolve).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rejects unrecognized hosts, credentials, non-http schemes, and forges without watch support", async () => {
|
||||
const resolver = createForgeResolver({
|
||||
probeForge: async () => null,
|
||||
createService: (forge) => {
|
||||
if (forge === "gitea") return createFakeForgeService();
|
||||
return null;
|
||||
},
|
||||
});
|
||||
const router = createChangeRequestRouter({ forgeResolver: resolver });
|
||||
|
||||
await expect(router.resolve("not a url")).rejects.toThrow(/change request URL/i);
|
||||
await expect(router.resolve("ftp://github.com/org/repo/pull/1")).rejects.toThrow(
|
||||
/change request URL/i,
|
||||
);
|
||||
await expect(router.resolve("https://user:pass@github.com/org/repo/pull/1")).rejects.toThrow(
|
||||
/change request URL/i,
|
||||
);
|
||||
await expect(router.resolve("https://unknown.example.com/org/repo/pull/1")).rejects.toThrow(
|
||||
/unknown\.example\.com/,
|
||||
);
|
||||
await expect(router.resolve("https://gitea.com/org/repo/pulls/1")).rejects.toThrow(
|
||||
/not supported.*gitea/i,
|
||||
);
|
||||
expect(router.source("gitea")).toBeNull();
|
||||
expect(router.source("unknown")).toBeNull();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,80 @@
|
||||
import { normalizeHost } from "@getpaseo/protocol/git-remote";
|
||||
import type { ChangeRequestSource } from "./change-request-source.js";
|
||||
import type { ForgeResolver } from "./forge-resolver.js";
|
||||
|
||||
export interface ResolvedChangeRequest {
|
||||
forge: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
export interface ChangeRequestRouter {
|
||||
/** Route a user-supplied URL host-first through registered forges and canonicalize it. */
|
||||
resolve(url: string): Promise<ResolvedChangeRequest>;
|
||||
/** Return the watch source for a known forge id without probing the network. */
|
||||
source(forge: string): ChangeRequestSource | null;
|
||||
}
|
||||
|
||||
export interface CreateChangeRequestRouterOptions {
|
||||
forgeResolver: Pick<ForgeResolver, "resolveHost" | "getService">;
|
||||
}
|
||||
|
||||
function extractUrlHost(input: string): { trimmed: string; host: string; authority: string } {
|
||||
const trimmed = input.trim();
|
||||
if (!trimmed || /\s/.test(trimmed)) {
|
||||
throw new Error("Enter a supported change request URL.");
|
||||
}
|
||||
let parsed: URL;
|
||||
try {
|
||||
parsed = new URL(trimmed);
|
||||
} catch {
|
||||
throw new Error("Enter a supported change request URL.");
|
||||
}
|
||||
if (
|
||||
(parsed.protocol !== "https:" && parsed.protocol !== "http:") ||
|
||||
parsed.username ||
|
||||
parsed.password
|
||||
) {
|
||||
throw new Error("Enter a supported change request URL.");
|
||||
}
|
||||
const host = normalizeHost(parsed.hostname);
|
||||
if (!host) {
|
||||
throw new Error("Enter a supported change request URL.");
|
||||
}
|
||||
return { trimmed, host, authority: parsed.port ? `${host}:${parsed.port}` : host };
|
||||
}
|
||||
|
||||
/**
|
||||
* Host-first router for change request watches. Resolves the target forge from
|
||||
* the URL host via ForgeResolver (cloud match first, then cached CLI auth
|
||||
* probe) before delegating path parsing and canonicalization to that forge's
|
||||
* ChangeRequestSource.
|
||||
*/
|
||||
export function createChangeRequestRouter({
|
||||
forgeResolver,
|
||||
}: CreateChangeRequestRouterOptions): ChangeRequestRouter {
|
||||
return {
|
||||
async resolve(input: string): Promise<ResolvedChangeRequest> {
|
||||
const { trimmed, host, authority } = extractUrlHost(input);
|
||||
const resolution =
|
||||
(await forgeResolver.resolveHost(authority)) ??
|
||||
(authority === host ? null : await forgeResolver.resolveHost(host));
|
||||
if (!resolution) {
|
||||
throw new Error(
|
||||
`Could not recognize a supported forge for host ${host}. Authenticate the forge CLI for this host first.`,
|
||||
);
|
||||
}
|
||||
const source = resolution.service.changeRequests;
|
||||
if (!source) {
|
||||
throw new Error(`Change request watches are not supported for ${resolution.forge} yet.`);
|
||||
}
|
||||
return {
|
||||
forge: resolution.forge,
|
||||
url: source.resolve(trimmed),
|
||||
};
|
||||
},
|
||||
|
||||
source(forge: string): ChangeRequestSource | null {
|
||||
return forgeResolver.getService(forge)?.changeRequests ?? null;
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -17,8 +17,9 @@ const changeRequestSnapshotSchema = changeRequestStatusSchema.extend({
|
||||
activity: z.array(
|
||||
z.object({
|
||||
id: z.string(),
|
||||
kind: z.enum(["comment", "inline comment", "review"]),
|
||||
kind: z.enum(["comment", "inline comment", "review", "approval"]),
|
||||
url: z.string(),
|
||||
message: z.string().optional(),
|
||||
}),
|
||||
),
|
||||
});
|
||||
|
||||
@@ -373,4 +373,40 @@ describe("createForgeResolver", () => {
|
||||
expect(b).toMatchObject({ forge: "gitlab", host: "git.acme.internal" });
|
||||
expect(probeForge).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("resolves cloud and probed hosts directly via resolveHost and shares service instances", async () => {
|
||||
const probeForge = vi.fn(async (host: string) =>
|
||||
host === "git.acme.internal" ? "gitlab" : null,
|
||||
);
|
||||
const created: string[] = [];
|
||||
const disposed: string[] = [];
|
||||
const resolver = createForgeResolver({
|
||||
probeForge,
|
||||
createService: (forge) => {
|
||||
created.push(forge);
|
||||
const base = createForgeService(forge);
|
||||
if (!base) return null;
|
||||
return {
|
||||
...base,
|
||||
dispose: () => {
|
||||
disposed.push(forge);
|
||||
},
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
const cloud = await resolver.resolveHost("GitLab.com.");
|
||||
expect(cloud).toMatchObject({ forge: "gitlab", host: "gitlab.com" });
|
||||
expect(probeForge).not.toHaveBeenCalled();
|
||||
|
||||
const selfHosted = await resolver.resolveHost("GIT.ACME.INTERNAL");
|
||||
expect(selfHosted).toMatchObject({ forge: "gitlab", host: "git.acme.internal" });
|
||||
expect(selfHosted?.service).toBe(cloud?.service);
|
||||
expect(probeForge).toHaveBeenCalledTimes(1);
|
||||
expect(resolver.getService("gitlab")).toBe(cloud?.service);
|
||||
expect(created).toEqual(["gitlab"]);
|
||||
|
||||
resolver.dispose();
|
||||
expect(disposed).toEqual(["gitlab"]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
import { LRUCache } from "lru-cache";
|
||||
import { parseGitRemoteLocation, type GitRemoteLocation } from "@getpaseo/protocol/git-remote";
|
||||
import {
|
||||
normalizeHost,
|
||||
parseGitRemoteLocation,
|
||||
type GitRemoteLocation,
|
||||
} from "@getpaseo/protocol/git-remote";
|
||||
import { resolveSshHostname, type SshHostnameResolver } from "../utils/ssh-hostname.js";
|
||||
import { defaultResolveRemoteUrl } from "./forge-cli-command.js";
|
||||
import type { ForgeService } from "./forge-service.js";
|
||||
@@ -24,6 +28,7 @@ export type ForgeHostProbe = (host: string) => Promise<string | null>;
|
||||
export interface CreateForgeResolverOptions {
|
||||
resolveRemoteUrl?: (cwd: string) => Promise<string | null>;
|
||||
createService?: (forge: string) => ForgeService | null;
|
||||
matchHost?: (host: string) => string | null;
|
||||
probeForge?: ForgeHostProbe;
|
||||
resolveSshHostname?: SshHostnameResolver;
|
||||
now?: () => number;
|
||||
@@ -36,12 +41,18 @@ export interface ForgeResolver {
|
||||
resolveFromRemoteUrl(remoteUrl: string | null): ForgeResolution | null;
|
||||
/** Resolve from a known origin remote URL, running the per-host probe when needed. */
|
||||
resolveFromRemoteUrlAsync(remoteUrl: string | null): Promise<ForgeResolution | null>;
|
||||
/** Resolve a forge directly by hostname (cloud match first, then cached async probe). */
|
||||
resolveHost(host: string): Promise<ForgeResolution | null>;
|
||||
/** Return the shared adapter instance for a known forge id without probing the network. */
|
||||
getService(forge: string): ForgeService | null;
|
||||
/**
|
||||
* Invalidate every cached adapter's state for a cwd. Routed through the
|
||||
* resolver so invalidation hits the same adapter instance the poller reads,
|
||||
* regardless of which forge backs the workspace.
|
||||
*/
|
||||
invalidate(cwd: string): void;
|
||||
/** Dispose all instantiated forge adapters owned by this resolver. */
|
||||
dispose(): void;
|
||||
}
|
||||
|
||||
// A positive probe (host IS a known forge) is cached permanently; a negative one
|
||||
@@ -64,6 +75,7 @@ export function forgeForHost(host: string): string | null {
|
||||
export function createForgeResolver(options: CreateForgeResolverOptions = {}): ForgeResolver {
|
||||
const resolveRemoteUrl = options.resolveRemoteUrl ?? defaultResolveRemoteUrl;
|
||||
const create = options.createService ?? createForgeService;
|
||||
const matchHost = options.matchHost ?? forgeForHost;
|
||||
const probeForge = options.probeForge ?? probeRegisteredForgeHost;
|
||||
const resolveSsh = options.resolveSshHostname ?? resolveSshHostname;
|
||||
const now = options.now ?? Date.now;
|
||||
@@ -110,22 +122,34 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
if (!entry) {
|
||||
return undefined;
|
||||
}
|
||||
if (entry.expiresAt !== null && Date.now() >= entry.expiresAt) {
|
||||
if (entry.expiresAt !== null && now() >= entry.expiresAt) {
|
||||
probedForgeByHost.delete(host);
|
||||
return undefined;
|
||||
}
|
||||
return entry.forge;
|
||||
}
|
||||
|
||||
function buildResolution(forge: string, host: string): ForgeResolution | null {
|
||||
let service = services.get(forge);
|
||||
function getService(forge: string): ForgeService | null {
|
||||
const normalized = forge.trim().toLowerCase();
|
||||
if (!normalized) {
|
||||
return null;
|
||||
}
|
||||
let service = services.get(normalized);
|
||||
if (!service) {
|
||||
const created = create(forge);
|
||||
const created = create(normalized);
|
||||
if (!created) {
|
||||
return null;
|
||||
}
|
||||
service = created;
|
||||
services.set(forge, service);
|
||||
services.set(normalized, service);
|
||||
}
|
||||
return service;
|
||||
}
|
||||
|
||||
function buildResolution(forge: string, host: string): ForgeResolution | null {
|
||||
const service = getService(forge);
|
||||
if (!service) {
|
||||
return null;
|
||||
}
|
||||
return { forge, host, service };
|
||||
}
|
||||
@@ -151,7 +175,7 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
}
|
||||
probedForgeByHost.set(host, {
|
||||
forge: probed,
|
||||
expiresAt: probed === null ? Date.now() + NEGATIVE_PROBE_TTL_MS : null,
|
||||
expiresAt: probed === null ? now() + NEGATIVE_PROBE_TTL_MS : null,
|
||||
});
|
||||
return probed;
|
||||
} finally {
|
||||
@@ -170,13 +194,29 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
if (!host) {
|
||||
return null;
|
||||
}
|
||||
const forge = forgeForHost(host) ?? readFreshProbe(host) ?? null;
|
||||
const forge = matchHost(host) ?? readFreshProbe(host) ?? null;
|
||||
if (!forge) {
|
||||
return null;
|
||||
}
|
||||
return buildResolution(forge, host);
|
||||
}
|
||||
|
||||
async function resolveHost(host: string): Promise<ForgeResolution | null> {
|
||||
const normalized = normalizeHost(host);
|
||||
if (!normalized) {
|
||||
return null;
|
||||
}
|
||||
const directForge = matchHost(normalized);
|
||||
if (directForge) {
|
||||
return buildResolution(directForge, normalized);
|
||||
}
|
||||
const probed = await probeHostForge(normalized);
|
||||
if (!probed) {
|
||||
return null;
|
||||
}
|
||||
return buildResolution(probed, normalized);
|
||||
}
|
||||
|
||||
async function resolveFromRemoteUrlAsync(
|
||||
remoteUrl: string | null,
|
||||
): Promise<ForgeResolution | null> {
|
||||
@@ -187,7 +227,7 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
if (!location) {
|
||||
return null;
|
||||
}
|
||||
const directForge = forgeForHost(location.host);
|
||||
const directForge = matchHost(location.host);
|
||||
if (directForge) {
|
||||
return buildResolution(directForge, location.host);
|
||||
}
|
||||
@@ -215,7 +255,7 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
}
|
||||
probedForgeByHost.set(aliasHost, {
|
||||
forge,
|
||||
expiresAt: forge === null ? Date.now() + NEGATIVE_PROBE_TTL_MS : null,
|
||||
expiresAt: forge === null ? now() + NEGATIVE_PROBE_TTL_MS : null,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -231,7 +271,7 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
return { host: location.host };
|
||||
}
|
||||
|
||||
const resolvedForge = forgeForHost(resolvedHost);
|
||||
const resolvedForge = matchHost(resolvedHost);
|
||||
if (resolvedForge) {
|
||||
return { host: resolvedHost, forge: resolvedForge };
|
||||
}
|
||||
@@ -246,10 +286,19 @@ export function createForgeResolver(options: CreateForgeResolverOptions = {}): F
|
||||
}
|
||||
}
|
||||
|
||||
function dispose(): void {
|
||||
for (const service of services.values()) {
|
||||
service.dispose?.();
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
resolveFromRemoteUrl,
|
||||
resolveFromRemoteUrlAsync,
|
||||
resolveHost,
|
||||
getService,
|
||||
invalidate,
|
||||
dispose,
|
||||
async resolve(cwd: string): Promise<ForgeResolution | null> {
|
||||
return resolveFromRemoteUrlAsync(await resolveRemoteUrlCached(cwd));
|
||||
},
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { ForgeSearchKind } from "@getpaseo/protocol/messages";
|
||||
import type { ChangeRequestSource } from "./change-request-source.js";
|
||||
|
||||
export type ForgeSearchRequestKind = ForgeSearchKind | "github-issue" | "github-pr" | "pr";
|
||||
|
||||
@@ -533,6 +534,8 @@ export interface ForgeService {
|
||||
onError?: (error: unknown) => void;
|
||||
},
|
||||
): { unsubscribe: () => void };
|
||||
/** Exact-URL change request observation adapter for watches, when supported by the forge. */
|
||||
changeRequests?: ChangeRequestSource;
|
||||
invalidate(options: { cwd: string }): void;
|
||||
dispose?(): void;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,917 @@
|
||||
import { z } from "zod";
|
||||
import { normalizeHost } from "@getpaseo/protocol/git-remote";
|
||||
import { GITLAB_ACTIVE_PIPELINE_STATUS_SET } from "@getpaseo/protocol/gitlab-pipeline";
|
||||
import {
|
||||
ChangeRequestRateLimitError,
|
||||
createPerHostChangeRequestPoller,
|
||||
parseCliHttpResponse,
|
||||
parseRetryAfterMs,
|
||||
type PerHostReadContext,
|
||||
} from "./change-request-poller.js";
|
||||
import type { ChangeRequestSnapshot, ChangeRequestSource } from "./change-request-source.js";
|
||||
|
||||
const GITLAB_CLOUD_HOST = "gitlab.com";
|
||||
const GITLAB_PAGE_SIZE = 100;
|
||||
const GITLAB_MR_TABS = new Set(["diffs", "commits", "pipelines", "builds", "reports"]);
|
||||
|
||||
const checkUrlSchema = z.url({ protocol: /^https?$/ });
|
||||
|
||||
const gitLabWatchPipelineSchema = z
|
||||
.object({
|
||||
id: z.number(),
|
||||
project_id: z.number().nullable().optional(),
|
||||
sha: z.string().nullable().optional(),
|
||||
status: z.string(),
|
||||
web_url: z.string().nullable().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchMrSchema = z
|
||||
.object({
|
||||
iid: z.number(),
|
||||
state: z.string(),
|
||||
sha: z.string().nullable().optional(),
|
||||
diff_refs: z
|
||||
.object({
|
||||
head_sha: z.string().nullable().optional(),
|
||||
})
|
||||
.passthrough()
|
||||
.nullable()
|
||||
.optional(),
|
||||
web_url: checkUrlSchema,
|
||||
target_project_id: z.number().nullable().optional(),
|
||||
merged_at: z.string().nullable().optional(),
|
||||
head_pipeline: gitLabWatchPipelineSchema.nullable().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchJobSchema = z
|
||||
.object({
|
||||
id: z.number(),
|
||||
name: z.string(),
|
||||
status: z.string(),
|
||||
allow_failure: z.boolean().optional(),
|
||||
web_url: z.string().nullable().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchNoteAuthorSchema = z
|
||||
.object({
|
||||
username: z.string().optional(),
|
||||
name: z.string().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchNoteSchema = z
|
||||
.object({
|
||||
id: z.number(),
|
||||
body: z.string().nullable().optional(),
|
||||
system: z.boolean().optional(),
|
||||
type: z.string().nullable().optional(),
|
||||
position: z.unknown().nullable().optional(),
|
||||
author: gitLabWatchNoteAuthorSchema.nullable().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchDiscussionSchema = z
|
||||
.object({
|
||||
id: z.string(),
|
||||
notes: z.array(gitLabWatchNoteSchema).optional().default([]),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
const gitLabWatchApprovalsSchema = z
|
||||
.object({
|
||||
approvals_required: z.number().nullable().optional(),
|
||||
approvals_left: z.number().nullable().optional(),
|
||||
})
|
||||
.passthrough();
|
||||
|
||||
type GitLabWatchMr = z.infer<typeof gitLabWatchMrSchema>;
|
||||
type GitLabWatchJob = z.infer<typeof gitLabWatchJobSchema>;
|
||||
type GitLabWatchNote = z.infer<typeof gitLabWatchNoteSchema>;
|
||||
type GitLabWatchDiscussion = z.infer<typeof gitLabWatchDiscussionSchema>;
|
||||
type GitLabWatchApprovals = z.infer<typeof gitLabWatchApprovalsSchema>;
|
||||
|
||||
interface GitLabMergeRequestIdentity {
|
||||
protocol: "http:" | "https:";
|
||||
host: string;
|
||||
port: string;
|
||||
hostWithPort: string;
|
||||
projectPath: string;
|
||||
iid: number;
|
||||
}
|
||||
|
||||
function invalidGitLabUrl(): never {
|
||||
throw new Error("Enter a GitLab merge request URL.");
|
||||
}
|
||||
|
||||
function parseGitLabUrlOrigin(input: string): {
|
||||
protocol: "http:" | "https:";
|
||||
host: string;
|
||||
port: string;
|
||||
hostWithPort: string;
|
||||
pathname: string;
|
||||
} {
|
||||
const trimmed = input.trim();
|
||||
if (!trimmed || /\s/.test(trimmed)) invalidGitLabUrl();
|
||||
let parsed: URL;
|
||||
try {
|
||||
parsed = new URL(trimmed);
|
||||
} catch {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
const protocol = parsed.protocol.toLowerCase();
|
||||
if ((protocol !== "https:" && protocol !== "http:") || parsed.username || parsed.password) {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
const host = normalizeHost(parsed.hostname);
|
||||
if (!host || (host === GITLAB_CLOUD_HOST && protocol !== "https:")) {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
return {
|
||||
protocol: protocol as "http:" | "https:",
|
||||
host,
|
||||
port: parsed.port,
|
||||
hostWithPort: parsed.port ? `${host}:${parsed.port}` : host,
|
||||
pathname: parsed.pathname,
|
||||
};
|
||||
}
|
||||
|
||||
function decodeGitLabProjectPath(rawSegments: string[]): string {
|
||||
if (rawSegments.length < 2) invalidGitLabUrl();
|
||||
const decodedSegments: string[] = [];
|
||||
for (const segment of rawSegments) {
|
||||
let decoded: string;
|
||||
try {
|
||||
decoded = decodeURIComponent(segment);
|
||||
} catch {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
const invalidSegment =
|
||||
!decoded ||
|
||||
decoded === "." ||
|
||||
decoded === ".." ||
|
||||
decoded === "-" ||
|
||||
decoded.includes("/") ||
|
||||
decoded.includes("\\");
|
||||
if (invalidSegment) invalidGitLabUrl();
|
||||
decodedSegments.push(decoded);
|
||||
}
|
||||
return decodedSegments.join("/");
|
||||
}
|
||||
|
||||
function parseGitLabMergeRequestUrl(input: string): GitLabMergeRequestIdentity {
|
||||
const origin = parseGitLabUrlOrigin(input);
|
||||
const rawSegments = origin.pathname.split("/").filter((segment) => segment.length > 0);
|
||||
if (rawSegments.length < 4) invalidGitLabUrl();
|
||||
|
||||
// Strip an optional browser tab suffix (e.g. /diffs, /commits, /pipelines).
|
||||
if (
|
||||
rawSegments.length >= 5 &&
|
||||
GITLAB_MR_TABS.has(rawSegments[rawSegments.length - 1]!.toLowerCase()) &&
|
||||
/^\d+$/.test(rawSegments[rawSegments.length - 2]!)
|
||||
) {
|
||||
rawSegments.pop();
|
||||
}
|
||||
|
||||
const iidRaw = rawSegments.pop();
|
||||
const resource = rawSegments.pop();
|
||||
if (!iidRaw || !/^\d+$/.test(iidRaw) || resource?.toLowerCase() !== "merge_requests") {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
const iid = Number(iidRaw);
|
||||
if (!Number.isInteger(iid) || iid < 1 || iid > 2_147_483_647) {
|
||||
invalidGitLabUrl();
|
||||
}
|
||||
|
||||
// Modern GitLab URLs place `-` before `merge_requests`; legacy URLs omit it.
|
||||
if (rawSegments[rawSegments.length - 1] === "-") {
|
||||
rawSegments.pop();
|
||||
}
|
||||
|
||||
return {
|
||||
protocol: origin.protocol,
|
||||
host: origin.host,
|
||||
port: origin.port,
|
||||
hostWithPort: origin.hostWithPort,
|
||||
projectPath: decodeGitLabProjectPath(rawSegments),
|
||||
iid,
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveGitLabChangeRequest(input: string): string {
|
||||
const { protocol, hostWithPort, projectPath, iid } = parseGitLabMergeRequestUrl(input);
|
||||
return `${protocol}//${hostWithPort}/${projectPath}/-/merge_requests/${iid}`;
|
||||
}
|
||||
|
||||
export function gitlabChangeRequestHost(url: string): string {
|
||||
return parseGitLabMergeRequestUrl(url).hostWithPort;
|
||||
}
|
||||
|
||||
export function describeGitLabChangeRequest(url: string): string {
|
||||
const { host, port, hostWithPort, projectPath, iid } = parseGitLabMergeRequestUrl(url);
|
||||
const project =
|
||||
host === GITLAB_CLOUD_HOST && !port ? projectPath : `${hostWithPort}/${projectPath}`;
|
||||
return `${project} !${iid}`;
|
||||
}
|
||||
|
||||
function mapGitLabMrState(mr: GitLabWatchMr): ChangeRequestSnapshot["state"] {
|
||||
const state = mr.state.toLowerCase();
|
||||
// GitLab reports "locked" while a merge is actively in progress; treat it as
|
||||
// open so polling continues until GitLab transitions to "merged" (or "closed").
|
||||
if (state === "opened" || state === "locked") return "open";
|
||||
if (state === "merged" || mr.merged_at != null) return "merged";
|
||||
return "closed";
|
||||
}
|
||||
|
||||
function mapGitLabPipelineState(
|
||||
status: string | null | undefined,
|
||||
): ChangeRequestSnapshot["checksState"] {
|
||||
if (!status) return "neutral";
|
||||
const normalized = status.toLowerCase();
|
||||
if (normalized === "success" || normalized === "passed") return "passed";
|
||||
if (normalized === "failed") return "failed";
|
||||
if (normalized === "manual" || GITLAB_ACTIVE_PIPELINE_STATUS_SET.has(normalized)) {
|
||||
return "pending";
|
||||
}
|
||||
return "neutral";
|
||||
}
|
||||
|
||||
function mapGitLabJobState(job: GitLabWatchJob): ChangeRequestSnapshot["checks"][number]["state"] {
|
||||
const raw = job.status.toLowerCase();
|
||||
const allowFailure = job.allow_failure ?? false;
|
||||
if (raw === "failed") return allowFailure ? "neutral" : "failed";
|
||||
if (raw === "success" || raw === "passed") return "passed";
|
||||
if (raw === "manual") return allowFailure ? "neutral" : "pending";
|
||||
if (GITLAB_ACTIVE_PIPELINE_STATUS_SET.has(raw)) return "pending";
|
||||
return "neutral";
|
||||
}
|
||||
|
||||
function toWatchCheck(
|
||||
job: GitLabWatchJob,
|
||||
prefix: "job" | "bridge",
|
||||
): ChangeRequestSnapshot["checks"][number] {
|
||||
const url = checkUrlSchema.safeParse(job.web_url).data;
|
||||
return {
|
||||
id: `${prefix}:${job.id}`,
|
||||
name: job.name,
|
||||
state: mapGitLabJobState(job),
|
||||
...(url ? { url } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
type ApprovalNoteAction = "approved" | "unapproved" | "reset";
|
||||
|
||||
interface ParsedApprovalNote {
|
||||
id: string;
|
||||
action: ApprovalNoteAction;
|
||||
actor: string | null;
|
||||
url: string;
|
||||
}
|
||||
|
||||
function parseGitLabApprovalNote(
|
||||
note: GitLabWatchNote,
|
||||
mrWebUrl: string,
|
||||
): ParsedApprovalNote | null {
|
||||
if (note.system !== true) return null;
|
||||
const body = note.body?.trim().toLowerCase() ?? "";
|
||||
if (!body) return null;
|
||||
|
||||
let action: ApprovalNoteAction | null = null;
|
||||
if (body === "approved this merge request" || body.startsWith("approved this merge request")) {
|
||||
action = "approved";
|
||||
} else if (
|
||||
body === "unapproved this merge request" ||
|
||||
body.startsWith("unapproved this merge request") ||
|
||||
body.startsWith("removed approval") ||
|
||||
body.startsWith("revoked approval")
|
||||
) {
|
||||
action = "unapproved";
|
||||
} else if (body.startsWith("reset approvals")) {
|
||||
action = "reset";
|
||||
}
|
||||
if (!action) return null;
|
||||
|
||||
const actor = note.author?.username?.trim() || note.author?.name?.trim() || null;
|
||||
return {
|
||||
id: `approval-note:${note.id}`,
|
||||
action,
|
||||
actor,
|
||||
url: `${mrWebUrl}#note_${note.id}`,
|
||||
};
|
||||
}
|
||||
|
||||
interface ApprovalCount {
|
||||
given: number;
|
||||
required: number;
|
||||
}
|
||||
|
||||
function summarizeApprovalCount(approvals: GitLabWatchApprovals): ApprovalCount | null {
|
||||
const { approvals_required: required, approvals_left: remaining } = approvals;
|
||||
if (required == null || remaining == null) return null;
|
||||
return { given: Math.max(0, required - remaining), required };
|
||||
}
|
||||
|
||||
function formatApprovalCount(summary: ApprovalCount | null): string {
|
||||
if (!summary || summary.required <= 0) return "";
|
||||
return ` (${summary.given}/${summary.required} approvals)`;
|
||||
}
|
||||
|
||||
function formatApprovalActor(actor: string | null): string {
|
||||
if (!actor) return "";
|
||||
return actor.startsWith("@") ? actor : `@${actor}`;
|
||||
}
|
||||
|
||||
function formatApprovalNoteMessage(
|
||||
note: ParsedApprovalNote,
|
||||
summary: ApprovalCount | null,
|
||||
): string {
|
||||
const actor = formatApprovalActor(note.actor);
|
||||
const count = formatApprovalCount(summary);
|
||||
if (note.action === "approved") {
|
||||
return `Merge request approved${actor ? ` by ${actor}` : ""}${count}: ${note.url}`;
|
||||
}
|
||||
if (note.action === "unapproved") {
|
||||
return `Merge request approval removed${actor ? ` by ${actor}` : ""}${count}: ${note.url}`;
|
||||
}
|
||||
return `Merge request approvals reset${actor ? ` by ${actor}` : ""}${count}: ${note.url}`;
|
||||
}
|
||||
|
||||
interface ParsedDiscussionItems {
|
||||
humanActivity: ChangeRequestSnapshot["activity"];
|
||||
approvalNotes: ParsedApprovalNote[];
|
||||
}
|
||||
|
||||
function parseDiscussionItems(
|
||||
discussions: GitLabWatchDiscussion[],
|
||||
mrWebUrl: string,
|
||||
): ParsedDiscussionItems {
|
||||
const humanActivity: ChangeRequestSnapshot["activity"] = [];
|
||||
const approvalNotes: ParsedApprovalNote[] = [];
|
||||
|
||||
for (const discussion of discussions) {
|
||||
for (const note of discussion.notes) {
|
||||
if (note.system === true) {
|
||||
const approvalNote = parseGitLabApprovalNote(note, mrWebUrl);
|
||||
if (approvalNote) approvalNotes.push(approvalNote);
|
||||
continue;
|
||||
}
|
||||
const isInline = note.position != null || note.type === "DiffNote";
|
||||
humanActivity.push({
|
||||
id: isInline ? `inline:${note.id}` : `comment:${note.id}`,
|
||||
kind: isInline ? "inline comment" : "comment",
|
||||
url: `${mrWebUrl}#note_${note.id}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return { humanActivity, approvalNotes };
|
||||
}
|
||||
|
||||
function resolvePipelineProjectId(
|
||||
pipeline: z.infer<typeof gitLabWatchPipelineSchema>,
|
||||
mr: GitLabWatchMr,
|
||||
encodedProject: string,
|
||||
): string {
|
||||
if (pipeline.project_id != null) return String(pipeline.project_id);
|
||||
if (mr.target_project_id != null) return String(mr.target_project_id);
|
||||
return encodedProject;
|
||||
}
|
||||
|
||||
function pipelineFailureCheck(
|
||||
pipeline: z.infer<typeof gitLabWatchPipelineSchema>,
|
||||
): ChangeRequestSnapshot["checks"][number] {
|
||||
const url = checkUrlSchema.safeParse(pipeline.web_url).data;
|
||||
return {
|
||||
id: `pipeline:${pipeline.id}`,
|
||||
name: `Pipeline #${pipeline.id}`,
|
||||
state: "failed",
|
||||
...(url ? { url } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
function createRateLimitError(
|
||||
host: string,
|
||||
nowMs: number,
|
||||
headers: ReadonlyMap<string, string>,
|
||||
): ChangeRequestRateLimitError {
|
||||
const resetAtMs = parseRetryAfterMs(headers, nowMs, {
|
||||
forceOnMissing: true,
|
||||
defaultPauseMs: 60_000,
|
||||
})!;
|
||||
return new ChangeRequestRateLimitError({ host, resetAtMs });
|
||||
}
|
||||
|
||||
function extractRateLimitFromFailedCommand(
|
||||
host: string,
|
||||
nowMs: number,
|
||||
status: number | null,
|
||||
headers: ReadonlyMap<string, string>,
|
||||
text: string,
|
||||
): ChangeRequestRateLimitError | null {
|
||||
if (status !== null) {
|
||||
return status === 429 ? createRateLimitError(host, nowMs, headers) : null;
|
||||
}
|
||||
if (!/\b(429|too many requests|rate limit)\b/i.test(text)) return null;
|
||||
return createRateLimitError(host, nowMs, headers);
|
||||
}
|
||||
|
||||
export interface CreateGitLabChangeRequestSourceOptions {
|
||||
runCommand(
|
||||
args: string[],
|
||||
options: { cwd: string; envOverlay?: Record<string, string> },
|
||||
): Promise<{ stdout: string; stderr: string }>;
|
||||
isAuthError(error: unknown): boolean;
|
||||
isCommandError(error: unknown): error is Error & { stderr: string; stdout?: string };
|
||||
createAuthError(stderr: string): Error;
|
||||
createCommandError(params: {
|
||||
args: string[];
|
||||
cwd: string;
|
||||
exitCode: number | null;
|
||||
stderr: string;
|
||||
stdout?: string;
|
||||
}): Error;
|
||||
now?: () => number;
|
||||
pollIntervalMs?: number;
|
||||
initialDelayMs?: number;
|
||||
}
|
||||
|
||||
export function createGitLabChangeRequestSource(
|
||||
options: CreateGitLabChangeRequestSourceOptions,
|
||||
): ChangeRequestSource & { dispose(): void } {
|
||||
const now = options.now ?? Date.now;
|
||||
|
||||
async function readConfig(
|
||||
host: string,
|
||||
key: string,
|
||||
envOverlay: Record<string, string> = {},
|
||||
): Promise<string> {
|
||||
const config = await options.runCommand(["config", "get", key, "--host", host], {
|
||||
cwd: process.cwd(),
|
||||
envOverlay: { GITLAB_HOST: host, ...envOverlay },
|
||||
});
|
||||
return config.stdout.trim();
|
||||
}
|
||||
|
||||
async function preferredProfileHost(identity: GitLabMergeRequestIdentity): Promise<string> {
|
||||
const { host, hostWithPort } = identity;
|
||||
if (hostWithPort === host) return host;
|
||||
|
||||
// An API host override applies to either profile. Use the configured value
|
||||
// to decide which profile to try first, then check access through the MR.
|
||||
const exactProfile = await readConfig(hostWithPort, "api_host", { GITLAB_API_HOST: "" });
|
||||
return exactProfile ? hostWithPort : host;
|
||||
}
|
||||
|
||||
async function readApiPrefix(profileHost: string): Promise<string> {
|
||||
if (profileHost === GITLAB_CLOUD_HOST) return "";
|
||||
const trimSlashes = /^\/+|\/+$/g;
|
||||
let prefix = (await readConfig(profileHost, "subfolder")).replace(trimSlashes, "");
|
||||
if (!prefix) {
|
||||
const apiHost = await readConfig(profileHost, "api_host");
|
||||
if (apiHost) {
|
||||
const apiUrl = new URL(apiHost.includes("://") ? apiHost : `https://${apiHost}`);
|
||||
prefix = apiUrl.pathname.replace(trimSlashes, "");
|
||||
}
|
||||
}
|
||||
return decodeURI(prefix);
|
||||
}
|
||||
|
||||
function parseJsonResponseBody<T>(params: {
|
||||
args: string[];
|
||||
cwd: string;
|
||||
body: string;
|
||||
schema: z.ZodType<T>;
|
||||
}): T {
|
||||
let json: unknown;
|
||||
try {
|
||||
json = JSON.parse(params.body);
|
||||
} catch {
|
||||
throw options.createCommandError({
|
||||
args: params.args,
|
||||
cwd: params.cwd,
|
||||
exitCode: null,
|
||||
stderr: `glab did not return valid JSON (${params.body.length} bytes)`,
|
||||
});
|
||||
}
|
||||
const validated = params.schema.safeParse(json);
|
||||
if (!validated.success) {
|
||||
throw options.createCommandError({
|
||||
args: params.args,
|
||||
cwd: params.cwd,
|
||||
exitCode: null,
|
||||
stderr: `glab JSON did not match the expected schema: ${validated.error.message}`,
|
||||
});
|
||||
}
|
||||
return validated.data;
|
||||
}
|
||||
|
||||
function checkHttpStatus(params: {
|
||||
host: string;
|
||||
args: string[];
|
||||
cwd: string;
|
||||
status: number | null;
|
||||
headers: ReadonlyMap<string, string>;
|
||||
body: string;
|
||||
rawStdout: string;
|
||||
rawStderr: string;
|
||||
pauseHost(untilMs: number): void;
|
||||
}): void {
|
||||
// Only decide rate limits from the HTTP status code on parsed responses so
|
||||
// ordinary MR titles, comments, or IIDs mentioning "429" or "rate limit"
|
||||
// never trip a false rate-limit pause.
|
||||
if (params.status === null) return;
|
||||
if (params.status === 429) {
|
||||
const error = createRateLimitError(params.host, now(), params.headers);
|
||||
params.pauseHost(error.resetAtMs);
|
||||
throw error;
|
||||
}
|
||||
if (params.status === 401) {
|
||||
throw options.createAuthError(params.body || params.rawStderr || "401 Unauthorized");
|
||||
}
|
||||
if (params.status < 200 || params.status >= 300) {
|
||||
throw options.createCommandError({
|
||||
args: params.args,
|
||||
cwd: params.cwd,
|
||||
exitCode: null,
|
||||
stderr: `HTTP ${params.status}: ${params.body || params.rawStderr}`.trim(),
|
||||
stdout: params.rawStdout,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function apiGet<T>(params: {
|
||||
host: string;
|
||||
endpoint: string;
|
||||
schema: z.ZodType<T>;
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<{ data: T; headers: ReadonlyMap<string, string> }> {
|
||||
if (!params.poll.isObserved()) throw new Error("Change request observation ended");
|
||||
params.poll.assertHostAvailable();
|
||||
// glab api rejects a port in --hostname. GITLAB_HOST selects that profile.
|
||||
const args = params.host.includes(":")
|
||||
? ["api", "-i", params.endpoint]
|
||||
: ["api", "--hostname", params.host, "-i", params.endpoint];
|
||||
const cwd = process.cwd();
|
||||
let result: { stdout: string; stderr: string };
|
||||
try {
|
||||
result = await options.runCommand(args, {
|
||||
cwd,
|
||||
envOverlay: { GITLAB_HOST: params.host },
|
||||
});
|
||||
} catch (error) {
|
||||
if (options.isCommandError(error)) {
|
||||
const parsedError = error.stdout ? parseCliHttpResponse(error.stdout) : null;
|
||||
const rateLimit = extractRateLimitFromFailedCommand(
|
||||
params.host,
|
||||
now(),
|
||||
parsedError?.status ?? null,
|
||||
parsedError?.headers ?? new Map(),
|
||||
`${error.stderr}\n${error.stdout ?? ""}`,
|
||||
);
|
||||
if (rateLimit) {
|
||||
params.poll.pauseHost(rateLimit.resetAtMs);
|
||||
throw rateLimit;
|
||||
}
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
const parsed = parseCliHttpResponse(result.stdout);
|
||||
checkHttpStatus({
|
||||
host: params.host,
|
||||
args,
|
||||
cwd,
|
||||
status: parsed.status,
|
||||
headers: parsed.headers,
|
||||
body: parsed.body,
|
||||
rawStdout: result.stdout,
|
||||
rawStderr: result.stderr,
|
||||
pauseHost: params.poll.pauseHost,
|
||||
});
|
||||
|
||||
const proactivePause = parseRetryAfterMs(parsed.headers, now());
|
||||
if (proactivePause !== null) {
|
||||
params.poll.deferPollsUntil(proactivePause);
|
||||
}
|
||||
|
||||
const data = parseJsonResponseBody({ args, cwd, body: parsed.body, schema: params.schema });
|
||||
return { data, headers: parsed.headers };
|
||||
}
|
||||
|
||||
async function apiGetAllPages<T>(params: {
|
||||
host: string;
|
||||
endpoint: string;
|
||||
itemSchema: z.ZodType<T>;
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<{ items: T[]; pagesRead: number }> {
|
||||
const items: T[] = [];
|
||||
const schema = z.array(params.itemSchema);
|
||||
const seenPages = new Set<number>([1]);
|
||||
let page = 1;
|
||||
let pagesRead = 0;
|
||||
|
||||
while (true) {
|
||||
if (!params.poll.isObserved()) {
|
||||
return { items, pagesRead };
|
||||
}
|
||||
const sep = params.endpoint.includes("?") ? "&" : "?";
|
||||
const response = await apiGet({
|
||||
host: params.host,
|
||||
endpoint: `${params.endpoint}${sep}per_page=${GITLAB_PAGE_SIZE}&page=${page}`,
|
||||
schema,
|
||||
poll: params.poll,
|
||||
});
|
||||
pagesRead += 1;
|
||||
items.push(...response.data);
|
||||
|
||||
const nextPageHeader = response.headers.get("x-next-page");
|
||||
if (nextPageHeader !== undefined) {
|
||||
const trimmed = nextPageHeader.trim();
|
||||
if (!trimmed) break;
|
||||
const nextPage = Number(trimmed);
|
||||
if (!Number.isInteger(nextPage) || nextPage <= 0 || seenPages.has(nextPage)) {
|
||||
throw new Error("GitLab returned an invalid pagination header.");
|
||||
}
|
||||
seenPages.add(nextPage);
|
||||
page = nextPage;
|
||||
} else {
|
||||
if (response.data.length < GITLAB_PAGE_SIZE) break;
|
||||
page += 1;
|
||||
seenPages.add(page);
|
||||
}
|
||||
}
|
||||
|
||||
return { items, pagesRead };
|
||||
}
|
||||
|
||||
function commandErrorStatus(error: unknown): number | null {
|
||||
return options.isCommandError(error) && error.stdout
|
||||
? parseCliHttpResponse(error.stdout).status
|
||||
: null;
|
||||
}
|
||||
|
||||
async function readMergeRequestMetadata(params: {
|
||||
host: string;
|
||||
identity: GitLabMergeRequestIdentity;
|
||||
endpoint: string;
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<GitLabWatchMr> {
|
||||
const { data: mr } = await apiGet({
|
||||
host: params.host,
|
||||
endpoint: params.endpoint,
|
||||
schema: gitLabWatchMrSchema,
|
||||
poll: params.poll,
|
||||
});
|
||||
const address = parseGitLabMergeRequestUrl(mr.web_url);
|
||||
const expected = params.identity;
|
||||
if (address.protocol !== expected.protocol || address.hostWithPort !== expected.hostWithPort) {
|
||||
throw new Error(
|
||||
`GitLab returned a merge request from a different web origin: ${address.protocol}//${address.hostWithPort}`,
|
||||
);
|
||||
}
|
||||
if (address.projectPath.toLowerCase() !== expected.projectPath.toLowerCase()) {
|
||||
throw new Error("GitLab returned a merge request from a different project.");
|
||||
}
|
||||
if (address.iid !== expected.iid || mr.iid !== expected.iid) {
|
||||
throw new Error("GitLab returned a different merge request number.");
|
||||
}
|
||||
return mr;
|
||||
}
|
||||
|
||||
function pipelineDetailsUnavailable(error: unknown): boolean {
|
||||
const status = commandErrorStatus(error);
|
||||
return status === 403 || status === 404;
|
||||
}
|
||||
|
||||
async function readPipelineChecks(params: {
|
||||
host: string;
|
||||
identity: GitLabMergeRequestIdentity;
|
||||
mrEndpoint: string;
|
||||
encodedProject: string;
|
||||
mr: GitLabWatchMr;
|
||||
headSha: string;
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<ChangeRequestSnapshot["checks"]> {
|
||||
const pipeline = params.mr.head_pipeline;
|
||||
if (!pipeline) return [];
|
||||
|
||||
const pipelineProject = resolvePipelineProjectId(pipeline, params.mr, params.encodedProject);
|
||||
let jobsResult: { items: GitLabWatchJob[]; pagesRead: number };
|
||||
try {
|
||||
jobsResult = await apiGetAllPages({
|
||||
host: params.host,
|
||||
endpoint: `projects/${pipelineProject}/pipelines/${pipeline.id}/jobs`,
|
||||
itemSchema: gitLabWatchJobSchema,
|
||||
poll: params.poll,
|
||||
});
|
||||
} catch (error) {
|
||||
if (!pipelineDetailsUnavailable(error)) throw error;
|
||||
// The MR can expose pipeline status even when its jobs are restricted.
|
||||
return mapGitLabPipelineState(pipeline.status) === "failed"
|
||||
? [pipelineFailureCheck(pipeline)]
|
||||
: [];
|
||||
}
|
||||
if (!params.poll.isObserved()) {
|
||||
throw new Error("Change request observation ended");
|
||||
}
|
||||
|
||||
const checks = jobsResult.items.map((job) => toWatchCheck(job, "job"));
|
||||
let fetchedBridges = false;
|
||||
if (
|
||||
mapGitLabPipelineState(pipeline.status) === "failed" &&
|
||||
!checks.some((check) => check.state === "failed")
|
||||
) {
|
||||
fetchedBridges = true;
|
||||
await appendFailedBridgeOrPipelineChecks({
|
||||
host: params.host,
|
||||
pipelineProject,
|
||||
pipeline,
|
||||
checks,
|
||||
poll: params.poll,
|
||||
});
|
||||
}
|
||||
|
||||
// Guard against headSha or head_pipeline shifting while paginating check pages.
|
||||
if (jobsResult.pagesRead > 1 || fetchedBridges) {
|
||||
const recheck = await readMergeRequestMetadata({
|
||||
host: params.host,
|
||||
identity: params.identity,
|
||||
endpoint: params.mrEndpoint,
|
||||
poll: params.poll,
|
||||
});
|
||||
const recheckSha = recheck.sha || recheck.diff_refs?.head_sha || "";
|
||||
if (
|
||||
recheckSha !== params.headSha ||
|
||||
recheck.head_pipeline?.id !== pipeline.id ||
|
||||
recheck.head_pipeline?.status !== pipeline.status
|
||||
) {
|
||||
throw new Error("The merge request head or pipeline changed during pagination.");
|
||||
}
|
||||
}
|
||||
return checks;
|
||||
}
|
||||
|
||||
async function appendFailedBridgeOrPipelineChecks(params: {
|
||||
host: string;
|
||||
pipelineProject: string;
|
||||
pipeline: z.infer<typeof gitLabWatchPipelineSchema>;
|
||||
checks: ChangeRequestSnapshot["checks"];
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<void> {
|
||||
try {
|
||||
const bridgesResult = await apiGetAllPages({
|
||||
host: params.host,
|
||||
endpoint: `projects/${params.pipelineProject}/pipelines/${params.pipeline.id}/bridges`,
|
||||
itemSchema: gitLabWatchJobSchema,
|
||||
poll: params.poll,
|
||||
});
|
||||
for (const bridge of bridgesResult.items) {
|
||||
params.checks.push(toWatchCheck(bridge, "bridge"));
|
||||
}
|
||||
} catch (error) {
|
||||
if (!pipelineDetailsUnavailable(error)) throw error;
|
||||
}
|
||||
if (!params.checks.some((check) => check.state === "failed")) {
|
||||
params.checks.push(pipelineFailureCheck(params.pipeline));
|
||||
}
|
||||
}
|
||||
|
||||
async function readOptionalApprovalCount(params: {
|
||||
host: string;
|
||||
endpoint: string;
|
||||
poll: PerHostReadContext;
|
||||
}): Promise<ApprovalCount | null> {
|
||||
try {
|
||||
const { data: approvals } = await apiGet({
|
||||
host: params.host,
|
||||
endpoint: params.endpoint,
|
||||
schema: gitLabWatchApprovalsSchema,
|
||||
poll: params.poll,
|
||||
});
|
||||
return summarizeApprovalCount(approvals);
|
||||
} catch {
|
||||
// The approval system note is complete without an API count.
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function readInitialMergeRequest(
|
||||
identity: GitLabMergeRequestIdentity,
|
||||
poll: PerHostReadContext,
|
||||
) {
|
||||
async function readUsing(host: string) {
|
||||
const { projectPath, iid } = identity;
|
||||
const prefix = await readApiPrefix(host);
|
||||
const relativePath =
|
||||
prefix && projectPath.startsWith(`${prefix}/`)
|
||||
? projectPath.slice(prefix.length + 1)
|
||||
: projectPath;
|
||||
const encodedProject = encodeURIComponent(
|
||||
relativePath.includes("/") ? relativePath : projectPath,
|
||||
);
|
||||
const mrEndpoint = `projects/${encodedProject}/merge_requests/${iid}`;
|
||||
const mr = await readMergeRequestMetadata({ host, identity, endpoint: mrEndpoint, poll });
|
||||
return { host, encodedProject, mrEndpoint, mr };
|
||||
}
|
||||
|
||||
const preferred = await preferredProfileHost(identity);
|
||||
try {
|
||||
return await readUsing(preferred);
|
||||
} catch (error) {
|
||||
const status = commandErrorStatus(error);
|
||||
const accessDenied = options.isAuthError(error) || status === 403 || status === 404;
|
||||
if (preferred === identity.host || !accessDenied) throw error;
|
||||
return readUsing(identity.host);
|
||||
}
|
||||
}
|
||||
|
||||
async function readMergeRequest(context: PerHostReadContext): Promise<ChangeRequestSnapshot> {
|
||||
const identity = parseGitLabMergeRequestUrl(context.url);
|
||||
const { iid } = identity;
|
||||
const { host, encodedProject, mrEndpoint, mr } = await readInitialMergeRequest(
|
||||
identity,
|
||||
context,
|
||||
);
|
||||
const headSha = mr.sha || mr.diff_refs?.head_sha || "";
|
||||
if (!headSha) {
|
||||
throw new Error(`GitLab merge request !${iid} did not include a head commit SHA.`);
|
||||
}
|
||||
|
||||
const checks = await readPipelineChecks({
|
||||
host,
|
||||
identity,
|
||||
mrEndpoint,
|
||||
encodedProject,
|
||||
mr,
|
||||
headSha,
|
||||
poll: context,
|
||||
});
|
||||
const discussionsResult = await apiGetAllPages({
|
||||
host,
|
||||
endpoint: `projects/${encodedProject}/merge_requests/${iid}/discussions`,
|
||||
itemSchema: gitLabWatchDiscussionSchema,
|
||||
poll: context,
|
||||
});
|
||||
if (!context.isObserved()) {
|
||||
throw new Error("Change request observation ended");
|
||||
}
|
||||
|
||||
const { humanActivity, approvalNotes } = parseDiscussionItems(
|
||||
discussionsResult.items,
|
||||
mr.web_url,
|
||||
);
|
||||
const known = context.knownActivity();
|
||||
const hasNewApprovalNote =
|
||||
known !== undefined && approvalNotes.some((note) => !known.has(note.id));
|
||||
// Fetch /approvals only to enrich a newly observed approval system note with
|
||||
// current counts — keeping seenActivity as the single persisted owner of
|
||||
// approval transition baselines.
|
||||
const approvalCount = hasNewApprovalNote
|
||||
? await readOptionalApprovalCount({
|
||||
host,
|
||||
endpoint: `projects/${encodedProject}/merge_requests/${iid}/approvals`,
|
||||
poll: context,
|
||||
})
|
||||
: null;
|
||||
|
||||
const activity: ChangeRequestSnapshot["activity"] = [
|
||||
...humanActivity,
|
||||
...approvalNotes.map((note) => ({
|
||||
id: note.id,
|
||||
kind: "approval" as const,
|
||||
url: note.url,
|
||||
message: formatApprovalNoteMessage(note, approvalCount),
|
||||
})),
|
||||
];
|
||||
|
||||
return {
|
||||
state: mapGitLabMrState(mr),
|
||||
headSha,
|
||||
checksState: mapGitLabPipelineState(mr.head_pipeline?.status),
|
||||
checks,
|
||||
reviewDecision: null,
|
||||
activity,
|
||||
};
|
||||
}
|
||||
|
||||
const poller = createPerHostChangeRequestPoller({
|
||||
hostOf: gitlabChangeRequestHost,
|
||||
read: readMergeRequest,
|
||||
now,
|
||||
pollIntervalMs: options.pollIntervalMs,
|
||||
initialDelayMs: options.initialDelayMs,
|
||||
});
|
||||
|
||||
return {
|
||||
resolve: resolveGitLabChangeRequest,
|
||||
describe: describeGitLabChangeRequest,
|
||||
observe(url, callbacks) {
|
||||
return poller.observe(url, callbacks);
|
||||
},
|
||||
dispose() {
|
||||
poller.dispose();
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -60,6 +60,7 @@ import {
|
||||
CHECK_TRAIT_WARNING,
|
||||
} from "@getpaseo/protocol/check-traits";
|
||||
import { GITLAB_ACTIVE_PIPELINE_STATUS_SET } from "@getpaseo/protocol/gitlab-pipeline";
|
||||
import { createGitLabChangeRequestSource } from "./gitlab-change-requests.js";
|
||||
import { isGitLabStatusFacts, type GitLabStatusFacts } from "./gitlab-facts.js";
|
||||
|
||||
const GLAB_ENV = {
|
||||
@@ -112,6 +113,9 @@ export interface CreateGitLabServiceOptions {
|
||||
runner?: GlabCommandRunner;
|
||||
resolveGlabPath?: () => Promise<string | null>;
|
||||
resolveRemoteUrl?: (cwd: string) => Promise<string | null>;
|
||||
now?: () => number;
|
||||
watchPollMs?: number;
|
||||
watchInitialDelayMs?: number;
|
||||
}
|
||||
|
||||
const GitLabPipelineSchema = z
|
||||
@@ -925,19 +929,37 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
|
||||
const resolveGlab = createCachedCliPathResolver(options.resolveGlabPath ?? resolveGlabPath);
|
||||
const resolveRemoteUrl = options.resolveRemoteUrl ?? defaultResolveRemoteUrl;
|
||||
|
||||
async function run(args: string[], runOptions: GlabCommandRunnerOptions): Promise<string> {
|
||||
async function runRaw(
|
||||
args: string[],
|
||||
runOptions: GlabCommandRunnerOptions,
|
||||
): Promise<GlabCommandResult> {
|
||||
const glabPath = await resolveGlab();
|
||||
if (!glabPath) {
|
||||
throw new GlabCliMissingError();
|
||||
}
|
||||
try {
|
||||
const result = await runner(args, runOptions);
|
||||
return result.stdout.trim();
|
||||
return await runner(args, runOptions);
|
||||
} catch (error) {
|
||||
throw glabCliRunner.normalizeError(error, { args, cwd: runOptions.cwd });
|
||||
}
|
||||
}
|
||||
|
||||
async function run(args: string[], runOptions: GlabCommandRunnerOptions): Promise<string> {
|
||||
const result = await runRaw(args, runOptions);
|
||||
return result.stdout.trim();
|
||||
}
|
||||
|
||||
const changeRequests = createGitLabChangeRequestSource({
|
||||
runCommand: runRaw,
|
||||
isAuthError: (error) => error instanceof GlabAuthenticationError,
|
||||
isCommandError: (error): error is GlabCommandError => error instanceof GlabCommandError,
|
||||
createAuthError: (stderr) => new GlabAuthenticationError({ stderr }),
|
||||
createCommandError: (params) => new GlabCommandError(params),
|
||||
now: options.now,
|
||||
pollIntervalMs: options.watchPollMs,
|
||||
initialDelayMs: options.watchInitialDelayMs,
|
||||
});
|
||||
|
||||
// Centralize parse + validate so a malformed or empty glab payload surfaces as
|
||||
// a classified GlabCommandError (with args + cwd) instead of a raw
|
||||
// SyntaxError/ZodError that bypasses the Glab* error classification.
|
||||
@@ -1486,6 +1508,12 @@ export function createGitLabService(options: CreateGitLabServiceOptions = {}): F
|
||||
return { success: true };
|
||||
},
|
||||
|
||||
changeRequests,
|
||||
|
||||
invalidate(_input: { cwd: string }): void {},
|
||||
|
||||
dispose(): void {
|
||||
changeRequests.dispose();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,17 +28,28 @@ index 73466dd..8440ac9 100644
|
||||
|
||||
auto textSize = textLayoutManager_
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteInputEditText.kt b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteInputEditText.kt
|
||||
index 9e429b8..1d10014 100644
|
||||
index 1794b53..eca5e57 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteInputEditText.kt
|
||||
+++ b/node_modules/@mattermost/react-native-paste-input/android/src/main/java/com/mattermost/pasteinputtext/PasteInputEditText.kt
|
||||
@@ -36,2 +36,2 @@ class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
|
||||
@@ -33,8 +33,8 @@ class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
|
||||
return mOnPasteListener
|
||||
}
|
||||
|
||||
- override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection {
|
||||
- val ic = super.onCreateInputConnection(outAttrs)
|
||||
+ override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection? {
|
||||
+ val ic = super.onCreateInputConnection(outAttrs) ?: return null
|
||||
@@ -58 +58 @@ class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
|
||||
|
||||
EditorInfoCompat.setContentMimeTypes(outAttrs, arrayOf("*/*"))
|
||||
|
||||
@@ -55,6 +55,6 @@ class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
|
||||
true
|
||||
}
|
||||
|
||||
- return InputConnectionCompat.createWrapper(ic!!, outAttrs, callback)
|
||||
+ return InputConnectionCompat.createWrapper(ic, outAttrs, callback)
|
||||
}
|
||||
}
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteInput.js b/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteInput.js
|
||||
index 51b9dfa..501badf 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteInput.js
|
||||
@@ -108,10 +119,18 @@ index 51b9dfa..501badf 100644
|
||||
// For Android, PasteTextInput already handles everything internally
|
||||
// Just need to adapt the onPaste callback format
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteTextInput.js b/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteTextInput.js
|
||||
index 5119e65..287216a 100644
|
||||
index 5119e65..77c3aea 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteTextInput.js
|
||||
+++ b/node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteTextInput.js
|
||||
@@ -52,6 +52,7 @@ function InternalTextInput(props) {
|
||||
@@ -16,7 +16,6 @@ var _nullthrows = _interopRequireDefault(require("nullthrows"));
|
||||
var _jsxRuntime = require("react/jsx-runtime");
|
||||
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
||||
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
||||
-const emptyFunctionThatReturnsTrue = () => true;
|
||||
function useMergeRefs(...refs) {
|
||||
return React.useCallback(current => {
|
||||
for (const ref of refs) {
|
||||
@@ -52,6 +51,7 @@ function InternalTextInput(props) {
|
||||
end: propsSelection.end ?? propsSelection.start
|
||||
}, [propsSelection]);
|
||||
const [mostRecentEventCount, setMostRecentEventCount] = React.useState(0);
|
||||
@@ -119,7 +138,7 @@ index 5119e65..287216a 100644
|
||||
const [lastNativeText, setLastNativeText] = React.useState(props.value);
|
||||
const [lastNativeSelectionState, setLastNativeSelection] = React.useState({
|
||||
selection: {
|
||||
@@ -103,7 +104,12 @@ function InternalTextInput(props) {
|
||||
@@ -103,7 +103,12 @@ function InternalTextInput(props) {
|
||||
Object.assign(instance, {
|
||||
clear() {
|
||||
if (inputRef.current != null) {
|
||||
@@ -133,7 +152,7 @@ index 5119e65..287216a 100644
|
||||
}
|
||||
},
|
||||
isFocused() {
|
||||
@@ -114,12 +120,12 @@ function InternalTextInput(props) {
|
||||
@@ -114,12 +119,12 @@ function InternalTextInput(props) {
|
||||
},
|
||||
setSelection(start, end) {
|
||||
if (inputRef.current != null) {
|
||||
@@ -148,7 +167,7 @@ index 5119e65..287216a 100644
|
||||
const ref = useMergeRefs(setLocalRef, props.forwardedRef);
|
||||
const _onChange = event => {
|
||||
const currentText = event.nativeEvent.text;
|
||||
@@ -128,6 +134,7 @@ function InternalTextInput(props) {
|
||||
@@ -128,6 +133,7 @@ function InternalTextInput(props) {
|
||||
if (inputRef.current == null) {
|
||||
return;
|
||||
}
|
||||
@@ -156,6 +175,14 @@ index 5119e65..287216a 100644
|
||||
setLastNativeText(currentText);
|
||||
setMostRecentEventCount(event.nativeEvent.eventCount);
|
||||
};
|
||||
@@ -294,7 +300,6 @@ function InternalTextInput(props) {
|
||||
onPaste: _onPaste,
|
||||
onScroll: _onScroll,
|
||||
onSelectionChange: _onSelectionChange,
|
||||
- onSelectionChangeShouldSetResponder: emptyFunctionThatReturnsTrue,
|
||||
placeholder: placeholder,
|
||||
style: _style,
|
||||
text: text,
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/lib/module/PasteInput.js b/node_modules/@mattermost/react-native-paste-input/lib/module/PasteInput.js
|
||||
index 75fe015..1d3cd64 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/lib/module/PasteInput.js
|
||||
@@ -225,10 +252,18 @@ index 75fe015..1d3cd64 100644
|
||||
// For Android, PasteTextInput already handles everything internally
|
||||
// Just need to adapt the onPaste callback format
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/lib/module/PasteTextInput.js b/node_modules/@mattermost/react-native-paste-input/lib/module/PasteTextInput.js
|
||||
index 39bd607..f2b1d2f 100644
|
||||
index 39bd607..832dcc2 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/lib/module/PasteTextInput.js
|
||||
+++ b/node_modules/@mattermost/react-native-paste-input/lib/module/PasteTextInput.js
|
||||
@@ -46,6 +46,7 @@ function InternalTextInput(props) {
|
||||
@@ -10,7 +10,6 @@ import usePressability from 'react-native/Libraries/Pressability/usePressability
|
||||
import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle';
|
||||
import nullthrows from 'nullthrows';
|
||||
import { jsx as _jsx } from "react/jsx-runtime";
|
||||
-const emptyFunctionThatReturnsTrue = () => true;
|
||||
function useMergeRefs(...refs) {
|
||||
return React.useCallback(current => {
|
||||
for (const ref of refs) {
|
||||
@@ -46,6 +45,7 @@ function InternalTextInput(props) {
|
||||
end: propsSelection.end ?? propsSelection.start
|
||||
}, [propsSelection]);
|
||||
const [mostRecentEventCount, setMostRecentEventCount] = React.useState(0);
|
||||
@@ -236,7 +271,7 @@ index 39bd607..f2b1d2f 100644
|
||||
const [lastNativeText, setLastNativeText] = React.useState(props.value);
|
||||
const [lastNativeSelectionState, setLastNativeSelection] = React.useState({
|
||||
selection: {
|
||||
@@ -97,7 +98,12 @@ function InternalTextInput(props) {
|
||||
@@ -97,7 +97,12 @@ function InternalTextInput(props) {
|
||||
Object.assign(instance, {
|
||||
clear() {
|
||||
if (inputRef.current != null) {
|
||||
@@ -250,7 +285,7 @@ index 39bd607..f2b1d2f 100644
|
||||
}
|
||||
},
|
||||
isFocused() {
|
||||
@@ -108,12 +114,12 @@ function InternalTextInput(props) {
|
||||
@@ -108,12 +113,12 @@ function InternalTextInput(props) {
|
||||
},
|
||||
setSelection(start, end) {
|
||||
if (inputRef.current != null) {
|
||||
@@ -265,7 +300,7 @@ index 39bd607..f2b1d2f 100644
|
||||
const ref = useMergeRefs(setLocalRef, props.forwardedRef);
|
||||
const _onChange = event => {
|
||||
const currentText = event.nativeEvent.text;
|
||||
@@ -122,6 +128,7 @@ function InternalTextInput(props) {
|
||||
@@ -122,6 +127,7 @@ function InternalTextInput(props) {
|
||||
if (inputRef.current == null) {
|
||||
return;
|
||||
}
|
||||
@@ -273,6 +308,14 @@ index 39bd607..f2b1d2f 100644
|
||||
setLastNativeText(currentText);
|
||||
setMostRecentEventCount(event.nativeEvent.eventCount);
|
||||
};
|
||||
@@ -288,7 +294,6 @@ function InternalTextInput(props) {
|
||||
onPaste: _onPaste,
|
||||
onScroll: _onScroll,
|
||||
onSelectionChange: _onSelectionChange,
|
||||
- onSelectionChangeShouldSetResponder: emptyFunctionThatReturnsTrue,
|
||||
placeholder: placeholder,
|
||||
style: _style,
|
||||
text: text,
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/src/PasteInput.tsx b/node_modules/@mattermost/react-native-paste-input/src/PasteInput.tsx
|
||||
index 12befab..0d23ca5 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/src/PasteInput.tsx
|
||||
@@ -342,10 +385,19 @@ index 12befab..0d23ca5 100644
|
||||
// For Android, PasteTextInput already handles everything internally
|
||||
// Just need to adapt the onPaste callback format
|
||||
diff --git a/node_modules/@mattermost/react-native-paste-input/src/PasteTextInput.tsx b/node_modules/@mattermost/react-native-paste-input/src/PasteTextInput.tsx
|
||||
index dcc4a2b..1156458 100644
|
||||
index dcc4a2b..7d10e11 100644
|
||||
--- a/node_modules/@mattermost/react-native-paste-input/src/PasteTextInput.tsx
|
||||
+++ b/node_modules/@mattermost/react-native-paste-input/src/PasteTextInput.tsx
|
||||
@@ -84,6 +84,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
@@ -27,8 +27,6 @@ import usePressability from 'react-native/Libraries/Pressability/usePressability
|
||||
import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle';
|
||||
import nullthrows from 'nullthrows';
|
||||
|
||||
-const emptyFunctionThatReturnsTrue = () => true;
|
||||
-
|
||||
function useMergeRefs<Instance>(
|
||||
...refs: ReadonlyArray<React.ForwardedRef<Instance> | null | undefined>
|
||||
): (arg0: Instance | null) => void {
|
||||
@@ -84,6 +82,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
|
||||
const [mostRecentEventCount, setMostRecentEventCount] =
|
||||
React.useState<number>(0);
|
||||
@@ -353,7 +405,7 @@ index dcc4a2b..1156458 100644
|
||||
const [lastNativeText, setLastNativeText] = React.useState<
|
||||
string | undefined
|
||||
>(props.value);
|
||||
@@ -181,13 +182,24 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
@@ -181,13 +180,24 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
if (inputRef.current != null) {
|
||||
Commands.setTextAndSelection(
|
||||
inputRef.current,
|
||||
@@ -379,7 +431,7 @@ index dcc4a2b..1156458 100644
|
||||
isFocused(): boolean {
|
||||
return (
|
||||
TextInputState.currentlyFocusedInput() ===
|
||||
@@ -203,7 +215,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
@@ -203,7 +213,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
if (inputRef.current != null) {
|
||||
Commands.setTextAndSelection(
|
||||
inputRef.current,
|
||||
@@ -388,7 +440,7 @@ index dcc4a2b..1156458 100644
|
||||
null,
|
||||
start,
|
||||
end
|
||||
@@ -213,7 +225,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
@@ -213,7 +223,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
});
|
||||
}
|
||||
},
|
||||
@@ -397,7 +449,7 @@ index dcc4a2b..1156458 100644
|
||||
);
|
||||
|
||||
const ref = useMergeRefs<PasteTextInputInstance>(
|
||||
@@ -232,6 +244,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
@@ -232,6 +242,7 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -405,3 +457,11 @@ index dcc4a2b..1156458 100644
|
||||
setLastNativeText(currentText);
|
||||
setMostRecentEventCount(event.nativeEvent.eventCount);
|
||||
};
|
||||
@@ -445,7 +456,6 @@ function InternalTextInput(props: PasteInputProps): React.ReactNode {
|
||||
onPaste={_onPaste}
|
||||
onScroll={_onScroll}
|
||||
onSelectionChange={_onSelectionChange}
|
||||
- onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}
|
||||
placeholder={placeholder}
|
||||
style={_style}
|
||||
text={text}
|
||||
|
||||
@@ -0,0 +1,223 @@
|
||||
diff --git a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
|
||||
index daab0e3..d3a629c 100644
|
||||
--- a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
|
||||
+++ b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
|
||||
@@ -16214,12 +16214,21 @@ __DEV__ &&
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
- )
|
||||
- if (
|
||||
- (nativeEvent.changedTouches.forEach(recordTouchEnd),
|
||||
- (touchHistory.numberActiveTouches = nativeEvent.touches.length),
|
||||
- 1 === touchHistory.numberActiveTouches)
|
||||
- ) {
|
||||
+ ) {
|
||||
+ nativeEvent.changedTouches.forEach(recordTouchEnd);
|
||||
+ touchHistory.numberActiveTouches = nativeEvent.touches.length;
|
||||
+ if (0 === touchHistory.numberActiveTouches) {
|
||||
+ for (
|
||||
+ topLevelType = 0;
|
||||
+ topLevelType < touchBank.length;
|
||||
+ topLevelType++
|
||||
+ )
|
||||
+ if (
|
||||
+ ((nativeEvent = touchBank[topLevelType]),
|
||||
+ null != nativeEvent && nativeEvent.touchActive)
|
||||
+ )
|
||||
+ nativeEvent.touchActive = !1;
|
||||
+ } else if (1 === touchHistory.numberActiveTouches) {
|
||||
for (
|
||||
topLevelType = 0;
|
||||
topLevelType < touchBank.length;
|
||||
@@ -16236,6 +16245,7 @@ __DEV__ &&
|
||||
(null != topLevelType && topLevelType.touchActive) ||
|
||||
console.error("Cannot find single active touch.");
|
||||
}
|
||||
+ }
|
||||
},
|
||||
touchHistory: touchHistory
|
||||
},
|
||||
@@ -16314,12 +16324,18 @@ __DEV__ &&
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
) {
|
||||
- if (isStartish(topLevelType)) trackedTouchCount += 1;
|
||||
+ if (isStartish(topLevelType))
|
||||
+ trackedTouchCount =
|
||||
+ nativeEvent && Array.isArray(nativeEvent.touches)
|
||||
+ ? nativeEvent.touches.length
|
||||
+ : trackedTouchCount + 1;
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
)
|
||||
- if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
+ if (nativeEvent && Array.isArray(nativeEvent.touches))
|
||||
+ trackedTouchCount = nativeEvent.touches.length;
|
||||
+ else if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
else
|
||||
return (
|
||||
console.warn(
|
||||
diff --git a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
|
||||
index 2625bf6..3d85e32 100644
|
||||
--- a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
|
||||
+++ b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
|
||||
@@ -546,12 +546,21 @@ var instrumentationCallback,
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
- )
|
||||
- if (
|
||||
- (nativeEvent.changedTouches.forEach(recordTouchEnd),
|
||||
- (touchHistory.numberActiveTouches = nativeEvent.touches.length),
|
||||
- 1 === touchHistory.numberActiveTouches)
|
||||
- )
|
||||
+ ) {
|
||||
+ nativeEvent.changedTouches.forEach(recordTouchEnd);
|
||||
+ touchHistory.numberActiveTouches = nativeEvent.touches.length;
|
||||
+ if (0 === touchHistory.numberActiveTouches) {
|
||||
+ for (
|
||||
+ topLevelType = 0;
|
||||
+ topLevelType < touchBank.length;
|
||||
+ topLevelType++
|
||||
+ )
|
||||
+ if (
|
||||
+ ((nativeEvent = touchBank[topLevelType]),
|
||||
+ null != nativeEvent && nativeEvent.touchActive)
|
||||
+ )
|
||||
+ nativeEvent.touchActive = !1;
|
||||
+ } else if (1 === touchHistory.numberActiveTouches)
|
||||
for (
|
||||
topLevelType = 0;
|
||||
topLevelType < touchBank.length;
|
||||
@@ -564,6 +573,7 @@ var instrumentationCallback,
|
||||
touchHistory.indexOfSingleActiveTouch = topLevelType;
|
||||
break;
|
||||
}
|
||||
+ }
|
||||
},
|
||||
touchHistory: touchHistory
|
||||
};
|
||||
@@ -745,12 +755,18 @@ var ResponderEventPlugin = {
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
) {
|
||||
- if (isStartish(topLevelType)) trackedTouchCount += 1;
|
||||
+ if (isStartish(topLevelType))
|
||||
+ trackedTouchCount =
|
||||
+ nativeEvent && Array.isArray(nativeEvent.touches)
|
||||
+ ? nativeEvent.touches.length
|
||||
+ : trackedTouchCount + 1;
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
)
|
||||
- if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
+ if (nativeEvent && Array.isArray(nativeEvent.touches))
|
||||
+ trackedTouchCount = nativeEvent.touches.length;
|
||||
+ else if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
else return null;
|
||||
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent);
|
||||
if (
|
||||
diff --git a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-profiling.js b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-profiling.js
|
||||
index 544c754..4d5ec08 100644
|
||||
--- a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-profiling.js
|
||||
+++ b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-profiling.js
|
||||
@@ -611,12 +611,21 @@ var instrumentationCallback,
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
- )
|
||||
- if (
|
||||
- (nativeEvent.changedTouches.forEach(recordTouchEnd),
|
||||
- (touchHistory.numberActiveTouches = nativeEvent.touches.length),
|
||||
- 1 === touchHistory.numberActiveTouches)
|
||||
- )
|
||||
+ ) {
|
||||
+ nativeEvent.changedTouches.forEach(recordTouchEnd);
|
||||
+ touchHistory.numberActiveTouches = nativeEvent.touches.length;
|
||||
+ if (0 === touchHistory.numberActiveTouches) {
|
||||
+ for (
|
||||
+ topLevelType = 0;
|
||||
+ topLevelType < touchBank.length;
|
||||
+ topLevelType++
|
||||
+ )
|
||||
+ if (
|
||||
+ ((nativeEvent = touchBank[topLevelType]),
|
||||
+ null != nativeEvent && nativeEvent.touchActive)
|
||||
+ )
|
||||
+ nativeEvent.touchActive = !1;
|
||||
+ } else if (1 === touchHistory.numberActiveTouches)
|
||||
for (
|
||||
topLevelType = 0;
|
||||
topLevelType < touchBank.length;
|
||||
@@ -629,6 +638,7 @@ var instrumentationCallback,
|
||||
touchHistory.indexOfSingleActiveTouch = topLevelType;
|
||||
break;
|
||||
}
|
||||
+ }
|
||||
},
|
||||
touchHistory: touchHistory
|
||||
};
|
||||
@@ -810,12 +820,18 @@ var ResponderEventPlugin = {
|
||||
nativeEvent,
|
||||
nativeEventTarget
|
||||
) {
|
||||
- if (isStartish(topLevelType)) trackedTouchCount += 1;
|
||||
+ if (isStartish(topLevelType))
|
||||
+ trackedTouchCount =
|
||||
+ nativeEvent && Array.isArray(nativeEvent.touches)
|
||||
+ ? nativeEvent.touches.length
|
||||
+ : trackedTouchCount + 1;
|
||||
else if (
|
||||
"topTouchEnd" === topLevelType ||
|
||||
"topTouchCancel" === topLevelType
|
||||
)
|
||||
- if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
+ if (nativeEvent && Array.isArray(nativeEvent.touches))
|
||||
+ trackedTouchCount = nativeEvent.touches.length;
|
||||
+ else if (0 <= trackedTouchCount) --trackedTouchCount;
|
||||
else return null;
|
||||
ResponderTouchHistoryStore.recordTouchTrack(topLevelType, nativeEvent);
|
||||
if (
|
||||
diff --git a/node_modules/react-native/src/private/renderer/events/ReactNativeResponder.js b/node_modules/react-native/src/private/renderer/events/ReactNativeResponder.js
|
||||
index da29336..7167a2f 100644
|
||||
--- a/node_modules/react-native/src/private/renderer/events/ReactNativeResponder.js
|
||||
+++ b/node_modules/react-native/src/private/renderer/events/ReactNativeResponder.js
|
||||
@@ -560,9 +560,13 @@ export function processResponderEvent(
|
||||
): void {
|
||||
// Track touch count
|
||||
if (isStartish(topLevelType)) {
|
||||
- trackedTouchCount += 1;
|
||||
+ trackedTouchCount = Array.isArray(nativeEvent.touches)
|
||||
+ ? nativeEvent.touches.length
|
||||
+ : trackedTouchCount + 1;
|
||||
} else if (isEndish(topLevelType)) {
|
||||
- if (trackedTouchCount >= 0) {
|
||||
+ if (Array.isArray(nativeEvent.touches)) {
|
||||
+ trackedTouchCount = nativeEvent.touches.length;
|
||||
+ } else if (trackedTouchCount >= 0) {
|
||||
trackedTouchCount -= 1;
|
||||
} else {
|
||||
if (__DEV__) {
|
||||
diff --git a/node_modules/react-native/src/private/renderer/events/ResponderTouchHistoryStore.js b/node_modules/react-native/src/private/renderer/events/ResponderTouchHistoryStore.js
|
||||
index c0b4d12..b4aab95 100644
|
||||
--- a/node_modules/react-native/src/private/renderer/events/ResponderTouchHistoryStore.js
|
||||
+++ b/node_modules/react-native/src/private/renderer/events/ResponderTouchHistoryStore.js
|
||||
@@ -234,7 +234,14 @@ const ResponderTouchHistoryStore = {
|
||||
} else if (isEndish(topLevelType)) {
|
||||
nativeEvent.changedTouches.forEach(recordTouchEnd);
|
||||
touchHistory.numberActiveTouches = nativeEvent.touches.length;
|
||||
- if (touchHistory.numberActiveTouches === 1) {
|
||||
+ if (touchHistory.numberActiveTouches === 0) {
|
||||
+ for (let i = 0; i < touchBank.length; i++) {
|
||||
+ const touchTrackToCheck = touchBank[i];
|
||||
+ if (touchTrackToCheck != null && touchTrackToCheck.touchActive) {
|
||||
+ touchTrackToCheck.touchActive = false;
|
||||
+ }
|
||||
+ }
|
||||
+ } else if (touchHistory.numberActiveTouches === 1) {
|
||||
for (let i = 0; i < touchBank.length; i++) {
|
||||
const touchTrackToCheck = touchBank[i];
|
||||
if (touchTrackToCheck != null && touchTrackToCheck.touchActive) {
|
||||
@@ -152,92 +152,18 @@ index 8d78aea..b84d19e 100644
|
||||
viewGroup: ViewGroup,
|
||||
coords: FloatArray,
|
||||
diff --git a/node_modules/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt b/node_modules/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt
|
||||
index 629c155..2efd508 100644
|
||||
index 629c155..dc0790d 100644
|
||||
--- a/node_modules/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt
|
||||
+++ b/node_modules/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootHelper.kt
|
||||
@@ -19,7 +19,9 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
@@ -19,6 +19,7 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
private val jsGestureHandler: GestureHandler?
|
||||
val rootView: ViewGroup
|
||||
private var shouldIntercept = false
|
||||
+ private var wasIntercepting = false
|
||||
private var passingTouch = false
|
||||
+ private var lastTouch: MotionEvent? = null
|
||||
|
||||
init {
|
||||
UiThreadUtil.assertOnUiThread()
|
||||
@@ -47,6 +49,7 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
}
|
||||
|
||||
fun tearDown() {
|
||||
+ clearLastTouch()
|
||||
Log.i(
|
||||
ReactConstants.TAG,
|
||||
"[GESTURE HANDLER] Tearing down gesture handler registered for root view $rootView",
|
||||
@@ -90,17 +93,46 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
|
||||
override fun onCancel() {
|
||||
shouldIntercept = true
|
||||
- val time = SystemClock.uptimeMillis()
|
||||
- val event = MotionEvent.obtain(time, time, MotionEvent.ACTION_CANCEL, 0f, 0f, 0).apply {
|
||||
- action = MotionEvent.ACTION_CANCEL
|
||||
- }
|
||||
if (rootView is RootView) {
|
||||
- rootView.onChildStartedNativeGesture(rootView, event)
|
||||
+ val cancel = createReactCancelEvent()
|
||||
+ try {
|
||||
+ rootView.onChildStartedNativeGesture(rootView, cancel)
|
||||
+ } finally {
|
||||
+ cancel.recycle()
|
||||
+ clearLastTouch()
|
||||
+ }
|
||||
}
|
||||
- event.recycle()
|
||||
}
|
||||
}
|
||||
|
||||
+ private fun clearLastTouch() {
|
||||
+ lastTouch?.recycle()
|
||||
+ lastTouch = null
|
||||
+ }
|
||||
+
|
||||
+ private fun createReactCancelEvent(): MotionEvent {
|
||||
+ val now = SystemClock.uptimeMillis()
|
||||
+ val touch = lastTouch ?: return MotionEvent.obtain(now, now, MotionEvent.ACTION_CANCEL, 0f, 0f, 0)
|
||||
+ // The enclosing React root already dispatched this event before it reached the
|
||||
+ // gesture handler. A POINTER_UP is still in MotionEvent but already ended in JS.
|
||||
+ val lifted = if (touch.actionMasked == MotionEvent.ACTION_POINTER_UP) touch.actionIndex else -1
|
||||
+ val count = touch.pointerCount - if (lifted >= 0) 1 else 0
|
||||
+ val properties = Array(count) { MotionEvent.PointerProperties() }
|
||||
+ val coords = Array(count) { MotionEvent.PointerCoords() }
|
||||
+ var index = 0
|
||||
+ for (pointer in 0 until touch.pointerCount) {
|
||||
+ if (pointer == lifted) continue
|
||||
+ touch.getPointerProperties(pointer, properties[index])
|
||||
+ touch.getPointerCoords(pointer, coords[index])
|
||||
+ index++
|
||||
+ }
|
||||
+ return MotionEvent.obtain(
|
||||
+ touch.downTime, now, MotionEvent.ACTION_CANCEL, count, properties, coords,
|
||||
+ touch.metaState, touch.buttonState, touch.xPrecision, touch.yPrecision,
|
||||
+ touch.deviceId, touch.edgeFlags, touch.source, touch.flags,
|
||||
+ )
|
||||
+ }
|
||||
+
|
||||
fun requestDisallowInterceptTouchEvent() {
|
||||
// If this method gets called it means that some native view is attempting to grab lock for
|
||||
// touch event delivery. In that case we cancel all gesture recognizers
|
||||
@@ -115,9 +147,25 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
// We mark `mPassingTouch` before we get into `mOrchestrator.onTouchEvent` so that we can tell
|
||||
// if `requestDisallow` has been called as a result of a normal gesture handling process or
|
||||
// as a result of one of the gesture handlers activating
|
||||
+ // Keep the stream for recognizers that activate between events (e.g. long press).
|
||||
+ // Once native handling begins, React no longer receives the remaining touches.
|
||||
+ if (!event.isHoverAction() && (!shouldIntercept || event.actionMasked == MotionEvent.ACTION_DOWN)) {
|
||||
+ clearLastTouch()
|
||||
+ if (event.actionMasked != MotionEvent.ACTION_UP && event.actionMasked != MotionEvent.ACTION_CANCEL) {
|
||||
+ lastTouch = MotionEvent.obtainNoHistory(event)
|
||||
+ }
|
||||
+ }
|
||||
@@ -118,6 +119,14 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
|
||||
passingTouch = true
|
||||
orchestrator!!.onTouchEvent(event)
|
||||
passingTouch = false
|
||||
|
||||
@@ -789,6 +789,16 @@ export default function contribute(client: PluginClientContext) {
|
||||
| `params` | The params the screen was opened with, as string keys and values. `{}` when none. |
|
||||
| `navigation` | Optional client navigation. `openAgent({ agentId, serverId? })` and `openWorkspace({ workspaceId, serverId? })` open targets on `serverId`, or on the selected host when omitted. `openBrowser({ url, workspaceId, serverId? })` is available only on Electron; see [links and browsers](#external-links-and-workspace-browsers). |
|
||||
|
||||
If `navigation?.supportsFocusHost` is true, pass `focusHost: true` to `openAgent` or `openWorkspace`.
|
||||
Paseo selects only the destination host in the workspace sidebar, clears the project and label
|
||||
filters, and keeps the grouping mode. Omit the option to preserve the existing filters.
|
||||
|
||||
```ts
|
||||
if (navigation?.supportsFocusHost) {
|
||||
navigation.openAgent({ agentId, serverId, focusHost: true });
|
||||
}
|
||||
```
|
||||
|
||||
Paseo owns the route, header, close action, host picker, error boundary, and query client. The plugin owns the screen body.
|
||||
|
||||
`addScreen({ id, title, Component })` registers a screen. `title` is the screen header's title: a
|
||||
|
||||
@@ -82,6 +82,17 @@ const patchedPackages = [
|
||||
patchPrefix: "react-native-svg+",
|
||||
cwd: "packages/app",
|
||||
},
|
||||
// Reconcile ResponderEventPlugin trackedTouchCount and ResponderTouchHistoryStore touchBank with
|
||||
// nativeEvent.touches.length so an unmatched touch start or single-pointer synthetic cancel
|
||||
// (e.g. Modal dismiss while touching, RNGH pinch takeover, or double ACTION_DOWN in
|
||||
// ReactRootView/ReactModalHostView) self-heals instead of leaving trackedTouchCount > 0 or stale
|
||||
// active contacts in touchBank. Remove once upstream React/React Native reconciles both.
|
||||
{
|
||||
nodeModulesPath: "node_modules/react-native",
|
||||
patchPrefix: "react-native+",
|
||||
},
|
||||
// Keep Android PasteTextInput aligned with RN AndroidTextInput (omit iOS-only
|
||||
// onSelectionChangeShouldSetResponder), plus ref/eventCount/trailing-newline fixes.
|
||||
{
|
||||
nodeModulesPath: "node_modules/@mattermost/react-native-paste-input",
|
||||
patchPrefix: "@mattermost+react-native-paste-input+",
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
||||
import { createRequire } from "node:module";
|
||||
import { tmpdir } from "node:os";
|
||||
import path from "node:path";
|
||||
import { test } from "node:test";
|
||||
import vm from "node:vm";
|
||||
|
||||
const script = path.resolve("scripts", "postinstall-patches.mjs");
|
||||
const bin = path.resolve("node_modules", ".bin");
|
||||
@@ -134,3 +136,290 @@ test("a missing patch-package fails the install and leaves the package in place"
|
||||
rmSync(root, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
function loadReactFabricDispatchEvent(bundleName, isDev) {
|
||||
const bundlePath = path.resolve(
|
||||
"node_modules/react-native/Libraries/Renderer/implementations",
|
||||
bundleName,
|
||||
);
|
||||
const code = readFileSync(bundlePath, "utf8");
|
||||
const nodeRequire = createRequire(import.meta.url);
|
||||
let dispatchEvent = null;
|
||||
const warnings = [];
|
||||
const rawEventListeners = new Map();
|
||||
|
||||
const nativeFabricUIManager = {
|
||||
createNode: () => ({}),
|
||||
cloneNodeWithNewChildren: () => ({}),
|
||||
cloneNodeWithNewChildrenAndProps: () => ({}),
|
||||
cloneNodeWithNewProps: () => ({}),
|
||||
createChildSet: () => ({}),
|
||||
appendChild: () => {},
|
||||
appendChildToSet: () => {},
|
||||
completeRoot: () => {},
|
||||
registerEventHandler: (fn) => {
|
||||
dispatchEvent = fn;
|
||||
},
|
||||
setIsJSResponder: () => {},
|
||||
clearIsJSResponder: () => {},
|
||||
unstable_DiscreteEventPriority: 1,
|
||||
unstable_ContinuousEventPriority: 2,
|
||||
unstable_IdleEventPriority: 3,
|
||||
unstable_getCurrentEventPriority: () => 1,
|
||||
};
|
||||
|
||||
const privateInterface = {
|
||||
ReactNativeViewConfigRegistry: {
|
||||
get: () => ({}),
|
||||
customBubblingEventTypes: {
|
||||
topTouchStart: {
|
||||
phasedRegistrationNames: { bubbled: "onTouchStart", captured: "onTouchStartCapture" },
|
||||
},
|
||||
topTouchMove: {
|
||||
phasedRegistrationNames: { bubbled: "onTouchMove", captured: "onTouchMoveCapture" },
|
||||
},
|
||||
topTouchEnd: {
|
||||
phasedRegistrationNames: { bubbled: "onTouchEnd", captured: "onTouchEndCapture" },
|
||||
},
|
||||
topTouchCancel: {
|
||||
phasedRegistrationNames: { bubbled: "onTouchCancel", captured: "onTouchCancelCapture" },
|
||||
},
|
||||
topSelectionChange: {
|
||||
phasedRegistrationNames: {
|
||||
bubbled: "onSelectionChange",
|
||||
captured: "onSelectionChangeCapture",
|
||||
},
|
||||
},
|
||||
},
|
||||
customDirectEventTypes: {},
|
||||
},
|
||||
RawEventEmitter: {
|
||||
emit: (name, payload) => {
|
||||
for (const fn of rawEventListeners.get(name) ?? []) {
|
||||
fn(payload);
|
||||
}
|
||||
},
|
||||
},
|
||||
UIManager: {},
|
||||
deepDiffer: () => false,
|
||||
flattenStyle: (s) => s,
|
||||
getNativeTagFromPublicInstance: () => null,
|
||||
getNodeFromPublicInstance: () => null,
|
||||
legacySendAccessibilityEvent: () => {},
|
||||
createPublicInstance: (tag) => ({ _nativeTag: tag }),
|
||||
createPublicTextInstance: () => ({}),
|
||||
ReactFiberErrorDialog: { showErrorDialog: () => true },
|
||||
Platform: { OS: "android" },
|
||||
};
|
||||
|
||||
const customRequire = (id) => {
|
||||
if (id === "react") {
|
||||
return nodeRequire("react");
|
||||
}
|
||||
if (id === "scheduler") {
|
||||
return nodeRequire("scheduler");
|
||||
}
|
||||
if (id === "react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore") {
|
||||
return {};
|
||||
}
|
||||
if (id === "react-native/Libraries/ReactPrivate/ReactNativePrivateInterface") {
|
||||
return privateInterface;
|
||||
}
|
||||
return nodeRequire(id);
|
||||
};
|
||||
|
||||
const moduleObj = { exports: {} };
|
||||
const sandbox = {
|
||||
__DEV__: isDev,
|
||||
console: {
|
||||
...console,
|
||||
warn: (...args) => warnings.push(args.join(" ")),
|
||||
error: (...args) => warnings.push(args.join(" ")),
|
||||
},
|
||||
exports: moduleObj.exports,
|
||||
module: moduleObj,
|
||||
nativeFabricUIManager,
|
||||
performance,
|
||||
queueMicrotask,
|
||||
require: customRequire,
|
||||
setTimeout,
|
||||
clearTimeout,
|
||||
};
|
||||
sandbox.global = sandbox;
|
||||
sandbox.globalThis = sandbox;
|
||||
|
||||
vm.runInNewContext(code, sandbox, { filename: bundleName });
|
||||
assert.equal(
|
||||
typeof dispatchEvent,
|
||||
"function",
|
||||
`Expected ${bundleName} to register dispatchEvent`,
|
||||
);
|
||||
return { dispatchEvent, warnings };
|
||||
}
|
||||
|
||||
function createHostFiber(type, props, parent = null) {
|
||||
const publicInstance = { _nativeTag: Math.floor(Math.random() * 100000) + 1 };
|
||||
return {
|
||||
tag: 5,
|
||||
type,
|
||||
return: parent,
|
||||
alternate: null,
|
||||
stateNode: {
|
||||
canonical: {
|
||||
currentProps: props,
|
||||
publicInstance,
|
||||
publicInstanceType: 0,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function makeTouch(identifier, timestamp) {
|
||||
return {
|
||||
identifier,
|
||||
target: 1,
|
||||
pageX: 100,
|
||||
pageY: 100,
|
||||
locationX: 10,
|
||||
locationY: 10,
|
||||
timestamp,
|
||||
};
|
||||
}
|
||||
|
||||
for (const [bundleName, isDev] of [
|
||||
["ReactFabric-dev.js", true],
|
||||
["ReactFabric-prod.js", false],
|
||||
["ReactFabric-profiling.js", false],
|
||||
]) {
|
||||
test(`${bundleName} reconciles trackedTouchCount from nativeEvent.touches after a dropped touch end`, () => {
|
||||
const { dispatchEvent, warnings } = loadReactFabricDispatchEvent(bundleName, isDev);
|
||||
const rootFiber = createHostFiber("RCTView", {});
|
||||
let inputGrants = 0;
|
||||
let buttonGrants = 0;
|
||||
const inputFiber = createHostFiber(
|
||||
"PasteTextInput",
|
||||
{
|
||||
onSelectionChangeShouldSetResponder: () => true,
|
||||
onResponderGrant: () => {
|
||||
inputGrants += 1;
|
||||
},
|
||||
},
|
||||
rootFiber,
|
||||
);
|
||||
const buttonFiber = createHostFiber(
|
||||
"RCTView",
|
||||
{
|
||||
onStartShouldSetResponder: () => true,
|
||||
onResponderGrant: () => {
|
||||
buttonGrants += 1;
|
||||
},
|
||||
},
|
||||
rootFiber,
|
||||
);
|
||||
|
||||
// 1. Unmatched touch start (e.g. Modal dismissed while touch is down or double ACTION_DOWN).
|
||||
const orphanTouch = makeTouch(0, 1);
|
||||
dispatchEvent(rootFiber, "topTouchStart", {
|
||||
touches: [orphanTouch],
|
||||
changedTouches: [orphanTouch],
|
||||
});
|
||||
|
||||
// 2. Subsequent normal tap completes with zero remaining native touches.
|
||||
const tapTouch = makeTouch(1, 2);
|
||||
dispatchEvent(inputFiber, "topTouchStart", {
|
||||
touches: [tapTouch],
|
||||
changedTouches: [tapTouch],
|
||||
});
|
||||
dispatchEvent(inputFiber, "topTouchEnd", {
|
||||
touches: [],
|
||||
changedTouches: [tapTouch],
|
||||
});
|
||||
|
||||
// 3. Typing triggers topSelectionChange. With trackedTouchCount reconciled to 0,
|
||||
// the input must not claim responder and swallow the next tap on a sibling button.
|
||||
dispatchEvent(inputFiber, "topSelectionChange", {
|
||||
selection: { start: 1, end: 1 },
|
||||
});
|
||||
assert.equal(
|
||||
inputGrants,
|
||||
0,
|
||||
"topSelectionChange must not claim responder when no touches are active",
|
||||
);
|
||||
|
||||
// 4. First tap on sibling send button must be granted immediately.
|
||||
const sendTouch = makeTouch(2, 3);
|
||||
dispatchEvent(buttonFiber, "topTouchStart", {
|
||||
touches: [sendTouch],
|
||||
changedTouches: [sendTouch],
|
||||
});
|
||||
dispatchEvent(buttonFiber, "topTouchEnd", {
|
||||
touches: [],
|
||||
changedTouches: [sendTouch],
|
||||
});
|
||||
assert.equal(buttonGrants, 1, "first tap on sibling button must receive responder grant");
|
||||
|
||||
// 5. Two-finger gesture cancelled by a single synthetic topTouchCancel (e.g. RNGH pinch takeover)
|
||||
// must reconcile trackedTouchCount to 0 and mark every touchBank contact inactive before
|
||||
// onResponderTerminate runs.
|
||||
let terminatedHistory = null;
|
||||
const gestureFiber = createHostFiber(
|
||||
"RCTView",
|
||||
{
|
||||
onStartShouldSetResponder: () => true,
|
||||
onResponderTerminate: (event) => {
|
||||
terminatedHistory = {
|
||||
numberActiveTouches: event.touchHistory.numberActiveTouches,
|
||||
activeBankIds: Array.from(event.touchHistory.touchBank, (record, index) =>
|
||||
record?.touchActive ? index : -1,
|
||||
).filter((index) => index >= 0),
|
||||
};
|
||||
},
|
||||
},
|
||||
rootFiber,
|
||||
);
|
||||
const p0 = makeTouch(3, 4);
|
||||
const p1 = makeTouch(4, 5);
|
||||
dispatchEvent(gestureFiber, "topTouchStart", { touches: [p0], changedTouches: [p0] });
|
||||
dispatchEvent(gestureFiber, "topTouchStart", { touches: [p0, p1], changedTouches: [p1] });
|
||||
dispatchEvent(gestureFiber, "topTouchCancel", { touches: [], changedTouches: [p0] });
|
||||
assert.deepEqual(terminatedHistory, {
|
||||
numberActiveTouches: 0,
|
||||
activeBankIds: [],
|
||||
});
|
||||
dispatchEvent(inputFiber, "topSelectionChange", { selection: { start: 2, end: 2 } });
|
||||
assert.equal(
|
||||
inputGrants,
|
||||
0,
|
||||
"single topTouchCancel after 2-finger touch must reset trackedTouchCount to 0",
|
||||
);
|
||||
|
||||
// 6. Multi-touch cancel emitting two topTouchCancel events with touches: [] must stay at 0 without warning.
|
||||
const t0 = makeTouch(5, 6);
|
||||
const t1 = makeTouch(6, 7);
|
||||
dispatchEvent(rootFiber, "topTouchStart", { touches: [t0], changedTouches: [t0] });
|
||||
dispatchEvent(rootFiber, "topTouchStart", { touches: [t0, t1], changedTouches: [t1] });
|
||||
dispatchEvent(rootFiber, "topTouchCancel", { touches: [], changedTouches: [t0, t1] });
|
||||
dispatchEvent(rootFiber, "topTouchCancel", { touches: [], changedTouches: [t0, t1] });
|
||||
dispatchEvent(inputFiber, "topSelectionChange", { selection: { start: 3, end: 3 } });
|
||||
assert.equal(inputGrants, 0, "multi-touch cancel must leave trackedTouchCount at 0");
|
||||
assert.deepEqual(
|
||||
warnings.filter((w) => w.includes("trackedTouchCount")),
|
||||
[],
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
test("patched @mattermost/react-native-paste-input Android PasteTextInput does not claim responder on selection change", () => {
|
||||
for (const relPath of [
|
||||
"node_modules/@mattermost/react-native-paste-input/src/PasteTextInput.tsx",
|
||||
"node_modules/@mattermost/react-native-paste-input/lib/commonjs/PasteTextInput.js",
|
||||
"node_modules/@mattermost/react-native-paste-input/lib/module/PasteTextInput.js",
|
||||
]) {
|
||||
const source = readFileSync(path.resolve(relPath), "utf8");
|
||||
assert.equal(
|
||||
source.includes("onSelectionChangeShouldSetResponder"),
|
||||
false,
|
||||
`${relPath} must not set onSelectionChangeShouldSetResponder (matches RN AndroidTextInput)`,
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user