fix: statusline provider id dedup, newLine support, and CI type errors

- Project-level providers override user-level by id instead of appending
- Add newLine option to break statusline into multiple rows
- Remove external deepcode-core from esbuild (bundle inline)
- Fix permissions.test.ts readonly array type errors

Author: dengmik-commits

packages/cli/src/tests/statusline.test.ts

@@ -7,7 +7,7 @@ import { sanitizeStatusText, STATUS_SEGMENT_MAX_LENGTH } from "../ui/statusline/
 import { validateModulePath, loadModuleProvider } from "../ui/statusline/module-provider";
 import { createCommandStatusProvider } from "../ui/statusline/command-provider";
 import { StatusLineManager } from "../ui/statusline/manager";
-import { resolveSettings } from "@vegamo/deepcode-core";
+import { resolveSettings, resolveSettingsSources } from "@vegamo/deepcode-core";
 import type { ResolvedStatusLineSettings } from "@vegamo/deepcode-core";
 
 test("sanitizeStatusText returns empty for null/undefined/empty", () => {
@@ -171,6 +171,33 @@ test("loadModuleProvider succeeds for a well-formed module", async () => {
   }
 });
 
+test("resolveSettingsSources lets project-level providers override user-level by id", () => {
+  const resolved = resolveSettingsSources(
+    {
+      statusline: {
+        enabled: true,
+        providers: [
+          { type: "command", id: "model", command: "echo user-model" },
+          { type: "command", id: "branch", command: "echo user-branch" },
+        ],
+      },
+    },
+    {
+      statusline: {
+        providers: [
+          { type: "command", id: "model", command: "echo project-model" },
+          { type: "command", id: "cwd", command: "echo project-cwd" },
+        ],
+      },
+    },
+    { model: "default-model", baseURL: "https://default.example.com" }
+  );
+  const ids = resolved.statusline.providers.map((p) => p.id);
+  assert.deepEqual(ids, ["branch", "model", "cwd"]);
+  const modelProvider = resolved.statusline.providers.find((p) => p.id === "model");
+  assert.equal(modelProvider?.type === "command" && modelProvider.command, "echo project-model");
+});
+
 test("StatusLineManager emits segments after fetch and stops cleanly", async () => {
   const config: ResolvedStatusLineSettings = {
     enabled: true,

packages/cli/src/ui/statusline/command-provider.ts

@@ -32,6 +32,7 @@ export function createCommandStatusProvider(
   return {
     id,
     color: config.color,
+    newLine: config.newLine,
     maxLength: config.maxLength,
     fetch: ({ signal }: StatusProviderContext) =>
       new Promise<string>((resolve) => {

packages/cli/src/ui/statusline/manager.ts

@@ -11,7 +11,12 @@ function segmentsEqual(a: StatusSegment[], b: StatusSegment[]): boolean {
     return false;
   }
   for (let i = 0; i < a.length; i++) {
-    if (a[i]?.id !== b[i]?.id || a[i]?.text !== b[i]?.text || a[i]?.color !== b[i]?.color) {
+    if (
+      a[i]?.id !== b[i]?.id ||
+      a[i]?.text !== b[i]?.text ||
+      a[i]?.color !== b[i]?.color ||
+      a[i]?.newLine !== b[i]?.newLine
+    ) {
       return false;
     }
   }
@@ -130,7 +135,17 @@ export class StatusLineManager {
       if (!resolvedPath) {
         return null;
       }
-      return loadModuleProvider(resolvedPath, config.color, providerId, config.timeoutMs, config.maxLength);
+      const provider = await loadModuleProvider(
+        resolvedPath,
+        config.color,
+        providerId,
+        config.timeoutMs,
+        config.maxLength
+      );
+      if (provider && config.newLine) {
+        provider.newLine = true;
+      }
+      return provider;
     }
     return null;
   }
@@ -156,6 +171,9 @@ export class StatusLineManager {
           if (provider.color) {
             segment.color = provider.color;
           }
+          if (provider.newLine) {
+            segment.newLine = true;
+          }
           return segment;
         } catch {
           return null;

packages/cli/src/ui/statusline/types.ts

@@ -4,6 +4,7 @@ export type StatusSegment = {
   id: string;
   text: string;
   color?: string;
+  newLine?: boolean;
 };
 
 export type SessionInfo = {
@@ -29,6 +30,7 @@ export type StatusProvider = {
   id: string;
   color?: string;
   maxLength?: number;
+  newLine?: boolean;
   fetch: (ctx: StatusProviderContext) => Promise<string>;
   dispose?: () => void;
 };

packages/cli/src/ui/views/PromptInput.tsx

@@ -845,15 +845,33 @@ export const PromptInput = React.memo(function PromptInput({
         </Box>
       )}
       {statusLineSegments && statusLineSegments.length > 0 && (
-        <Box>
-          {statusLineSegments.map((segment, index) => (
-            <React.Fragment key={segment.id}>
-              {index > 0 && <Text dimColor>{statusLineSeparator ?? " · "}</Text>}
-              <Text color={segment.color} dimColor={!segment.color}>
-                {segment.text}
-              </Text>
-            </React.Fragment>
-          ))}
+        <Box flexDirection="column">
+          {(() => {
+            const lines: StatusSegment[][] = [];
+            let currentLine: StatusSegment[] = [];
+            for (const segment of statusLineSegments) {
+              if (segment.newLine && currentLine.length > 0) {
+                lines.push(currentLine);
+                currentLine = [];
+              }
+              currentLine.push(segment);
+            }
+            if (currentLine.length > 0) {
+              lines.push(currentLine);
+            }
+            return lines.map((line, lineIndex) => (
+              <Box key={lineIndex}>
+                {line.map((segment, index) => (
+                  <React.Fragment key={segment.id}>
+                    {index > 0 && <Text dimColor>{statusLineSeparator ?? " · "}</Text>}
+                    <Text color={segment.color} dimColor={!segment.color}>
+                      {segment.text}
+                    </Text>
+                  </React.Fragment>
+                ))}
+              </Box>
+            ));
+          })()}
         </Box>
       )}
     </Box>

packages/core/src/settings.ts

@@ -53,6 +53,7 @@ export type StatusLineProviderConfig =
       cwd?: string;
       timeoutMs?: number;
       color?: string;
+      newLine?: boolean;
       maxLength?: number;
     }
   | {
@@ -61,6 +62,7 @@ export type StatusLineProviderConfig =
       path: string;
       timeoutMs?: number;
       color?: string;
+      newLine?: boolean;
       maxLength?: number;
     };
 
@@ -278,6 +280,7 @@ function normalizeStatusLineProvider(value: unknown): StatusLineProviderConfig |
     typeof maxLengthRaw === "number" && Number.isFinite(maxLengthRaw) && maxLengthRaw > 0
       ? Math.floor(maxLengthRaw)
       : undefined;
+  const newLine = value["newLine"] === true ? true : undefined;
 
   if (type === "command") {
     const command = trimString(value["command"]);
@@ -292,6 +295,7 @@ function normalizeStatusLineProvider(value: unknown): StatusLineProviderConfig |
       cwd: cwdRaw || undefined,
       timeoutMs,
       color,
+      newLine,
       maxLength,
     };
   }
@@ -306,6 +310,7 @@ function normalizeStatusLineProvider(value: unknown): StatusLineProviderConfig |
       path: modulePath,
       timeoutMs,
       color,
+      newLine,
       maxLength,
     };
   }
@@ -349,7 +354,10 @@ function mergeStatusLine(
 ): ResolvedStatusLineSettings {
   const userConfig = normalizeStatusLine(userSettings?.statusline) ?? {};
   const projectConfig = normalizeStatusLine(projectSettings?.statusline) ?? {};
-  const providers = [...(userConfig.providers ?? []), ...(projectConfig.providers ?? [])];
+  const userProviders = userConfig.providers ?? [];
+  const projectProviders = projectConfig.providers ?? [];
+  const projectIds = new Set(projectProviders.map((p) => p.id));
+  const providers = [...userProviders.filter((p) => !projectIds.has(p.id)), ...projectProviders];
   const enabled = projectConfig.enabled ?? userConfig.enabled ?? providers.length > 0;
   const refreshMs = projectConfig.refreshMs ?? userConfig.refreshMs ?? DEFAULT_STATUSLINE_REFRESH_MS;
   const separator = projectConfig.separator ?? userConfig.separator ?? DEFAULT_STATUSLINE_SEPARATOR;

packages/core/src/tests/permissions.test.ts

@@ -11,6 +11,7 @@ import {
   isPathInAnyDirectory,
   parseBashSideEffects,
 } from "../common/permissions";
+import type { PermissionScope } from "../settings";
 
 const tempDirs: string[] = [];
 
@@ -52,10 +53,10 @@ test("computeToolCallPermissions maps tool calls to permission requests", () =>
     sessionId: "session-1",
     projectRoot,
     settings: {
-      allow: [],
-      deny: [],
-      ask: ["write-out-cwd", "network"],
-      defaultMode: "allowAll",
+      allow: [] as PermissionScope[],
+      deny: [] as PermissionScope[],
+      ask: ["write-out-cwd", "network"] as PermissionScope[],
+      defaultMode: "allowAll" as const,
     },
     resolveSnippetPath: () => path.join(projectRoot, "src", "file.ts"),
     toolCalls: [
@@ -100,10 +101,10 @@ test("computeToolCallPermissions only asks for scopes not already allowed", () =
     sessionId: "session-1",
     projectRoot,
     settings: {
-      allow: ["read-in-cwd"],
-      deny: [],
-      ask: [],
-      defaultMode: "askAll",
+      allow: ["read-in-cwd"] as PermissionScope[],
+      deny: [] as PermissionScope[],
+      ask: [] as PermissionScope[],
+      defaultMode: "askAll" as const,
     },
     toolCalls: [
       {
@@ -138,10 +139,10 @@ test("computeToolCallPermissions allows read tool calls under skill scan paths",
     projectRoot,
     readPermissionExemptPaths: [skillRoot],
     settings: {
-      allow: [],
-      deny: [],
-      ask: [],
-      defaultMode: "askAll",
+      allow: [] as PermissionScope[],
+      deny: [] as PermissionScope[],
+      ask: [] as PermissionScope[],
+      defaultMode: "askAll" as const,
     },
     toolCalls: [
       {

scripts/esbuild.config.js

@@ -20,7 +20,6 @@ await build({
   jsx: "automatic",
   jsxImportSource: "react",
   packages: "external",
-  external: ["@vegamo/deepcode-core"],
   logOverride: {
     "empty-import-meta": "silent",
   },