dmux 5.10.0 → 5.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (132) hide show
  1. package/README.ja.md +1 -1
  2. package/README.md +5 -2
  3. package/dist/actions/implementations/renameAction.d.ts.map +1 -1
  4. package/dist/actions/implementations/renameAction.js +11 -2
  5. package/dist/actions/implementations/renameAction.js.map +1 -1
  6. package/dist/components/panes/MergePane.d.ts.map +1 -1
  7. package/dist/components/panes/MergePane.js +3 -22
  8. package/dist/components/panes/MergePane.js.map +1 -1
  9. package/dist/components/panes/PaneCard.d.ts.map +1 -1
  10. package/dist/components/panes/PaneCard.js +13 -5
  11. package/dist/components/panes/PaneCard.js.map +1 -1
  12. package/dist/components/popups/inferenceSetupPopup.d.ts +21 -0
  13. package/dist/components/popups/inferenceSetupPopup.d.ts.map +1 -0
  14. package/dist/components/popups/inferenceSetupPopup.js +939 -0
  15. package/dist/components/popups/inferenceSetupPopup.js.map +1 -0
  16. package/dist/components/popups/settingsPopup.js +4 -0
  17. package/dist/components/popups/settingsPopup.js.map +1 -1
  18. package/dist/dashboard.js +2 -2
  19. package/dist/hooks/useAgentStatus.d.ts.map +1 -1
  20. package/dist/hooks/useAgentStatus.js +9 -2
  21. package/dist/hooks/useAgentStatus.js.map +1 -1
  22. package/dist/hooks/useInputHandling.d.ts.map +1 -1
  23. package/dist/hooks/useInputHandling.js +4 -0
  24. package/dist/hooks/useInputHandling.js.map +1 -1
  25. package/dist/hooks/usePaneLoading.d.ts +8 -5
  26. package/dist/hooks/usePaneLoading.d.ts.map +1 -1
  27. package/dist/hooks/usePaneLoading.js +115 -68
  28. package/dist/hooks/usePaneLoading.js.map +1 -1
  29. package/dist/hooks/usePaneSync.d.ts +4 -7
  30. package/dist/hooks/usePaneSync.d.ts.map +1 -1
  31. package/dist/hooks/usePaneSync.js +12 -30
  32. package/dist/hooks/usePaneSync.js.map +1 -1
  33. package/dist/hooks/usePanes.d.ts.map +1 -1
  34. package/dist/hooks/usePanes.js +71 -30
  35. package/dist/hooks/usePanes.js.map +1 -1
  36. package/dist/i18n/locales/en.d.ts.map +1 -1
  37. package/dist/i18n/locales/en.js +2 -0
  38. package/dist/i18n/locales/en.js.map +1 -1
  39. package/dist/i18n/locales/ja.d.ts.map +1 -1
  40. package/dist/i18n/locales/ja.js +2 -0
  41. package/dist/i18n/locales/ja.js.map +1 -1
  42. package/dist/index.js +1 -1
  43. package/dist/index.js.map +1 -1
  44. package/dist/services/CodexAppServerClient.d.ts +58 -0
  45. package/dist/services/CodexAppServerClient.d.ts.map +1 -0
  46. package/dist/services/CodexAppServerClient.js +263 -0
  47. package/dist/services/CodexAppServerClient.js.map +1 -0
  48. package/dist/services/GrokBuildClient.d.ts +17 -0
  49. package/dist/services/GrokBuildClient.d.ts.map +1 -0
  50. package/dist/services/GrokBuildClient.js +150 -0
  51. package/dist/services/GrokBuildClient.js.map +1 -0
  52. package/dist/services/InferenceService.d.ts +22 -0
  53. package/dist/services/InferenceService.d.ts.map +1 -0
  54. package/dist/services/InferenceService.js +342 -0
  55. package/dist/services/InferenceService.js.map +1 -0
  56. package/dist/services/PaneAnalyzer.d.ts +1 -16
  57. package/dist/services/PaneAnalyzer.d.ts.map +1 -1
  58. package/dist/services/PaneAnalyzer.js +17 -101
  59. package/dist/services/PaneAnalyzer.js.map +1 -1
  60. package/dist/services/PaneWorkerManager.d.ts +1 -1
  61. package/dist/services/PaneWorkerManager.d.ts.map +1 -1
  62. package/dist/services/PaneWorkerManager.js +9 -5
  63. package/dist/services/PaneWorkerManager.js.map +1 -1
  64. package/dist/services/PopupManager.d.ts +6 -1
  65. package/dist/services/PopupManager.d.ts.map +1 -1
  66. package/dist/services/PopupManager.js +30 -0
  67. package/dist/services/PopupManager.js.map +1 -1
  68. package/dist/services/StatusDetector.d.ts.map +1 -1
  69. package/dist/services/StatusDetector.js +15 -8
  70. package/dist/services/StatusDetector.js.map +1 -1
  71. package/dist/services/TerminalPaneNamingService.d.ts +57 -0
  72. package/dist/services/TerminalPaneNamingService.d.ts.map +1 -0
  73. package/dist/services/TerminalPaneNamingService.js +392 -0
  74. package/dist/services/TerminalPaneNamingService.js.map +1 -0
  75. package/dist/services/TmuxService.d.ts +5 -0
  76. package/dist/services/TmuxService.d.ts.map +1 -1
  77. package/dist/services/TmuxService.js +10 -3
  78. package/dist/services/TmuxService.js.map +1 -1
  79. package/dist/types.d.ts +18 -0
  80. package/dist/types.d.ts.map +1 -1
  81. package/dist/utils/agentLaunch.d.ts +3 -2
  82. package/dist/utils/agentLaunch.d.ts.map +1 -1
  83. package/dist/utils/agentLaunch.js +9 -4
  84. package/dist/utils/agentLaunch.js.map +1 -1
  85. package/dist/utils/aiMerge.d.ts +4 -2
  86. package/dist/utils/aiMerge.d.ts.map +1 -1
  87. package/dist/utils/aiMerge.js +14 -59
  88. package/dist/utils/aiMerge.js.map +1 -1
  89. package/dist/utils/envKeySetup.d.ts +10 -0
  90. package/dist/utils/envKeySetup.d.ts.map +1 -0
  91. package/dist/utils/envKeySetup.js +58 -0
  92. package/dist/utils/envKeySetup.js.map +1 -0
  93. package/dist/utils/generated-agents-doc.d.ts +1 -1
  94. package/dist/utils/generated-agents-doc.js +1 -1
  95. package/dist/utils/inferenceProviders.d.ts +34 -0
  96. package/dist/utils/inferenceProviders.d.ts.map +1 -0
  97. package/dist/utils/inferenceProviders.js +265 -0
  98. package/dist/utils/inferenceProviders.js.map +1 -0
  99. package/dist/utils/inferenceSetup.d.ts +19 -0
  100. package/dist/utils/inferenceSetup.d.ts.map +1 -0
  101. package/dist/utils/inferenceSetup.js +37 -0
  102. package/dist/utils/inferenceSetup.js.map +1 -0
  103. package/dist/utils/inferenceWizard.d.ts +61 -0
  104. package/dist/utils/inferenceWizard.d.ts.map +1 -0
  105. package/dist/utils/inferenceWizard.js +175 -0
  106. package/dist/utils/inferenceWizard.js.map +1 -0
  107. package/dist/utils/onboarding.d.ts +4 -2
  108. package/dist/utils/onboarding.d.ts.map +1 -1
  109. package/dist/utils/onboarding.js +26 -53
  110. package/dist/utils/onboarding.js.map +1 -1
  111. package/dist/utils/openRouterApiKeySetup.d.ts +7 -0
  112. package/dist/utils/openRouterApiKeySetup.d.ts.map +1 -1
  113. package/dist/utils/openRouterApiKeySetup.js +21 -0
  114. package/dist/utils/openRouterApiKeySetup.js.map +1 -1
  115. package/dist/utils/paneAgentTracking.d.ts +31 -0
  116. package/dist/utils/paneAgentTracking.d.ts.map +1 -0
  117. package/dist/utils/paneAgentTracking.js +261 -0
  118. package/dist/utils/paneAgentTracking.js.map +1 -0
  119. package/dist/utils/prSummary.d.ts +1 -1
  120. package/dist/utils/prSummary.js +3 -3
  121. package/dist/utils/prSummary.js.map +1 -1
  122. package/dist/utils/settingsManager.d.ts.map +1 -1
  123. package/dist/utils/settingsManager.js +43 -0
  124. package/dist/utils/settingsManager.js.map +1 -1
  125. package/dist/utils/shellPaneDetection.d.ts.map +1 -1
  126. package/dist/utils/shellPaneDetection.js +2 -0
  127. package/dist/utils/shellPaneDetection.js.map +1 -1
  128. package/dist/utils/slug.d.ts.map +1 -1
  129. package/dist/utils/slug.js +9 -41
  130. package/dist/utils/slug.js.map +1 -1
  131. package/native/macos/prebuilt/dmux-helper.app/Contents/MacOS/dmux-helper +0 -0
  132. package/package.json +3 -3
