) : null}
{coalescedMessages.map((message) => {
@@ -883,7 +883,7 @@ export const Transcript = memo(function Transcript({
aria-hidden={!showJumpToLatest}
tabIndex={showJumpToLatest ? 0 : -1}
onClick={jumpToLatest}
- className={`absolute bottom-4 left-1/2 z-20 grid h-9 w-9 -translate-x-1/2 place-items-center rounded-full border border-border bg-muted/95 text-foreground/75 shadow-md backdrop-blur transition-[opacity,transform,background-color] duration-200 ease-[cubic-bezier(.22,1,.36,1)] hover:bg-border motion-reduce:transition-none ${
+ className={`absolute bottom-24 left-1/2 z-20 grid h-9 w-9 -translate-x-1/2 place-items-center rounded-full border border-border bg-muted/95 text-foreground/75 shadow-md backdrop-blur transition-[opacity,transform,background-color] duration-200 ease-[cubic-bezier(.22,1,.36,1)] hover:bg-border md:bottom-28 motion-reduce:transition-none ${
showJumpToLatest
? "translate-y-0 opacity-100"
: "pointer-events-none translate-y-2 opacity-0"
@@ -896,7 +896,7 @@ export const Transcript = memo(function Transcript({
type="button"
data-testid="needs-you-jump"
onClick={jumpToAsk}
- className="absolute bottom-4 left-1/2 z-20 inline-flex h-9 -translate-x-1/2 items-center gap-1.5 rounded-full border border-border bg-muted/95 px-3.5 text-ui-body-sm font-medium text-foreground shadow-md backdrop-blur hover:bg-border"
+ className="absolute bottom-24 left-1/2 z-20 inline-flex h-9 -translate-x-1/2 items-center gap-1.5 rounded-full border border-border bg-muted/95 px-3.5 text-ui-body-sm font-medium text-foreground shadow-md backdrop-blur hover:bg-border md:bottom-28"
>
{t`Needs you`}
diff --git a/apps/web/src/pages/shell/use-shell-sounds.ts b/apps/web/src/pages/shell/use-shell-sounds.ts
index 66e89ec..5c4dc71 100644
--- a/apps/web/src/pages/shell/use-shell-sounds.ts
+++ b/apps/web/src/pages/shell/use-shell-sounds.ts
@@ -1,9 +1,11 @@
import type { Bot, ThreadSnapshot } from "@rakazo/contracts";
import { useEffect, useRef } from "react";
+import { ooAudioBus } from "../../lib/oo-audio-bus";
import { wireOoAudioVoiceDucking } from "../../lib/oo-audio-voice-wire";
import { ooSound } from "../../lib/oo-sound";
import { ooVocals } from "../../lib/oo-vocals";
import { ooVoiceMark } from "../../lib/oo-voice-mark";
+import { speaker } from "../../lib/tts";
export type ShellSoundsInput = {
bots: Bot[];
@@ -27,8 +29,25 @@ export function useShellSounds({
const seenHandoffKeys = useRef(new Set());
const appSoundStarted = useRef(false);
const prevBotStatuses = useRef(new Map());
+ const prevThreadId = useRef(null);
+ const prevBotMsgCount = useRef(0);
- useEffect(() => wireOoAudioVoiceDucking(), []);
+ useEffect(() => {
+ ooAudioBus.bindGestureUnlock();
+ return wireOoAudioVoiceDucking();
+ }, []);
+
+ useEffect(() => {
+ let prevStatus = speaker.state.status;
+ return speaker.subscribe((state) => {
+ if (prevStatus !== "speaking" && state.status === "speaking" && !callOpen) {
+ ooSound.play("speaking-start");
+ } else if (prevStatus === "speaking" && state.status === "idle" && !callOpen) {
+ ooSound.play("speaking-done");
+ }
+ prevStatus = state.status;
+ });
+ }, [callOpen]);
useEffect(() => {
if (appSoundStarted.current) return;
@@ -37,6 +56,23 @@ export function useShellSounds({
window.setTimeout(() => ooVoiceMark.maybePlayColdOpen(), 280);
}, []);
+ useEffect(() => {
+ const threadId = activeSnapshot?.threadId ?? null;
+ if (!threadId) return;
+ if (prevThreadId.current && prevThreadId.current !== threadId) {
+ ooSound.play("interact");
+ ooVocals.reactForEvent("nod");
+ prevBotMsgCount.current = (activeSnapshot?.messages ?? []).filter(
+ (m) => m.role === "bot",
+ ).length;
+ } else if (!prevThreadId.current) {
+ prevBotMsgCount.current = (activeSnapshot?.messages ?? []).filter(
+ (m) => m.role === "bot",
+ ).length;
+ }
+ prevThreadId.current = threadId;
+ }, [activeSnapshot?.threadId, activeSnapshot?.messages]);
+
useEffect(() => {
for (const bot of bots) {
const prev = prevBotStatuses.current.get(bot.id);
@@ -52,13 +88,27 @@ export function useShellSounds({
}, [bots]);
useEffect(() => {
- if (prevTranscriptRunning.current && !transcriptRunning && !callOpen) {
+ if (!prevTranscriptRunning.current && transcriptRunning && !callOpen) {
+ ooSound.play("listening-stop");
+ ooVocals.reactForEvent("curious");
+ } else if (prevTranscriptRunning.current && !transcriptRunning && !callOpen) {
ooSound.play("success-resolve");
ooVocals.reactForEvent("success");
}
prevTranscriptRunning.current = transcriptRunning;
}, [transcriptRunning, callOpen]);
+ useEffect(() => {
+ const botMsgs = (activeSnapshot?.messages ?? []).filter((m) => m.role === "bot").length;
+ if (prevThreadId.current === (activeSnapshot?.threadId ?? null) && botMsgs > prevBotMsgCount.current) {
+ if (transcriptRunning && !callOpen) {
+ ooSound.play("interact");
+ ooVocals.react("mhm");
+ }
+ }
+ prevBotMsgCount.current = botMsgs;
+ }, [activeSnapshot?.messages, activeSnapshot?.threadId, transcriptRunning, callOpen]);
+
useEffect(() => {
const runId = displayedRunErrorId;
if (runId && runId !== prevRunErrorId.current) {
diff --git a/apps/web/src/styles.css b/apps/web/src/styles.css
index 06cd2e3..b01209c 100644
--- a/apps/web/src/styles.css
+++ b/apps/web/src/styles.css
@@ -34,15 +34,25 @@ body,
}
.apple-island {
- backdrop-filter: blur(36px) saturate(210%);
- -webkit-backdrop-filter: blur(36px) saturate(210%);
- background: transparent;
+ backdrop-filter: blur(16px) saturate(180%);
+ -webkit-backdrop-filter: blur(16px) saturate(180%);
+ background: color-mix(in srgb, var(--background) 22%, transparent);
border: 1px solid color-mix(in srgb, var(--foreground) 13%, transparent);
box-shadow:
0 18px 44px -8px rgba(0, 0, 0, 0.75),
inset 0 1px 0 rgba(255, 255, 255, 0.16);
}
+.composer-bottom-fade {
+ background: linear-gradient(
+ to top,
+ var(--background) 0%,
+ color-mix(in srgb, var(--background) 78%, transparent) 32%,
+ color-mix(in srgb, var(--background) 32%, transparent) 68%,
+ transparent 100%
+ );
+}
+
.apple-glass-card {
backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(20px);
diff --git a/packages/adapters/src/git-shell-policy.test.ts b/packages/adapters/src/git-shell-policy.test.ts
index db21b2a..15a6669 100644
--- a/packages/adapters/src/git-shell-policy.test.ts
+++ b/packages/adapters/src/git-shell-policy.test.ts
@@ -45,4 +45,23 @@ describe("git shell policy", () => {
it("parses refspec destinations", () => {
expect(parseGitPushRef("git push origin HEAD:feature/x")).toBe("feature/x");
});
+
+ it("evaluates multiline gh pr create commands with long markdown bodies in linear time", () => {
+ const command = [
+ "cd /home/rakazo/project && gh pr create --repo owner/repo \\",
+ " --base main \\",
+ " --head feature/domain-migration \\",
+ ' --title "chore: migrate domain" \\',
+ ` --body "${"## Section\n\n- bullet item with words and details\n".repeat(40)}" 2>&1`,
+ ].join("\n");
+ const started = performance.now();
+ expect(
+ evaluateGitShellPolicy({
+ command,
+ defaultBranch: "main",
+ gitPushApprovedThisRun: false,
+ }),
+ ).toMatchObject({ action: "require_approval" });
+ expect(performance.now() - started).toBeLessThan(50);
+ });
});
diff --git a/packages/adapters/src/kokoro-voice.ts b/packages/adapters/src/kokoro-voice.ts
index b3097fa..8dd8f59 100644
--- a/packages/adapters/src/kokoro-voice.ts
+++ b/packages/adapters/src/kokoro-voice.ts
@@ -9,7 +9,10 @@ import type {
VoiceVerifyResult,
} from "@rakazo/adapter-kit";
import { formatVoiceLabel } from "@rakazo/core";
-import { listPiperVoices, synthesizePiper } from "./piper-voice.js";
+import { listPiperVoices, PIPER_MODELS, piperBaseUrl, synthesizePiper } from "./piper-voice.js";
+
+const GERMAN_TEXT_RE =
+ /[äöüß]|(?:\b(?:und|der|die|das|ist|nicht|für|mit|den|dem|des|ein|eine|ich|wir|hier|bitte|oder|hallo|projekt|habe|sind|wird)\b)/i;
import {
readVoiceAudio,
readVoiceJson,
@@ -112,7 +115,16 @@ export class KokoroVoiceProvider implements VoiceProvider {
async synthesize(request: VoiceSynthesizeRequest, context: AdapterContext): Promise {
const signal = voiceDeadline(request.signal ?? context.signal, 120_000);
- const piper = await synthesizePiper(request.voiceId, request.text, signal);
+ const effectiveVoiceId =
+ request.voiceId &&
+ !PIPER_MODELS[request.voiceId] &&
+ piperBaseUrl() &&
+ GERMAN_TEXT_RE.test(request.text)
+ ? /^[ab]m_/i.test(request.voiceId)
+ ? "dm_thorsten"
+ : "df_eva"
+ : request.voiceId;
+ const piper = await synthesizePiper(effectiveVoiceId, request.text, signal);
if (piper) return piper;
let res: Response;
try {
diff --git a/packages/adapters/src/piper-voice.ts b/packages/adapters/src/piper-voice.ts
index fcea4d1..5b1f96f 100644
--- a/packages/adapters/src/piper-voice.ts
+++ b/packages/adapters/src/piper-voice.ts
@@ -11,10 +11,15 @@ export const PIPER_MODELS: Record = {
dm_karlsson: "de_DE-karlsson-low",
};
-/** Piper runs only where configured, so a server without it skips the request entirely. */
+/** Piper runs on 127.0.0.1:5150 by default outside unit tests, or at PIPER_BASE_URL. */
export function piperBaseUrl(): string | undefined {
- const raw = process.env.PIPER_BASE_URL?.trim();
- return raw ? raw.replace(/\/+$/, "") : undefined;
+ const raw = process.env.PIPER_BASE_URL;
+ if (raw !== undefined) {
+ const trimmed = raw.trim();
+ return trimmed ? trimmed.replace(/\/+$/, "") : undefined;
+ }
+ if (process.env.VITEST || process.env.NODE_ENV === "test") return undefined;
+ return "http://127.0.0.1:5150";
}
export function piperUnreachable(): string {
@@ -61,5 +66,7 @@ export async function synthesizePiper(
throw new Error(piperUnreachable());
}
await requireOk(res, "Local voice", "speaking");
- return { bytes: await readVoiceAudio(res, signal), mimeType: "audio/wav" };
+ const contentType = res.headers.get("content-type");
+ const mimeType = contentType?.startsWith("audio/mpeg") ? "audio/mpeg" : "audio/wav";
+ return { bytes: await readVoiceAudio(res, signal), mimeType };
}
diff --git a/packages/core/src/action-approval.test.ts b/packages/core/src/action-approval.test.ts
index bc1674d..a81667a 100644
--- a/packages/core/src/action-approval.test.ts
+++ b/packages/core/src/action-approval.test.ts
@@ -1,9 +1,11 @@
import { describe, expect, it } from "vitest";
+import type { ActionApprovalRule } from "./action-approval.js";
import {
- type ActionApprovalRule,
applyJudgeDecision,
+ classifyApprovalRiskTier,
connectorKindFromToolName,
connectorToolRequiresApproval,
+ groupApprovalRequests,
isApprovalAskBlock,
isSecretAskBlock,
planActionGate,
@@ -120,6 +122,52 @@ describe("isApprovalAskBlock", () => {
}),
).toBe(false);
});
+
+ it("batches pending approvals by connector and risk tier while deduplicating identical effect keys", () => {
+ expect(classifyApprovalRiskTier("create_space", false)).toBe("explicit_security");
+ expect(classifyApprovalRiskTier("github_create_issue", true)).toBe("consequential_write");
+ expect(classifyApprovalRiskTier("github_get_issue", true)).toBe("standard");
+
+ const batches = groupApprovalRequests([
+ {
+ id: "req-1",
+ toolName: "github_create_issue",
+ viaConnector: true,
+ effectKey: "issue:bug-42",
+ },
+ {
+ id: "req-2",
+ toolName: "github_create_issue",
+ viaConnector: true,
+ effectKey: "issue:bug-42",
+ },
+ {
+ id: "req-3",
+ toolName: "github_add_comment",
+ viaConnector: true,
+ effectKey: "comment:bug-42",
+ },
+ {
+ id: "req-4",
+ toolName: "create_space",
+ viaConnector: false,
+ },
+ ]);
+
+ expect(batches).toHaveLength(2);
+ expect(batches[0]).toMatchObject({
+ groupKey: "github:consequential_write",
+ connectorKind: "github",
+ riskTier: "consequential_write",
+ deduplicatedCount: 1,
+ });
+ expect(batches[0]?.items.map((item) => item.id)).toEqual(["req-1", "req-3"]);
+ expect(batches[1]).toMatchObject({
+ groupKey: "create:explicit_security",
+ riskTier: "explicit_security",
+ deduplicatedCount: 0,
+ });
+ });
});
describe("isSecretAskBlock", () => {
diff --git a/packages/core/src/action-approval.ts b/packages/core/src/action-approval.ts
index 3c2fddb..03ed713 100644
--- a/packages/core/src/action-approval.ts
+++ b/packages/core/src/action-approval.ts
@@ -248,3 +248,80 @@ export function isApprovalAskBlock(block: {
[...actionIds].every((id) => id === "allow" || id === "always" || id === "deny")
);
}
+
+export type ApprovalRiskTier = "explicit_security" | "consequential_write" | "standard";
+
+export type PendingApprovalCandidate = {
+ id: string;
+ toolName: string;
+ viaConnector: boolean;
+ connectorKind?: string;
+ effectKey?: string;
+};
+
+export type ApprovalBatchGroup = {
+ groupKey: string;
+ connectorKind: string;
+ riskTier: ApprovalRiskTier;
+ items: PendingApprovalCandidate[];
+ deduplicatedCount: number;
+};
+
+export function classifyApprovalRiskTier(
+ toolName: string,
+ viaConnector: boolean,
+): ApprovalRiskTier {
+ if (toolRequiresExplicitApproval(toolName)) return "explicit_security";
+ if (toolRequiresApproval(toolName, viaConnector)) return "consequential_write";
+ return "standard";
+}
+
+/**
+ * Groups and deduplicates pending tool approval requests by connector and risk tier so the user
+ * can review related actions in a single coherent batch rather than repetitive interruptions.
+ */
+export function groupApprovalRequests(
+ candidates: readonly PendingApprovalCandidate[],
+ connectorKinds: string[] = [],
+): ApprovalBatchGroup[] {
+ const groups = new Map();
+
+ for (const candidate of candidates) {
+ const connectorKind = (
+ candidate.connectorKind ?? connectorKindFromToolName(candidate.toolName, connectorKinds)
+ ).toLowerCase();
+ const riskTier = classifyApprovalRiskTier(candidate.toolName, candidate.viaConnector);
+ const groupKey = `${connectorKind}:${riskTier}`;
+
+ let group = groups.get(groupKey);
+ if (!group) {
+ group = {
+ groupKey,
+ connectorKind,
+ riskTier,
+ items: [],
+ deduplicatedCount: 0,
+ };
+ groups.set(groupKey, group);
+ }
+
+ const dedupeKey = candidate.effectKey?.trim()
+ ? `${candidate.toolName.toLowerCase()}::${candidate.effectKey.trim()}`
+ : null;
+ const isDuplicate =
+ dedupeKey !== null &&
+ group.items.some(
+ (existing) =>
+ existing.toolName.toLowerCase() === candidate.toolName.toLowerCase() &&
+ existing.effectKey?.trim() === candidate.effectKey?.trim(),
+ );
+
+ if (isDuplicate) {
+ group.deduplicatedCount += 1;
+ } else {
+ group.items.push(candidate);
+ }
+ }
+
+ return [...groups.values()];
+}
diff --git a/packages/core/src/attachments.test.ts b/packages/core/src/attachments.test.ts
index 22ae382..4ede9f6 100644
--- a/packages/core/src/attachments.test.ts
+++ b/packages/core/src/attachments.test.ts
@@ -3,6 +3,7 @@ import {
AttachmentValidationError,
attachmentsForBot,
blocksToAgentHistoryText,
+ compactAgentHistoryMessages,
decodeAttachmentBase64,
inferAttachmentMimeType,
messageBlockForArtifact,
@@ -102,6 +103,46 @@ describe("attachment helpers", () => {
expect(attachmentsForBot(attachments, "bot-two")).toEqual([attachments[1]]);
expect(attachmentsForBot(attachments, undefined)).toEqual([]);
});
+
+ it("compacts older history messages while keeping recent messages and artifact IDs intact", () => {
+ const longText = "A".repeat(400);
+ const history = compactAgentHistoryMessages(
+ [
+ {
+ id: "m-old",
+ role: "bot",
+ blocks: [
+ { kind: "text", text: longText },
+ {
+ kind: "task",
+ taskId: "t-1",
+ assigneeBotId: "b-2",
+ assigneeBotName: "Researcher",
+ title: "Deep scan",
+ text: "Long task brief that is already finished",
+ status: "done",
+ hop: 1,
+ },
+ { kind: "image", artifactId: "art-keep", mimeType: "image/png", name: "diagram.png" },
+ ],
+ },
+ {
+ id: "m-recent",
+ role: "user",
+ blocks: [{ kind: "text", text: longText }],
+ },
+ ],
+ { keepRecentFull: 1, maxOlderTextChars: 80 },
+ );
+
+ expect(history[0]?.compacted).toBe(true);
+ expect(history[0]?.text).toContain("[…compacted…]");
+ expect(history[0]?.text).toContain("[task for Researcher: Deep scan (done)]");
+ expect(history[0]?.text).not.toContain("Long task brief that is already finished");
+ expect(history[0]?.text).toContain("(artifact art-keep)");
+ expect(history[1]?.compacted).toBe(false);
+ expect(history[1]?.text).toBe(longText);
+ });
});
describe("peer message history", () => {
diff --git a/packages/core/src/attachments.ts b/packages/core/src/attachments.ts
index c2751cd..d73e2ae 100644
--- a/packages/core/src/attachments.ts
+++ b/packages/core/src/attachments.ts
@@ -262,3 +262,61 @@ export function userTurnBlocksForRun(
(sourceMessageId ? message.id === sourceMessageId : message.runId === runId),
)?.blocks;
}
+
+export type AgentHistoryMessageInput = {
+ id: string;
+ role: string;
+ blocks: MessageBlock[];
+};
+
+const DEFAULT_KEEP_RECENT_FULL = 6;
+const DEFAULT_MAX_OLDER_TEXT_CHARS = 280;
+
+function compactOlderBlock(block: MessageBlock, maxTextChars: number): MessageBlock {
+ if (block.kind === "task" && (block.status === "done" || block.status === "cancelled")) {
+ return { ...block, text: "" };
+ }
+ if (block.kind === "text" && block.text.length > maxTextChars) {
+ return {
+ ...block,
+ text: `${block.text.slice(0, maxTextChars).trimEnd()} […compacted…]`,
+ };
+ }
+ return block;
+}
+
+/**
+ * Compacts older conversation turns in long-lived threads while keeping the most recent turns,
+ * artifact references, and bot attributions intact.
+ */
+export function compactAgentHistoryMessages(
+ messages: readonly AgentHistoryMessageInput[],
+ options?: { keepRecentFull?: number; maxOlderTextChars?: number },
+): Array<{ id: string; role: string; text: string; compacted: boolean }> {
+ const keepRecentFull = Math.max(0, options?.keepRecentFull ?? DEFAULT_KEEP_RECENT_FULL);
+ const maxOlderTextChars = Math.max(
+ 40,
+ options?.maxOlderTextChars ?? DEFAULT_MAX_OLDER_TEXT_CHARS,
+ );
+ const cutoff = Math.max(0, messages.length - keepRecentFull);
+
+ return messages.map((msg, index) => {
+ if (index >= cutoff) {
+ return {
+ id: msg.id,
+ role: msg.role,
+ text: blocksToAgentHistoryText(msg.blocks),
+ compacted: false,
+ };
+ }
+ const compactedBlocks = msg.blocks.map((block) => compactOlderBlock(block, maxOlderTextChars));
+ const fullText = blocksToAgentHistoryText(msg.blocks);
+ const compactText = blocksToAgentHistoryText(compactedBlocks).trimEnd();
+ return {
+ id: msg.id,
+ role: msg.role,
+ text: compactText,
+ compacted: compactText.length < fullText.length,
+ };
+ });
+}
diff --git a/packages/core/src/autopilot.test.ts b/packages/core/src/autopilot.test.ts
index 3590dfc..f29ce7f 100644
--- a/packages/core/src/autopilot.test.ts
+++ b/packages/core/src/autopilot.test.ts
@@ -39,6 +39,40 @@ describe("autopilot", () => {
).toBe("failing");
});
+ it("treats identical consecutive checkpoint texts as stagnation and pauses on loop", () => {
+ let state = advanceAutopilotGuard(
+ { idleCount: 0, failCount: 0, lastCheckpointText: "Checked inbox" },
+ { checkpointed: true, failed: false, checkpointText: "checked inbox" },
+ );
+ expect(state.idleCount).toBe(1);
+ expect(state.pause).toBeNull();
+ state = advanceAutopilotGuard(state, {
+ checkpointed: true,
+ failed: false,
+ checkpointText: " Checked inbox ",
+ });
+ expect(state.idleCount).toBe(2);
+ state = advanceAutopilotGuard(state, {
+ checkpointed: true,
+ failed: false,
+ checkpointText: "Checked inbox",
+ });
+ expect(state.pause).toBe("idle");
+ });
+
+ it("includes a bounded recent checkpoint trail in continuation prompts when provided", () => {
+ const prompt = autopilotContinuationPrompt({
+ goal: "Audit modules",
+ focus: null,
+ until: null,
+ lastCheckpoint: "Module B audited",
+ recentCheckpoints: ["Module A audited", "Module B audited"],
+ nextStep: "Module C",
+ stepCount: 2,
+ });
+ expect(prompt).toContain("Recent checkpoints: 1. Module A audited | 2. Module B audited");
+ });
+
it("tells each continuation the order and where it stands", () => {
const prompt = autopilotContinuationPrompt({
goal: "Tidy up the tickets",
diff --git a/packages/core/src/autopilot.ts b/packages/core/src/autopilot.ts
index 0629bdf..1fbb497 100644
--- a/packages/core/src/autopilot.ts
+++ b/packages/core/src/autopilot.ts
@@ -11,21 +11,35 @@ export interface AutopilotState {
focus: string | null;
until: Date | null;
lastCheckpoint: string | null;
+ recentCheckpoints?: readonly string[];
nextStep: string | null;
stepCount: number;
}
+const MAX_RECENT_CHECKPOINT_TRAIL = 5;
+
+function normalizeCheckpointText(text: string | null | undefined): string {
+ return (text ?? "").replace(/\s+/g, " ").trim().toLowerCase();
+}
+
/**
* The prompt of each continuation run: the order in the user's words and where the work stands,
* so a fresh run picks up without the whole history.
*/
export function autopilotContinuationPrompt(state: AutopilotState, now = new Date()): string {
+ const trail = (state.recentCheckpoints ?? [])
+ .map((item) => item.trim())
+ .filter(Boolean)
+ .slice(-MAX_RECENT_CHECKPOINT_TRAIL);
return [
"Autopilot: continue the user's order on your own, one sensible step at a time.",
`Order: ${state.goal}`,
state.focus ? `Focus: ${state.focus}` : null,
state.until ? `Until: ${state.until.toISOString()} (now ${now.toISOString()})` : "Until: done",
`Steps so far: ${state.stepCount}`,
+ trail.length > 1
+ ? `Recent checkpoints: ${trail.map((item, idx) => `${idx + 1}. ${item}`).join(" | ")}`
+ : null,
state.lastCheckpoint ? `Last checkpoint: ${state.lastCheckpoint}` : null,
state.nextStep ? `Planned next: ${state.nextStep}` : null,
"Do the next step, then call autopilot_checkpoint with what changed. When the order is done, call autopilot_finish with the result. Actions that need the user's approval are parked as suggestions; continue with other work.",
@@ -36,10 +50,20 @@ export function autopilotContinuationPrompt(state: AutopilotState, now = new Dat
/** Whether the run that just ended moved the autopilot on, and if it should pause now. */
export function advanceAutopilotGuard(
- counts: { idleCount: number; failCount: number },
- run: { checkpointed: boolean; failed: boolean },
-): { idleCount: number; failCount: number; pause: "idle" | "failing" | null } {
- const idleCount = run.checkpointed ? 0 : counts.idleCount + 1;
+ counts: { idleCount: number; failCount: number; lastCheckpointText?: string | null },
+ run: { checkpointed: boolean; failed: boolean; checkpointText?: string | null },
+): {
+ idleCount: number;
+ failCount: number;
+ pause: "idle" | "failing" | null;
+ lastCheckpointText?: string | null;
+} {
+ const prevNorm = normalizeCheckpointText(counts.lastCheckpointText);
+ const nextNorm = normalizeCheckpointText(run.checkpointText);
+ const repeatedSameCheckpoint =
+ run.checkpointed && Boolean(prevNorm && nextNorm && prevNorm === nextNorm);
+ const effectiveProgress = run.checkpointed && !repeatedSameCheckpoint;
+ const idleCount = effectiveProgress ? 0 : counts.idleCount + 1;
const failCount = run.failed ? counts.failCount + 1 : 0;
const pause =
failCount >= AUTOPILOT_FAIL_LIMIT
@@ -47,7 +71,18 @@ export function advanceAutopilotGuard(
: idleCount >= AUTOPILOT_IDLE_LIMIT
? "idle"
: null;
- return { idleCount, failCount, pause };
+ const result: {
+ idleCount: number;
+ failCount: number;
+ pause: "idle" | "failing" | null;
+ lastCheckpointText?: string | null;
+ } = { idleCount, failCount, pause };
+ if (run.checkpointText !== undefined || counts.lastCheckpointText !== undefined) {
+ result.lastCheckpointText = run.checkpointed
+ ? (run.checkpointText ?? counts.lastCheckpointText ?? null)
+ : (counts.lastCheckpointText ?? null);
+ }
+ return result;
}
/** The autopilot's time is up. */
diff --git a/packages/core/src/browser-cowork.test.ts b/packages/core/src/browser-cowork.test.ts
index cbda4a2..dd4d270 100644
--- a/packages/core/src/browser-cowork.test.ts
+++ b/packages/core/src/browser-cowork.test.ts
@@ -1,5 +1,9 @@
import { describe, expect, it } from "vitest";
-import { browserUserContextLine, maskBrowserUserDetail } from "./browser-cowork.js";
+import {
+ browserUserContextLine,
+ coalesceBrowserUserActions,
+ maskBrowserUserDetail,
+} from "./browser-cowork.js";
describe("browser cowork context", () => {
it("masks password-like labels and fields", () => {
@@ -13,4 +17,24 @@ describe("browser cowork context", () => {
);
expect(browserUserContextLine("type", "hello", true)).toBe("User typed in a password field");
});
+
+ it("coalesces repeated scrolls, typing bursts, and navigate-to-page_change echoes", () => {
+ const lines = coalesceBrowserUserActions([
+ { kind: "navigate", detail: "https://example.com/login" },
+ { kind: "page_change", detail: "https://example.com/login" },
+ { kind: "scroll", detail: "down" },
+ { kind: "scroll", detail: "down" },
+ { kind: "scroll", detail: "down" },
+ { kind: "type", detail: "al" },
+ { kind: "type", detail: "ice" },
+ { kind: "type", detail: "pw1", passwordField: true },
+ { kind: "type", detail: "pw2", passwordField: true },
+ ]);
+ expect(lines).toEqual([
+ "User navigated to https://example.com/login",
+ "User scrolled down (3x)",
+ "User typed alice",
+ "User typed in a password field",
+ ]);
+ });
});
diff --git a/packages/core/src/browser-cowork.ts b/packages/core/src/browser-cowork.ts
index 801b594..2ee4b1c 100644
--- a/packages/core/src/browser-cowork.ts
+++ b/packages/core/src/browser-cowork.ts
@@ -33,3 +33,75 @@ export function browserUserContextLine(
}
}
}
+
+export type BrowserUserActionEvent = {
+ kind: BrowserUserActionKind;
+ detail: string;
+ passwordField?: boolean;
+};
+
+/**
+ * Coalesces noisy browser cowork event streams (repeated scrolls, consecutive typing bursts,
+ * or a navigate immediately echoed by a matching page_change) into concise episode lines.
+ */
+export function coalesceBrowserUserActions(events: readonly BrowserUserActionEvent[]): string[] {
+ const lines: string[] = [];
+ let index = 0;
+
+ while (index < events.length) {
+ const current = events[index]!;
+
+ if (current.kind === "scroll") {
+ const dir = current.detail.trim() || "down";
+ let count = 1;
+ while (
+ index + count < events.length &&
+ events[index + count]?.kind === "scroll" &&
+ (events[index + count]?.detail.trim() || "down") === dir
+ ) {
+ count += 1;
+ }
+ const base = browserUserContextLine("scroll", dir, false);
+ lines.push(count > 1 ? `${base} (${count}x)` : base);
+ index += count;
+ continue;
+ }
+
+ if (current.kind === "type") {
+ const isPassword = Boolean(current.passwordField);
+ const chunks = [current.detail];
+ let count = 1;
+ while (
+ index + count < events.length &&
+ events[index + count]?.kind === "type" &&
+ Boolean(events[index + count]?.passwordField) === isPassword
+ ) {
+ chunks.push(events[index + count]!.detail);
+ count += 1;
+ }
+ lines.push(browserUserContextLine("type", chunks.join(""), isPassword));
+ index += count;
+ continue;
+ }
+
+ if (
+ current.kind === "navigate" &&
+ index + 1 < events.length &&
+ events[index + 1]?.kind === "page_change" &&
+ events[index + 1]?.detail.trim() === current.detail.trim()
+ ) {
+ lines.push(
+ browserUserContextLine("navigate", current.detail, Boolean(current.passwordField)),
+ );
+ index += 2;
+ continue;
+ }
+
+ lines.push(
+ browserUserContextLine(current.kind, current.detail, Boolean(current.passwordField)),
+ );
+ index += 1;
+ }
+
+ return lines;
+}
diff --git a/packages/core/src/git-shell-policy.ts b/packages/core/src/git-shell-policy.ts
index aefdb7d..23b5e40 100644
--- a/packages/core/src/git-shell-policy.ts
+++ b/packages/core/src/git-shell-policy.ts
@@ -11,7 +11,7 @@ export type GitShellPolicyDecision =
const GIT_PUSH_RE = /\bgit\b[^\n;&|]*\bpush\b/i;
const GIT_FORCE_PUSH_RE = /(?:--force-with-lease|--force(?:\s|$)|(?:^|\s)-f(?:\s|$))/i;
-const GH_PR_RE = /\bgh\b(?:(?:\s+[^;&|]+)*\s+pr\b|\s+pr\b)(?:\s+create\b|\s|$|[;&|])/i;
+const GH_PR_RE = /\bgh\b[^\n;&|]*\bpr\b/i;
export function evaluateGitShellPolicy(input: GitShellPolicyInput): GitShellPolicyDecision {
const command = input.command.trim();
diff --git a/packages/core/src/search.test.ts b/packages/core/src/search.test.ts
index 3bfcc90..ef68e3b 100644
--- a/packages/core/src/search.test.ts
+++ b/packages/core/src/search.test.ts
@@ -14,14 +14,17 @@ describe("search helpers", () => {
]);
});
- it("matches case-insensitive substrings", () => {
+ it("matches case-insensitive substrings and multi-token queries", () => {
expect(matchesSearchQuery("Venue", "Research venues")).toBe(true);
+ expect(matchesSearchQuery("research berlin", "Research top venues in Berlin")).toBe(true);
+ expect(matchesSearchQuery("research tokyo", "Research top venues in Berlin")).toBe(false);
expect(matchesSearchQuery("missing", "Research venues")).toBe(false);
});
- it("builds a short snippet around the query", () => {
+ it("builds a short snippet around the query or first matching token", () => {
const text = "alpha beta gamma delta epsilon zeta eta theta";
expect(snippetAroundMatch(text, "gamma", 20)).toContain("gamma");
+ expect(snippetAroundMatch(text, "zeta alpha", 25)).toContain("zeta");
});
it("uses groupId for group search message jumps", () => {
diff --git a/packages/core/src/search.ts b/packages/core/src/search.ts
index 5be5bb6..c30b1b4 100644
--- a/packages/core/src/search.ts
+++ b/packages/core/src/search.ts
@@ -5,22 +5,42 @@ export function extractLinksFromText(text: string): string[] {
return [...new Set(matches.map((url) => url.replace(/[.,;:!?)]+$/, "")))];
}
+function tokenizeSearchWords(query: string): string[] {
+ const tokens: string[] = [];
+ for (const match of query.toLowerCase().matchAll(/[\p{L}\p{N}_-]+/gu)) {
+ if (match[0]) tokens.push(match[0]);
+ }
+ return tokens;
+}
+
export function matchesSearchQuery(
query: string,
...fields: Array
): boolean {
const q = query.trim().toLowerCase();
if (!q) return false;
- return fields.some((field) => field?.toLowerCase().includes(q));
+ const lowerFields = fields
+ .filter((field): field is string => typeof field === "string" && field.length > 0)
+ .map((field) => field.toLowerCase());
+ if (lowerFields.some((field) => field.includes(q))) return true;
+ const tokens = tokenizeSearchWords(q);
+ if (tokens.length <= 1) return false;
+ const combined = lowerFields.join(" ");
+ return tokens.every((token) => combined.includes(token));
}
export function snippetAroundMatch(text: string, query: string, maxLen = 120): string {
const q = query.trim().toLowerCase();
if (!q) return text.slice(0, maxLen);
const lower = text.toLowerCase();
- const index = lower.indexOf(q);
+ let index = lower.indexOf(q);
+ if (index < 0) {
+ const firstToken = tokenizeSearchWords(q).find((token) => lower.includes(token));
+ if (firstToken) index = lower.indexOf(firstToken);
+ }
if (index < 0) return text.slice(0, maxLen);
- const start = Math.max(0, index - 40);
+ const leadIn = Math.min(40, Math.floor(maxLen / 3));
+ const start = Math.max(0, index - leadIn);
const end = Math.min(text.length, start + maxLen);
const prefix = start > 0 ? "…" : "";
const suffix = end < text.length ? "…" : "";