Skip to content

Commit 25a1d88

Browse files
committed
Merge branch feat/cua-driver-server into feat/cua-driver-desktop
2 parents 00466c5 + 3b88912 commit 25a1d88

174 files changed

Lines changed: 3582 additions & 712 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vite-hooks/post-checkout‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# `git worktree add` runs post-checkout inside the new checkout with an all-zero previous HEAD.
33
# Set that checkout up like the goat.json Setup Worktree action, so a worktree made by any tool
44
# (GOAT, Codex, an agent running git) has dependencies when the command returns.
5-
# GOAT_WORKTREE_SETUP=0 skips it. A failed setup never fails the checkout.
5+
# GOAT_WORKTREE_SETUP=0 skips it; GOAT sets it for thread worktrees, where it runs the same
6+
# setup as a visible launch step. A failed setup never fails the checkout.
67
[ "$1" = 0000000000000000000000000000000000000000 ] || exit 0
78
[ "${GOAT_WORKTREE_SETUP:-}" != 0 ] || exit 0
89
[ -z "${CI:-}" ] || exit 0

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Architecture and its constraints: `docs/internals/overview.md`. Glossary: `docs/
171171
- `packages/contracts` - Effect/Schema contracts plus small derived helpers. No heavy runtime logic.
172172
- `packages/shared` - shared runtime utils, subpath exports, no barrel.
173173
- `packages/client-runtime` - client code shared by web and mobile.
174-
- `.repos/` - vendored read-only references. Prefer their patterns over invented ones. Never edit or import from them. Sync with `vpr sync:repos` when bumping the matching dependency.
174+
- `.repos/` - vendored read-only references. Prefer their patterns over invented ones. Never edit or import from them. Sync with `vpr sync:repos` when bumping the matching dependency. Thread worktrees leave `.repos/` out (`worktreeSparseExclude` in `goat.json`), so read it from the main checkout, the first path in `git worktree list`, or run `git sparse-checkout disable` to bring it into this worktree.
175175

176176
## Taste
177177

‎apps/desktop/src/app/DesktopEnvironment.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const APP_BASE_NAME = "GOAT";
9696
* Storage" item, Linux Secret Service entry), which DesktopSafeStorageKeyMigration copies over
9797
* from the legacy name before first use.
9898
*/
99-
export const DESKTOP_RUNTIME_APP_BASE_NAME = "GOAT";
99+
const DESKTOP_RUNTIME_APP_BASE_NAME = "GOAT";
100100

101101
export const desktopRuntimeAppName = (stageLabel: DesktopAppStageLabel) =>
102102
`${DESKTOP_RUNTIME_APP_BASE_NAME} ${stageLabel}`;

‎apps/desktop/src/app/DesktopRendererOriginMigration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export class DesktopRendererOriginMigration extends Context.Service<
3535
}
3636
>()("@goat/desktop/app/DesktopRendererOriginMigration") {}
3737

38-
export const MARKER_FILE_NAME = "renderer-origin-migrated";
39-
export const ATTEMPT_FILE_NAME = "renderer-origin-migration-attempt";
38+
const MARKER_FILE_NAME = "renderer-origin-migrated";
39+
const ATTEMPT_FILE_NAME = "renderer-origin-migration-attempt";
4040
const STEP_TIMEOUT = Duration.seconds(30);
4141

4242
export class RendererOriginMigrationError extends Schema.TaggedError<RendererOriginMigrationError>()(

‎apps/desktop/src/app/DesktopSystemWake.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as DesktopSshEnvironment from "../ssh/DesktopSshEnvironment.ts";
1313
type PowerTransition = DesktopSystemWakeEvent["reason"];
1414

1515
/** Repeated macOS powerMonitor resume events within this window belong to the same wake. */
16-
export const RESUME_DEDUP_WINDOW_MS = 3_000;
16+
const RESUME_DEDUP_WINDOW_MS = 3_000;
1717

1818
/**
1919
* Tells the renderer when the machine wakes or the screen unlocks, so its

‎apps/desktop/src/backend/DesktopHeadlessServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export interface HeadlessServerRuntime {
6161
* one this app can attach: a non-loopback origin, or no exact version naming
6262
* the runtime binary that can issue its sessions.
6363
*/
64-
export function parseHeadlessServerRuntime(text: string): Option.Option<HeadlessServerRuntime> {
64+
function parseHeadlessServerRuntime(text: string): Option.Option<HeadlessServerRuntime> {
6565
return Option.flatMap(decodeRuntimeRecord(text), (record) => {
6666
if (
6767
!Number.isSafeInteger(record.pid) ||

‎apps/server/src/channels/ChannelBotRegistry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { botFullAccessCommandIdFor, botLaunchIdsFor } from "./channelIds.ts";
4040

4141
const GOAT_BOT_TITLE = "GOAT bot";
4242

43-
export const GOAT_BOT_RUNTIME_MODE = "full-access" satisfies RuntimeMode;
43+
const GOAT_BOT_RUNTIME_MODE = "full-access" satisfies RuntimeMode;
4444

4545
const ACTIVE_RUN_STATUSES = new Set(["preparing", "queued", "starting", "running", "waiting"]);
4646

‎apps/server/src/channels/ChannelDispatcher.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const MEMORY_CEILING_RANK = { none: 0, read: 1, read_write: 2 } as const;
105105
/** How many pieces of one person's work run at once before more wait in the queue. */
106106
export const WORKERS_PER_REQUESTER = 4;
107107

108-
export const sameRequester = (left: ChannelRequester, right: ChannelRequester) =>
108+
const sameRequester = (left: ChannelRequester, right: ChannelRequester) =>
109109
left.ownerId === right.ownerId && left.principalId === right.principalId;
110110

111111
const withoutKey = <V>(map: ReadonlyMap<string, V>, key: string) => {

‎apps/server/src/channels/ChannelLayers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export const layerServices = makeLayerServices(SlackChannelSettings.layerUnavail
108108
export const makeLayerServicesWithSlack = (imessageLayer = ImessageChannelRuntime.layerLive) =>
109109
makeLayerServices(layerSlackLive, imessageLayer);
110110

111-
export const layerServicesWithSlack = makeLayerServicesWithSlack();
111+
const layerServicesWithSlack = makeLayerServicesWithSlack();
112112

113113
/** Every channel service, the live Slack connection, and the background owner loop. */
114114
export const layer = ChannelRuntime.layerBackground.pipe(

‎apps/server/src/channels/ChannelLedger.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ const storedTask = (row: TaskRow): ChannelStoredTask => ({
699699
* When a waiting task last asked for a person: its newest open question or worker need. Marking
700700
* the bot read covers everything asked before then; a later question counts again.
701701
*/
702-
export const channelTaskWaitingSince = (task: ChannelTask): string => {
702+
const channelTaskWaitingSince = (task: ChannelTask): string => {
703703
const times = [
704704
...task.openQuestions.map((question) => question.askedAt),
705705
...(task.observed?.needsYou ?? []).map((need) => need.since),

0 commit comments

Comments
 (0)