package/README.ja.md CHANGED
@@ -78,7 +78,7 @@ dmuxは各タスクに対してtmuxペインを作成します。各ペインに
78
78
  - Node.js 18+
79
79
  - Git 2.20+
80
80
  - 少なくとも1つのサポート対象エージェントCLI(例:[Claude Code](https://docs.anthropic.com/en/docs/claude-code)、[Codex](https://github.com/openai/codex)、[Grok Build](https://docs.x.ai/build/overview)、[OpenCode](https://github.com/opencode-ai/opencode)、[Cline CLI](https://docs.cline.bot/cline-cli/getting-started)、[Gemini CLI](https://github.com/google-gemini/gemini-cli)、[Qwen CLI](https://github.com/QwenLM/qwen-code)、[Amp CLI](https://ampcode.com/manual)、[pi CLI](https://www.npmjs.com/package/@mariozechner/pi-coding-agent)、[Cursor CLI](https://docs.cursor.com/en/cli/overview)、[Copilot CLI](https://github.com/github/copilot-cli)、[Crush CLI](https://github.com/charmbracelet/crush))
81
- - [OpenRouter APIキー](https://openrouter.ai/)(オプション、AIブランチ名とコミットメッセージ用)
81
+ - 推論プロバイダーのAPIキー、ChatGPTサブスクリプションでログイン済みのCodex CLI、またはSpaceXAIサブスクリプションでログイン済みのGrok Build CLI(オプション、AI命名・要約・ペイン分析用)
82
82
 
83
83
  ## ドキュメント
84
84
 
package/README.md CHANGED
@@ -40,6 +40,8 @@ dmux
40
40
 
41
41
  Press `n` to create a new pane, type a prompt, pick one or more agents (or none for a plain terminal), and dmux handles the rest — worktree, branch, and agent launch.
42
42
 
43
+ On first run, dmux can configure a primary inference provider/model and an optional backup. It discovers models from the provider when possible and supports API-key providers, custom OpenAI-compatible endpoints, a Codex login backed by your ChatGPT subscription, or a Grok Build login backed by your SpaceXAI subscription. Reopen the flow with `s` → **Inference Providers**.
44
+
43
45
  ## What it does
44
46
 
45
47
  dmux creates a tmux pane for each task. Every pane gets its own git worktree and branch so agents work in complete isolation. When a task is done, open the pane menu with `m` and choose Merge to bring it back into your main branch, or Create GitHub PR to push the branch and file a pull request.
@@ -48,7 +50,8 @@ dmux creates a tmux pane for each task. Every pane gets its own git worktree and
48
50
  - **Agent support** — Claude Code, Codex, OpenCode, Cline CLI, Gemini CLI, Qwen CLI, Amp CLI, pi CLI, Cursor CLI, Copilot CLI, and Crush CLI
49
51
  - **Goal launches** — optionally start supported agents in goal mode from the initial prompt
50
52
  - **Multi-select launches** — choose any combination of enabled agents per prompt
51
- - **AI naming** — branches and commit messages generated automatically
53
+ - **AI naming** — branches, commit messages, and active terminal panes named automatically
54
+ - **Durable terminals** — regular terminals restore in their last observed directory; if Codex, Claude, or another supported agent was running, dmux tracks it and resumes that conversation when the pane is recreated
52
55
  - **Smart merging** — auto-commit, merge, and clean up in one step
53
56
  - **macOS notifications** — background panes can send native attention alerts when they settle and need you, with a global off switch
54
57
  - **Built-in file browser** — inspect a pane's worktree, search files, and preview code or diffs without leaving dmux
@@ -88,7 +91,7 @@ dmux can use default branch behavior or let you override branch details when cre
88
91
  - Node.js 18+
89
92
  - Git 2.20+
90
93
  - At least one supported agent CLI (for example [Claude Code](https://docs.anthropic.com/en/docs/claude-code), [Codex](https://github.com/openai/codex), [Grok Build](https://docs.x.ai/build/overview), [OpenCode](https://github.com/opencode-ai/opencode), [Cline CLI](https://docs.cline.bot/cline-cli/getting-started), [Gemini CLI](https://github.com/google-gemini/gemini-cli), [Qwen CLI](https://github.com/QwenLM/qwen-code), [Amp CLI](https://ampcode.com/manual), [pi CLI](https://www.npmjs.com/package/@mariozechner/pi-coding-agent), [Cursor CLI](https://docs.cursor.com/en/cli/overview), [Copilot CLI](https://github.com/github/copilot-cli), [Crush CLI](https://github.com/charmbracelet/crush))
91
- - [OpenRouter API key](https://openrouter.ai/) (optional, for AI branch names and commit messages)
94
+ - An inference provider API key, a Codex CLI login backed by a ChatGPT subscription, or a Grok Build CLI login backed by a SpaceXAI subscription (optional, for AI naming, summaries, and pane analysis)
92
95
 
93
96
  ## Documentation
94
97
 
@@ -1 +1 @@
1
- {"version":3,"file":"renameAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA2B/D,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA2EvB"}
1
+ {"version":3,"file":"renameAction.d.ts","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA2B/D,wBAAsB,UAAU,CAC9B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAsFvB"}
@@ -20,7 +20,9 @@ export async function renamePane(pane, context) {
20
20
  title: 'Rename Pane',
21
21
  message: [
22
22
  `Rename "${currentName}".`,
23
- 'Leave blank to use the worktree name again.',
23
+ pane.type === 'shell'
24
+ ? 'Leave blank to allow automatic naming again.'
25
+ : 'Leave blank to use the worktree name again.',
24
26
  ].join('\n\n'),
25
27
  placeholder: pane.slug,
26
28
  defaultValue: pane.displayName || currentName,
@@ -37,7 +39,9 @@ export async function renamePane(pane, context) {
37
39
  ? normalizedName
38
40
  : undefined;
39
41
  const currentDisplayName = sanitizePaneDisplayName(pane.displayName || '') || undefined;
40
- if (currentDisplayName === nextDisplayName) {
42
+ const nextDisplayNameSource = nextDisplayName ? 'human' : undefined;
43
+ if (currentDisplayName === nextDisplayName
44
+ && pane.displayNameSource === nextDisplayNameSource) {
41
45
  return {
42
46
  type: 'info',
43
47
  message: `Pane name unchanged: "${currentName}"`,
@@ -48,6 +52,11 @@ export async function renamePane(pane, context) {
48
52
  const updatedPane = {
49
53
  ...pane,
50
54
  displayName: nextDisplayName,
55
+ displayNameSource: nextDisplayNameSource,
56
+ lastAutoNamedAt: nextDisplayName ? pane.lastAutoNamedAt : undefined,
57
+ lastAutoNameFingerprint: nextDisplayName
58
+ ? pane.lastAutoNameFingerprint
59
+ : undefined,
51
60
  };
52
61
  const updatedPanes = context.panes.map((candidate) => candidate.id === pane.id ? updatedPane : candidate);
53
62
  await context.savePanes(updatedPanes);
@@ -1 +1 @@
1
- {"version":3,"file":"renameAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renameAction.js","sourceRoot":"","sources":["../../../src/actions/implementations/renameAction.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"MergePane.d.ts","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAQhE,UAAU,cAAc;IACtB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,cAAc,qBAiW3F"}
1
+ {"version":3,"file":"MergePane.d.ts","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAShE,UAAU,cAAc;IACtB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,cAAc,qBA8U3F"}
@@ -4,6 +4,7 @@ import { execSync } from 'child_process';
4
4
  import CleanTextInput from '../inputs/CleanTextInput.js';
5
5
  import { SettingsManager } from '../../utils/settingsManager.js';
6
6
  import { getPermissionFlags } from '../../utils/agentLaunch.js';
7
+ import { generateInferenceText } from '../../services/InferenceService.js';
7
8
  export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
8
9
  const { exit } = useApp();
9
10
  const [status, setStatus] = useState('checking');
@@ -54,33 +55,13 @@ export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
54
55
  return false;
55
56
  };
56
57
  const generateCommitMessage = async () => {
57
- const apiKey = process.env.OPENROUTER_API_KEY;
58
- if (!apiKey) {
59
- return `chore: merge ${pane.slug} into ${mainBranch}`;
60
- }
61
58
  try {
62
59
  const diff = runCommand('git diff --staged');
63
60
  if (!diff.success) {
64
61
  return `chore: merge ${pane.slug} into ${mainBranch}`;
65
62
  }
66
- const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
67
- method: 'POST',
68
- headers: {
69
- 'Authorization': `Bearer ${apiKey}`,
70
- 'Content-Type': 'application/json',
71
- },
72
- body: JSON.stringify({
73
- model: 'openai/gpt-4o-mini',
74
- messages: [{
75
- role: 'user',
76
- content: `Generate a concise, semantic commit message for these changes. Follow conventional commits format (feat:, fix:, chore:, etc). Be specific about what changed:\n\n${diff.output.substring(0, 4000)}`
77
- }],
78
- max_tokens: 100,
79
- temperature: 0.3,
80
- }),
81
- });
82
- const data = await response.json();
83
- return data.choices?.[0]?.message?.content?.trim() || `chore: merge ${pane.slug} into ${mainBranch}`;
63
+ const message = await generateInferenceText(`Generate a concise, semantic commit message for these changes. Follow conventional commits format (feat:, fix:, chore:, etc). Be specific about what changed:\n\n${diff.output.substring(0, 4000)}`, { maxTokens: 100, temperature: 0.3 });
64
+ return message?.trim() || `chore: merge ${pane.slug} into ${mainBranch}`;
84
65
  }
85
66
  catch {
86
67
  return `chore: merge ${pane.slug} into ${mainBranch}`;
@@ -1 +1 @@
1
- {"version":3,"file":"MergePane.js","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MergePane.js","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"PaneCard.d.ts","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAGpC,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM9D,UAAU,aAAa;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,aAAa,CAAC;CAClC;AAyBD,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CA6GpC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"PaneCard.d.ts","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAGpC,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM9D,UAAU,aAAa;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,aAAa,CAAC;CAClC;AAyBD,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAqHpC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
@@ -48,10 +48,13 @@ const PaneCard = memo(({ pane, isDevSource, selected, projectThemeName, }) => {
48
48
  const isFileBrowserPane = pane.type === 'shell' && pane.shellType === 'fb';
49
49
  const paneName = getPaneDisplayName(pane);
50
50
  // Right-aligned columns: [cc] = 4 chars, (ap) = 4 chars, space between = 1
51
- const hasAgent = pane.type === 'shell' || !!pane.agent;
52
- const agentTag = pane.type === 'shell'
53
- ? (pane.shellType || 'sh').substring(0, 2)
54
- : pane.agent ? getAgentShortLabel(pane.agent) : null;
51
+ const displayedAgent = pane.activeAgent || (pane.type !== 'shell' ? pane.agent : undefined);
52
+ const hasAgent = pane.type === 'shell' || !!displayedAgent;
53
+ const agentTag = displayedAgent
54
+ ? getAgentShortLabel(displayedAgent)
55
+ : pane.type === 'shell'
56
+ ? (pane.shellType || 'sh').substring(0, 2)
57
+ : null;
55
58
  const apTag = pane.autopilot ? 'ap' : null;
56
59
  // Keep non-title segments fixed; only slug is allowed to clip.
57
60
  const prefix = selected ? '▸' : ' ';
@@ -76,7 +79,11 @@ const PaneCard = memo(({ pane, isDevSource, selected, projectThemeName, }) => {
76
79
  : selected
77
80
  ? paneSelectedColor
78
81
  : COLORS.unselected;
79
- const shellTagColor = isFileBrowserPane ? 'yellow' : pane.type === 'shell' ? 'cyan' : 'gray';
82
+ const shellTagColor = isFileBrowserPane
83
+ ? 'yellow'
84
+ : pane.type === 'shell' && !displayedAgent
85
+ ? 'cyan'
86
+ : 'gray';
80
87
  return (React.createElement(Box, { width: ROW_WIDTH },
81
88
  React.createElement(Box, { width: LEFT_COLUMN_WIDTH },
82
89
  React.createElement(Text, { color: selected ? paneSelectedColor : COLORS.border }, prefix),
@@ -106,6 +113,7 @@ const PaneCard = memo(({ pane, isDevSource, selected, projectThemeName, }) => {
106
113
  prevProps.pane.type === nextProps.pane.type &&
107
114
  prevProps.pane.shellType === nextProps.pane.shellType &&
108
115
  prevProps.pane.agent === nextProps.pane.agent &&
116
+ prevProps.pane.activeAgent === nextProps.pane.activeAgent &&
109
117
  prevProps.pane.colorTheme === nextProps.pane.colorTheme &&
110
118
  prevProps.isDevSource === nextProps.isDevSource &&
111
119
  prevProps.selected === nextProps.selected &&
@@ -1 +1 @@
1
- {"version":3,"file":"PaneCard.js","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PaneCard.js","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ #!/usr/bin/env node
2
+ /**
3
+ * Standalone popup for configuring inference providers.
4
+ *
5
+ * A progressive wizard: provider picker (fuzzy search) → credential entry when
6
+ * missing → dynamically discovered model picker → optional backup target →
7
+ * review-and-save summary. Writes the standard popup result shape
8
+ * `{ primary, backup }` consumed by PopupManager.
9
+ */
10
+ import React from 'react';
11
+ import type { InferenceTarget } from '../../types.js';
12
+ interface InferenceSetupProps {
13
+ resultFile?: string;
14
+ onComplete?: (result: {
15
+ primary: InferenceTarget;
16
+ backup: InferenceTarget | null;
17
+ } | null) => void;
18
+ }
19
+ export declare const InferenceSetupApp: React.FC<InferenceSetupProps>;
20
+ export {};
21
+ //# sourceMappingURL=inferenceSetupPopup.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"inferenceSetupPopup.d.ts","sourceRoot":"","sources":["../../../src/components/popups/inferenceSetupPopup.tsx"],"names":[],"mappings":";AAEA;;;;;;;GAOG;AAEH,OAAO,KAA+C,MAAM,OAAO,CAAC;AAYpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAkmCtD,UAAU,mBAAmB;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,eAAe,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;CACpG;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAoO3D,CAAC"}