Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

[codex] Preserve VCS project config error causes (#3474)

Julius Marminge6155f5cf64e9
diff --git a/apps/server/src/vcs/VcsProjectConfig.test.ts b/apps/server/src/vcs/VcsProjectConfig.test.ts
index 5fe5dcc75..04f7fcffc 100644
--- a/apps/server/src/vcs/VcsProjectConfig.test.ts
+++ b/apps/server/src/vcs/VcsProjectConfig.test.ts
@@ -96,16 +96,19 @@ describe("VcsProjectConfig", () => {
const kind = yield* config.resolveKind({ cwd });
assert.equal(kind, "jj");
- const [message, context] = messages[0] as [string, Record<string, unknown>];
const failedCandidate = path.join(cwd, ".t3code", "vcs.json");
- assert.equal(message, "Failed to inspect VCS project config at " + failedCandidate + ".");
- assert.deepInclude(context, {
+ const [error] = messages[0] as ReadonlyArray<unknown>;
+ assert.instanceOf(error, VcsProjectConfig.VcsProjectConfigError);
+ assert.equal(
+ error.message,
+ "Failed to inspect VCS project config at " + failedCandidate + ".",
+ );
+ assert.deepInclude(error, {
operation: "inspect",
cwd,
configPath: failedCandidate,
- errorTag: "VcsProjectConfigError",
+ _tag: "VcsProjectConfigError",
});
- assert.equal("cause" in context, false);
}).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
});
});
@@ -146,18 +149,19 @@ describe("VcsProjectConfig", () => {
const kind = yield* config.resolveKind({ cwd: root });
assert.equal(kind, "auto");
- const [message, context] = messages[0] as [string, Record<string, unknown>];
+ const [error] = messages[0] as ReadonlyArray<unknown>;
+ assert.instanceOf(error, VcsProjectConfig.VcsProjectConfigError);
assert.equal(
- message,
+ error.message,
"Failed to decode VCS project config at " + path.join(configDir, "vcs.json") + ".",
);
- assert.deepInclude(context, {
+ assert.deepInclude(error.cause, { _tag: "SchemaError" });
+ assert.deepInclude(error, {
operation: "decode",
cwd: root,
configPath: path.join(configDir, "vcs.json"),
- errorTag: "VcsProjectConfigError",
+ _tag: "VcsProjectConfigError",
});
- assert.equal("cause" in context, false);
}).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
});
});
@@ -182,15 +186,16 @@ describe("VcsProjectConfig", () => {
const kind = yield* config.resolveKind({ cwd: root });
assert.equal(kind, "auto");
- const [message, context] = messages[0] as [string, Record<string, unknown>];
- assert.equal(message, "Failed to read VCS project config at " + configPath + ".");
- assert.deepInclude(context, {
+ const [error] = messages[0] as ReadonlyArray<unknown>;
+ assert.instanceOf(error, VcsProjectConfig.VcsProjectConfigError);
+ assert.equal(error.message, "Failed to read VCS project config at " + configPath + ".");
+ assert.deepInclude(error.cause, { _tag: "PlatformError" });
+ assert.deepInclude(error, {
operation: "read",
cwd: root,
configPath,
- errorTag: "VcsProjectConfigError",
+ _tag: "VcsProjectConfigError",
});
- assert.equal("cause" in context, false);
}).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
});
});
diff --git a/apps/server/src/vcs/VcsProjectConfig.ts b/apps/server/src/vcs/VcsProjectConfig.ts
index bd8f45150..6abce9a3e 100644
--- a/apps/server/src/vcs/VcsProjectConfig.ts
+++ b/apps/server/src/vcs/VcsProjectConfig.ts
@@ -55,13 +55,14 @@ function configuredKind(config: ProjectVcsConfigFile): VcsDriverKindType | "auto
}
const logVcsProjectConfigError = (error: VcsProjectConfigError) =>
- Effect.logWarning(error.message, {
- operation: error.operation,
- cwd: error.cwd,
- configPath: error.configPath,
- errorTag: error._tag,
- stack: error.stack,
- });
+ Effect.logWarning(error).pipe(
+ Effect.annotateLogs({
+ operation: error.operation,
+ cwd: error.cwd,
+ configPath: error.configPath,
+ errorTag: error._tag,
+ }),
+ );
export const make = Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;