Skip to content

Commit 9254248

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-16808
# Conflicts: # apps/server/src/mcp/TaskCancelNativeSubagent.integration.test.ts
2 parents 157f45b + 6700cf6 commit 9254248

119 files changed

Lines changed: 4956 additions & 697 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.

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,18 @@ jobs:
14821482
14831483
git add apps/server/package.json apps/desktop/package.json apps/web/package.json packages/contracts/package.json pnpm-lock.yaml
14841484
git commit --no-verify -m "chore(release): prepare $RELEASE_TAG"
1485-
git push origin HEAD:main
1485+
1486+
# main moves while this job runs, so a rejected push rebases and retries.
1487+
for attempt in 1 2 3 4 5; do
1488+
if git push origin HEAD:main; then
1489+
exit 0
1490+
fi
1491+
echo "Push rejected (attempt $attempt). Rebasing onto latest main."
1492+
git pull --rebase origin main
1493+
done
1494+
1495+
echo "Could not push the version bump after 5 attempts." >&2
1496+
exit 1
14861497
14871498
announce_discord:
14881499
name: Announce release on Discord

‎apps/desktop/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@t3tools/desktop",
3-
"version": "0.1.8",
3+
"version": "0.1.9",
44
"private": true,
55
"type": "module",
66
"main": "dist-electron/boot.cjs",

‎apps/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "t3",
3-
"version": "0.1.8",
3+
"version": "0.1.9",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

‎apps/server/scripts/acp-mock-agent.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const emitInterleavedAssistantToolCalls =
2828
process.env.T3_ACP_EMIT_INTERLEAVED_ASSISTANT_TOOL_CALLS === "1";
2929
const emitV2Fidelity = process.env.T3_ACP_EMIT_V2_FIDELITY === "1";
3030
const emitNotice = process.env.T3_ACP_EMIT_NOTICE === "1";
31+
const hangCloseSession = process.env.T3_ACP_HANG_CLOSE_SESSION === "1";
3132
const vibeRetryOutcome = process.env.T3_ACP_VIBE_RETRY_OUTCOME;
3233
const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHOLDERS === "1";
3334
const emitInTurnTaskOutputThenLateDuplicate =
@@ -731,6 +732,9 @@ const program = Effect.gen(function* () {
731732
yield* agent.handleCloseSession(() =>
732733
Effect.gen(function* () {
733734
yield* requireAuthentication();
735+
if (hangCloseSession) {
736+
return yield* Effect.never;
737+
}
734738
return {};
735739
}),
736740
);

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ export const layer = Layer.effect(EnvironmentAuth, make).pipe(
14781478
Layer.provideMerge(EnvironmentAuthPolicy.layer),
14791479
);
14801480

1481-
const layerStorage = Layer.mergeAll(ServerSecretStore.layer, SqlitePersistence.layerConfig);
1481+
const layerStorage = Layer.mergeAll(ServerSecretStore.layer, SqlitePersistence.layerCliConfig);
14821482

14831483
export const layerRuntime = layer.pipe(
14841484
Layer.provideMerge(ManagedPolicy.layer),

‎apps/server/src/cli/deferredImports.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CLI deferred imp
9595

9696
assert.isTrue(Exit.hasDies(exit));
9797
assert.isTrue(yield* fs.exists(runtimeStatePath));
98-
assert.isFalse(yield* fs.exists(NodePath.join(baseDir, "userdata", "server-owner.sqlite")));
9998
}),
10099
);
101100

‎apps/server/src/cli/environment.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const runWithPeerLinks = Effect.fn("environment.runWithPeerLinks")(function* <A,
3838
Layer.provide(
3939
Layer.mergeAll(
4040
ServerSecretStore.layer,
41-
SqlitePersistence.layerConfig,
41+
SqlitePersistence.layerCliConfig,
4242
FetchHttpClient.layer,
4343
),
4444
),
@@ -48,7 +48,7 @@ const runWithPeerLinks = Effect.fn("environment.runWithPeerLinks")(function* <A,
4848
Layer.provide(
4949
Layer.mergeAll(
5050
ServerSecretStore.layer,
51-
SqlitePersistence.layerConfig,
51+
SqlitePersistence.layerCliConfig,
5252
ManagedPolicy.layer,
5353
),
5454
),

‎apps/server/src/cli/pair.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
} from "@t3tools/contracts";
88
import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
99
import * as HostProcess from "@t3tools/shared/HostProcess";
10+
import { formatHostForUrl, isWildcardHost } from "@t3tools/shared/hostClassification";
1011
import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
1112
import { buildPairingAppLink } from "@t3tools/shared/remote";
1213
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
@@ -40,9 +41,7 @@ import {
4041
} from "../serverRuntimeState.ts";
4142
import {
4243
buildPairingUrl,
43-
formatHostForUrl,
4444
isLoopbackHost,
45-
isWildcardHost,
4645
renderTerminalQrCode,
4746
resolveHeadlessConnectionString,
4847
} from "../startupAccess.ts";

‎apps/server/src/cli/project.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ const makeProjectCliRuntimeLayer = (layerProjectService: typeof RuntimeLayer.lay
217217
Layer.provide(Layer.merge(ServerSecretStore.layer, ManagedPolicy.layer)),
218218
),
219219
),
220+
// Built after acquireServerOwnership; layerCliConfig would contend with this process's own lock.
220221
Layer.provideMerge(SqlitePersistence.layerConfig),
221222
);
222223

‎apps/server/src/environment/DirectEndpoints.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ import * as NodeNet from "node:net";
1616
import * as NodeOS from "node:os";
1717

1818
import * as HostProcess from "@t3tools/shared/HostProcess";
19-
import { isTailnetHost } from "@t3tools/shared/hostClassification";
20-
21-
import * as ServerConfig from "../config.ts";
2219
import {
2320
formatHostForUrl,
24-
isLoopbackHost,
25-
isPrivateNetworkAddress,
21+
isTailnetHost,
2622
isWildcardHost,
27-
VIRTUAL_INTERFACE,
28-
} from "../startupAccess.ts";
23+
} from "@t3tools/shared/hostClassification";
24+
25+
import * as ServerConfig from "../config.ts";
26+
import { isLoopbackHost, isPrivateNetworkAddress, VIRTUAL_INTERFACE } from "../startupAccess.ts";
2927

3028
type NetworkInterfacesMap = ReturnType<typeof NodeOS.networkInterfaces>;
3129

0 commit comments

Comments
 (0)