Merge remote-tracking branch 'upstream/v0.15.0rc' into feat/add-zai-usage-tracking

# Conflicts:
#	apps/ui/src/components/usage-popover.tsx
#	apps/ui/src/components/views/board-view/mobile-usage-bar.tsx

libs/types/src/index.ts

@@ -183,6 +183,8 @@ export type {
   // Claude API profile types (deprecated)
   ClaudeApiProfile,
   ClaudeApiProfileTemplate,
+  // Terminal prompt theme type
+  TerminalPromptTheme,
 } from './settings.js';
 export {
   DEFAULT_KEYBOARD_SHORTCUTS,

libs/types/src/pipeline.ts

@@ -21,6 +21,7 @@ export type PipelineStatus = `pipeline_${string}`;
 
 export type FeatureStatusWithPipeline =
   | 'backlog'
+  | 'ready'
   | 'in_progress'
   | 'interrupted'
   | 'waiting_approval'

libs/types/src/settings.ts

@@ -487,7 +487,7 @@ export const CLAUDE_PROVIDER_TEMPLATES: ClaudeCompatibleProviderTemplate[] = [
     defaultModels: [
       { id: 'GLM-4.5-Air', displayName: 'GLM 4.5 Air', mapsToClaudeModel: 'haiku' },
       { id: 'GLM-4.7', displayName: 'GLM 4.7', mapsToClaudeModel: 'sonnet' },
-      { id: 'GLM-4.7', displayName: 'GLM 4.7', mapsToClaudeModel: 'opus' },
+      { id: 'GLM-5', displayName: 'GLM 5', mapsToClaudeModel: 'opus' },
     ],
   },
   {
@@ -570,7 +570,7 @@ export const CLAUDE_API_PROFILE_TEMPLATES: ClaudeApiProfileTemplate[] = [
     modelMappings: {
       haiku: 'GLM-4.5-Air',
       sonnet: 'GLM-4.7',
-      opus: 'GLM-4.7',
+      opus: 'GLM-5',
     },
     disableNonessentialTraffic: true,
     description: '3× usage at fraction of cost via GLM Coding Plan',