@@ -973,6 +973,40 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
       }),
   );
 
+  it.effect("generation failures bound a long configured model name", () =>
+    Effect.gen(function* () {
+      const repoDir = yield* makeTempDir("t3code-git-manager-");
+      yield* initRepo(repoDir);
+      NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "changed\n");
+      const model = `long-${"m".repeat(300)}`;
+      const { manager } = yield* makeManager({
+        serverSettings: {
+          textGenerationModelSelection: {
+            ...DEFAULT_SERVER_SETTINGS.textGenerationModelSelection,
+            model,
+          },
+        },
+        textGeneration: {
+          generateCommitMessage: () =>
+            Effect.fail(
+              new TextGenerationError({
+                operation: "generateCommitMessage",
+                detail: "Unsupported model",
+              }),
+            ),
+        },
+      });
+      const error = yield* runStackedAction(manager, { cwd: repoDir, action: "commit" }).pipe(
+        Effect.flip,
+      );
+
+      expect(error).toMatchObject({
+        _tag: "TextGenerationError",
+        modelSelection: { model: model.slice(0, 128) },
+      });
+    }),
+  );
+
   it.effect("PR generation failures carry model context without creating a PR", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");
 
@@ -104,6 +104,9 @@ interface SourceControlTextGenerationSettings {
   readonly style: SourceControlWritingStyleSettings;
 }
 
+// Error attributes stay bounded, and the configured model name has no length limit.
+const MAX_ERROR_MODEL_LENGTH = 128;
+
 /** Adds the attempted model and the setting that chose it to a generation failure. */
 function withTextGenerationContext(
   error: TextGenerationError,
@@ -115,7 +118,7 @@ function withTextGenerationContext(
     ...(error.cause !== undefined ? { cause: error.cause } : {}),
     modelSelection: {
       instanceId: settings.modelSelection.instanceId,
-      model: settings.modelSelection.model,
+      model: settings.modelSelection.model.slice(0, MAX_ERROR_MODEL_LENGTH).trimEnd(),
     },
     modelSetting: settings.modelSetting,
   });