@calliopelabs/cli 0.8.20 → 2.0.2
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.
- package/dist/agents/agent-config-loader.d.ts +60 -0
- package/dist/agents/agent-config-loader.d.ts.map +1 -0
- package/dist/agents/agent-config-loader.js +402 -0
- package/dist/agents/agent-config-loader.js.map +1 -0
- package/dist/agents/agent-config-presets.d.ts +10 -0
- package/dist/agents/agent-config-presets.d.ts.map +1 -0
- package/dist/agents/agent-config-presets.js +940 -0
- package/dist/agents/agent-config-presets.js.map +1 -0
- package/dist/agents/agent-config-types.d.ts +145 -0
- package/dist/agents/agent-config-types.d.ts.map +1 -0
- package/dist/agents/agent-config-types.js +12 -0
- package/dist/agents/agent-config-types.js.map +1 -0
- package/dist/{agterm → agents}/agent-detection.d.ts +1 -1
- package/dist/{agterm → agents}/agent-detection.d.ts.map +1 -1
- package/dist/{agterm → agents}/agent-detection.js +21 -5
- package/dist/agents/agent-detection.js.map +1 -0
- package/dist/agents/aggregator.d.ts +19 -0
- package/dist/agents/aggregator.d.ts.map +1 -0
- package/dist/agents/aggregator.js +141 -0
- package/dist/agents/aggregator.js.map +1 -0
- package/dist/{agterm → agents}/cli-backend.d.ts +1 -1
- package/dist/{agterm → agents}/cli-backend.d.ts.map +1 -1
- package/dist/{agterm → agents}/cli-backend.js +90 -12
- package/dist/agents/cli-backend.js.map +1 -0
- package/dist/agents/council-types.d.ts +113 -0
- package/dist/agents/council-types.d.ts.map +1 -0
- package/dist/agents/council-types.js +81 -0
- package/dist/agents/council-types.js.map +1 -0
- package/dist/agents/council.d.ts +107 -0
- package/dist/agents/council.d.ts.map +1 -0
- package/dist/agents/council.js +586 -0
- package/dist/agents/council.js.map +1 -0
- package/dist/agents/decomposer.d.ts +33 -0
- package/dist/agents/decomposer.d.ts.map +1 -0
- package/dist/agents/decomposer.js +138 -0
- package/dist/agents/decomposer.js.map +1 -0
- package/dist/agents/dynamic-tools.d.ts +52 -0
- package/dist/agents/dynamic-tools.d.ts.map +1 -0
- package/dist/agents/dynamic-tools.js +395 -0
- package/dist/agents/dynamic-tools.js.map +1 -0
- package/dist/agents/index.d.ts +29 -0
- package/dist/agents/index.d.ts.map +1 -0
- package/dist/agents/index.js +29 -0
- package/dist/agents/index.js.map +1 -0
- package/dist/agents/installer.d.ts +39 -0
- package/dist/agents/installer.d.ts.map +1 -0
- package/dist/agents/installer.js +205 -0
- package/dist/agents/installer.js.map +1 -0
- package/dist/{agterm → agents}/orchestrator.d.ts +7 -2
- package/dist/agents/orchestrator.d.ts.map +1 -0
- package/dist/{agterm → agents}/orchestrator.js +22 -2
- package/dist/agents/orchestrator.js.map +1 -0
- package/dist/agents/sdk-backend.d.ts +63 -0
- package/dist/agents/sdk-backend.d.ts.map +1 -0
- package/dist/agents/sdk-backend.js +489 -0
- package/dist/agents/sdk-backend.js.map +1 -0
- package/dist/agents/swarm-types.d.ts +83 -0
- package/dist/agents/swarm-types.d.ts.map +1 -0
- package/dist/agents/swarm-types.js +20 -0
- package/dist/agents/swarm-types.js.map +1 -0
- package/dist/agents/swarm.d.ts +74 -0
- package/dist/agents/swarm.d.ts.map +1 -0
- package/dist/agents/swarm.js +307 -0
- package/dist/agents/swarm.js.map +1 -0
- package/dist/{agterm → agents}/tools.d.ts +7 -5
- package/dist/agents/tools.d.ts.map +1 -0
- package/dist/agents/tools.js +776 -0
- package/dist/agents/tools.js.map +1 -0
- package/dist/{agterm → agents}/types.d.ts +14 -2
- package/dist/agents/types.d.ts.map +1 -0
- package/dist/{agterm → agents}/types.js +2 -2
- package/dist/agents/types.js.map +1 -0
- package/dist/api-server.d.ts +26 -0
- package/dist/api-server.d.ts.map +1 -0
- package/dist/api-server.js +230 -0
- package/dist/api-server.js.map +1 -0
- package/dist/auto-checkpoint.d.ts +35 -0
- package/dist/auto-checkpoint.d.ts.map +1 -0
- package/dist/auto-checkpoint.js +143 -0
- package/dist/auto-checkpoint.js.map +1 -0
- package/dist/auto-compressor.d.ts +44 -0
- package/dist/auto-compressor.d.ts.map +1 -0
- package/dist/auto-compressor.js +145 -0
- package/dist/auto-compressor.js.map +1 -0
- package/dist/background-jobs.d.ts +45 -0
- package/dist/background-jobs.d.ts.map +1 -0
- package/dist/background-jobs.js +122 -0
- package/dist/background-jobs.js.map +1 -0
- package/dist/bin.d.ts +6 -2
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +127 -24
- package/dist/bin.js.map +1 -1
- package/dist/checkpoint.d.ts +49 -0
- package/dist/checkpoint.d.ts.map +1 -0
- package/dist/checkpoint.js +219 -0
- package/dist/checkpoint.js.map +1 -0
- package/dist/circuit-breaker/breaker.d.ts +80 -0
- package/dist/circuit-breaker/breaker.d.ts.map +1 -0
- package/dist/circuit-breaker/breaker.js +408 -0
- package/dist/circuit-breaker/breaker.js.map +1 -0
- package/dist/circuit-breaker/defaults.d.ts +8 -0
- package/dist/circuit-breaker/defaults.d.ts.map +1 -0
- package/dist/circuit-breaker/defaults.js +35 -0
- package/dist/circuit-breaker/defaults.js.map +1 -0
- package/dist/circuit-breaker/index.d.ts +9 -0
- package/dist/circuit-breaker/index.d.ts.map +1 -0
- package/dist/circuit-breaker/index.js +8 -0
- package/dist/circuit-breaker/index.js.map +1 -0
- package/dist/circuit-breaker/types.d.ts +77 -0
- package/dist/circuit-breaker/types.d.ts.map +1 -0
- package/dist/circuit-breaker/types.js +8 -0
- package/dist/circuit-breaker/types.js.map +1 -0
- package/dist/circuit-breaker.d.ts +8 -0
- package/dist/circuit-breaker.d.ts.map +1 -0
- package/dist/circuit-breaker.js +7 -0
- package/dist/circuit-breaker.js.map +1 -0
- package/dist/cli/agent.d.ts +9 -0
- package/dist/cli/agent.d.ts.map +1 -0
- package/dist/cli/agent.js +262 -0
- package/dist/cli/agent.js.map +1 -0
- package/dist/cli/commands.d.ts +12 -0
- package/dist/cli/commands.d.ts.map +1 -0
- package/dist/{cli.js → cli/commands.js} +285 -422
- package/dist/cli/commands.js.map +1 -0
- package/dist/cli/index.d.ts +8 -0
- package/dist/cli/index.d.ts.map +1 -0
- package/dist/cli/index.js +222 -0
- package/dist/cli/index.js.map +1 -0
- package/dist/cli/types.d.ts +30 -0
- package/dist/cli/types.d.ts.map +1 -0
- package/dist/cli/types.js +20 -0
- package/dist/cli/types.js.map +1 -0
- package/dist/companions.d.ts +54 -0
- package/dist/companions.d.ts.map +1 -0
- package/dist/companions.js +440 -0
- package/dist/companions.js.map +1 -0
- package/dist/config.d.ts +23 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +95 -22
- package/dist/config.js.map +1 -1
- package/dist/diff.d.ts +27 -0
- package/dist/diff.d.ts.map +1 -1
- package/dist/diff.js +415 -10
- package/dist/diff.js.map +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +20 -11
- package/dist/errors.js.map +1 -1
- package/dist/git-status.d.ts +23 -0
- package/dist/git-status.d.ts.map +1 -0
- package/dist/git-status.js +92 -0
- package/dist/git-status.js.map +1 -0
- package/dist/headless.d.ts +25 -0
- package/dist/headless.d.ts.map +1 -0
- package/dist/headless.js +182 -0
- package/dist/headless.js.map +1 -0
- package/dist/hud/api.d.ts +35 -0
- package/dist/hud/api.d.ts.map +1 -0
- package/dist/hud/api.js +448 -0
- package/dist/hud/api.js.map +1 -0
- package/dist/hud/palettes.d.ts +9 -0
- package/dist/hud/palettes.d.ts.map +1 -0
- package/dist/hud/palettes.js +280 -0
- package/dist/hud/palettes.js.map +1 -0
- package/dist/hud/skins.d.ts +12 -0
- package/dist/hud/skins.d.ts.map +1 -0
- package/dist/hud/skins.js +365 -0
- package/dist/hud/skins.js.map +1 -0
- package/dist/hud/theme-packs/api.d.ts +51 -0
- package/dist/hud/theme-packs/api.d.ts.map +1 -0
- package/dist/hud/theme-packs/api.js +145 -0
- package/dist/hud/theme-packs/api.js.map +1 -0
- package/dist/hud/theme-packs/index.d.ts +18 -0
- package/dist/hud/theme-packs/index.d.ts.map +1 -0
- package/dist/hud/theme-packs/index.js +38 -0
- package/dist/hud/theme-packs/index.js.map +1 -0
- package/dist/hud/theme-packs/types.d.ts +29 -0
- package/dist/hud/theme-packs/types.d.ts.map +1 -0
- package/dist/hud/theme-packs/types.js +9 -0
- package/dist/hud/theme-packs/types.js.map +1 -0
- package/dist/hud/types.d.ts +182 -0
- package/dist/hud/types.d.ts.map +1 -0
- package/dist/hud/types.js +7 -0
- package/dist/hud/types.js.map +1 -0
- package/dist/idle-eviction.d.ts +34 -0
- package/dist/idle-eviction.d.ts.map +1 -0
- package/dist/idle-eviction.js +78 -0
- package/dist/idle-eviction.js.map +1 -0
- package/dist/index.d.ts +9 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -3
- package/dist/index.js.map +1 -1
- package/dist/iteration-ledger.d.ts +105 -0
- package/dist/iteration-ledger.d.ts.map +1 -0
- package/dist/iteration-ledger.js +237 -0
- package/dist/iteration-ledger.js.map +1 -0
- package/dist/markdown.d.ts.map +1 -1
- package/dist/markdown.js +1 -27
- package/dist/markdown.js.map +1 -1
- package/dist/mcp.d.ts +35 -0
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +291 -7
- package/dist/mcp.js.map +1 -1
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +12 -2
- package/dist/memory.js.map +1 -1
- package/dist/model-detection.d.ts +5 -0
- package/dist/model-detection.d.ts.map +1 -1
- package/dist/model-detection.js +278 -10
- package/dist/model-detection.js.map +1 -1
- package/dist/model-router.d.ts.map +1 -1
- package/dist/model-router.js +33 -11
- package/dist/model-router.js.map +1 -1
- package/dist/plugins.d.ts +8 -0
- package/dist/plugins.d.ts.map +1 -1
- package/dist/plugins.js +97 -6
- package/dist/plugins.js.map +1 -1
- package/dist/providers/anthropic.d.ts +10 -0
- package/dist/providers/anthropic.d.ts.map +1 -0
- package/dist/providers/anthropic.js +221 -0
- package/dist/providers/anthropic.js.map +1 -0
- package/dist/providers/bedrock.d.ts +17 -0
- package/dist/providers/bedrock.d.ts.map +1 -0
- package/dist/providers/bedrock.js +574 -0
- package/dist/providers/bedrock.js.map +1 -0
- package/dist/providers/compat.d.ts +13 -0
- package/dist/providers/compat.d.ts.map +1 -0
- package/dist/providers/compat.js +202 -0
- package/dist/providers/compat.js.map +1 -0
- package/dist/providers/google.d.ts +10 -0
- package/dist/providers/google.d.ts.map +1 -0
- package/dist/providers/google.js +203 -0
- package/dist/providers/google.js.map +1 -0
- package/dist/providers/index.d.ts +23 -0
- package/dist/providers/index.d.ts.map +1 -0
- package/dist/providers/index.js +145 -0
- package/dist/providers/index.js.map +1 -0
- package/dist/providers/ollama.d.ts +17 -0
- package/dist/providers/ollama.d.ts.map +1 -0
- package/dist/providers/ollama.js +289 -0
- package/dist/providers/ollama.js.map +1 -0
- package/dist/providers/openai.d.ts +121 -0
- package/dist/providers/openai.d.ts.map +1 -0
- package/dist/providers/openai.js +485 -0
- package/dist/providers/openai.js.map +1 -0
- package/dist/providers/types.d.ts +63 -0
- package/dist/providers/types.d.ts.map +1 -0
- package/dist/providers/types.js +164 -0
- package/dist/providers/types.js.map +1 -0
- package/dist/sandbox-native.d.ts +59 -0
- package/dist/sandbox-native.d.ts.map +1 -0
- package/dist/sandbox-native.js +292 -0
- package/dist/sandbox-native.js.map +1 -0
- package/dist/sandbox.d.ts +2 -2
- package/dist/sandbox.d.ts.map +1 -1
- package/dist/sandbox.js +59 -13
- package/dist/sandbox.js.map +1 -1
- package/dist/scope.d.ts +3 -1
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +13 -1
- package/dist/scope.js.map +1 -1
- package/dist/session-timeout.d.ts +31 -0
- package/dist/session-timeout.d.ts.map +1 -0
- package/dist/session-timeout.js +100 -0
- package/dist/session-timeout.js.map +1 -0
- package/dist/setup.d.ts.map +1 -1
- package/dist/setup.js +29 -17
- package/dist/setup.js.map +1 -1
- package/dist/smart-router.d.ts +73 -0
- package/dist/smart-router.d.ts.map +1 -0
- package/dist/smart-router.js +332 -0
- package/dist/smart-router.js.map +1 -0
- package/dist/storage.d.ts +19 -0
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +164 -1
- package/dist/storage.js.map +1 -1
- package/dist/streaming.d.ts +4 -0
- package/dist/streaming.d.ts.map +1 -1
- package/dist/streaming.js +12 -0
- package/dist/streaming.js.map +1 -1
- package/dist/styles.d.ts +32 -0
- package/dist/styles.d.ts.map +1 -1
- package/dist/styles.js +91 -0
- package/dist/styles.js.map +1 -1
- package/dist/summarization.d.ts +1 -1
- package/dist/summarization.js +4 -4
- package/dist/summarization.js.map +1 -1
- package/dist/terminal-image.d.ts +115 -0
- package/dist/terminal-image.d.ts.map +1 -0
- package/dist/terminal-image.js +766 -0
- package/dist/terminal-image.js.map +1 -0
- package/dist/terminal-recording.d.ts +55 -0
- package/dist/terminal-recording.d.ts.map +1 -0
- package/dist/terminal-recording.js +182 -0
- package/dist/terminal-recording.js.map +1 -0
- package/dist/themes.d.ts +19 -35
- package/dist/themes.d.ts.map +1 -1
- package/dist/themes.js +101 -210
- package/dist/themes.js.map +1 -1
- package/dist/tmux.d.ts +35 -0
- package/dist/tmux.d.ts.map +1 -0
- package/dist/tmux.js +106 -0
- package/dist/tmux.js.map +1 -0
- package/dist/tools.d.ts +3 -3
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +587 -45
- package/dist/tools.js.map +1 -1
- package/dist/trust.d.ts +53 -0
- package/dist/trust.d.ts.map +1 -0
- package/dist/trust.js +154 -0
- package/dist/trust.js.map +1 -0
- package/dist/types.d.ts +7 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +70 -32
- package/dist/types.js.map +1 -1
- package/dist/ui/agent.d.ts +61 -0
- package/dist/ui/agent.d.ts.map +1 -0
- package/dist/ui/agent.js +768 -0
- package/dist/ui/agent.js.map +1 -0
- package/dist/ui/chat-input.d.ts +32 -0
- package/dist/ui/chat-input.d.ts.map +1 -0
- package/dist/ui/chat-input.js +355 -0
- package/dist/ui/chat-input.js.map +1 -0
- package/dist/ui/commands.d.ts +92 -0
- package/dist/ui/commands.d.ts.map +1 -0
- package/dist/ui/commands.js +3006 -0
- package/dist/ui/commands.js.map +1 -0
- package/dist/ui/completions.d.ts +22 -0
- package/dist/ui/completions.d.ts.map +1 -0
- package/dist/ui/completions.js +215 -0
- package/dist/ui/completions.js.map +1 -0
- package/dist/ui/components.d.ts +38 -0
- package/dist/ui/components.d.ts.map +1 -0
- package/dist/ui/components.js +422 -0
- package/dist/ui/components.js.map +1 -0
- package/dist/ui/context.d.ts +12 -0
- package/dist/ui/context.d.ts.map +1 -0
- package/dist/ui/context.js +102 -0
- package/dist/ui/context.js.map +1 -0
- package/dist/ui/error-boundary.d.ts +33 -0
- package/dist/ui/error-boundary.d.ts.map +1 -0
- package/dist/ui/error-boundary.js +94 -0
- package/dist/ui/error-boundary.js.map +1 -0
- package/dist/ui/frame.d.ts +13 -0
- package/dist/ui/frame.d.ts.map +1 -0
- package/dist/ui/frame.js +89 -0
- package/dist/ui/frame.js.map +1 -0
- package/dist/ui/index.d.ts +12 -0
- package/dist/ui/index.d.ts.map +1 -0
- package/dist/ui/index.js +928 -0
- package/dist/ui/index.js.map +1 -0
- package/dist/ui/messages.d.ts +19 -0
- package/dist/ui/messages.d.ts.map +1 -0
- package/dist/ui/messages.js +181 -0
- package/dist/ui/messages.js.map +1 -0
- package/dist/ui/modals.d.ts +52 -0
- package/dist/ui/modals.d.ts.map +1 -0
- package/dist/ui/modals.js +204 -0
- package/dist/ui/modals.js.map +1 -0
- package/dist/ui/pack-picker.d.ts +12 -0
- package/dist/ui/pack-picker.d.ts.map +1 -0
- package/dist/ui/pack-picker.js +101 -0
- package/dist/ui/pack-picker.js.map +1 -0
- package/dist/ui/status-bar.d.ts +20 -0
- package/dist/ui/status-bar.d.ts.map +1 -0
- package/dist/ui/status-bar.js +41 -0
- package/dist/ui/status-bar.js.map +1 -0
- package/dist/ui/theme-picker.d.ts +24 -0
- package/dist/ui/theme-picker.d.ts.map +1 -0
- package/dist/ui/theme-picker.js +190 -0
- package/dist/ui/theme-picker.js.map +1 -0
- package/dist/ui/types.d.ts +62 -0
- package/dist/ui/types.d.ts.map +1 -0
- package/dist/ui/types.js +7 -0
- package/dist/ui/types.js.map +1 -0
- package/dist/version-check.d.ts.map +1 -1
- package/dist/version-check.js +1 -9
- package/dist/version-check.js.map +1 -1
- package/package.json +8 -3
- package/dist/agterm/agent-detection.js.map +0 -1
- package/dist/agterm/cli-backend.js.map +0 -1
- package/dist/agterm/index.d.ts +0 -12
- package/dist/agterm/index.d.ts.map +0 -1
- package/dist/agterm/index.js +0 -15
- package/dist/agterm/index.js.map +0 -1
- package/dist/agterm/orchestrator.d.ts.map +0 -1
- package/dist/agterm/orchestrator.js.map +0 -1
- package/dist/agterm/tools.d.ts.map +0 -1
- package/dist/agterm/tools.js +0 -278
- package/dist/agterm/tools.js.map +0 -1
- package/dist/agterm/types.d.ts.map +0 -1
- package/dist/agterm/types.js.map +0 -1
- package/dist/cli.d.ts +0 -14
- package/dist/cli.d.ts.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/providers.d.ts +0 -51
- package/dist/providers.d.ts.map +0 -1
- package/dist/providers.js +0 -1146
- package/dist/providers.js.map +0 -1
- package/dist/ui-cli.d.ts +0 -17
- package/dist/ui-cli.d.ts.map +0 -1
- package/dist/ui-cli.js +0 -3730
- package/dist/ui-cli.js.map +0 -1
package/dist/diff.js
CHANGED
|
@@ -2,11 +2,17 @@
|
|
|
2
2
|
* Calliope CLI - Diff Preview System
|
|
3
3
|
*
|
|
4
4
|
* Shows diffs before applying file changes, with approve/reject workflow.
|
|
5
|
+
* Supports inline, unified, and side-by-side diff display styles.
|
|
6
|
+
* Colors come from the active palette. Diff config comes from the active skin.
|
|
5
7
|
*/
|
|
6
8
|
import * as fs from 'fs';
|
|
9
|
+
import { colors as COLORS } from './styles.js';
|
|
10
|
+
import { getCurrentSkin, getCurrentPalette } from './hud/api.js';
|
|
7
11
|
// ============================================================================
|
|
8
12
|
// Diff Generation
|
|
9
13
|
// ============================================================================
|
|
14
|
+
// Max file size for LCS diff (100KB) — larger files use simple line diff to avoid OOM
|
|
15
|
+
const MAX_LCS_SIZE = 100_000;
|
|
10
16
|
/**
|
|
11
17
|
* Simple line-by-line diff algorithm
|
|
12
18
|
*/
|
|
@@ -19,6 +25,10 @@ export function generateDiff(oldContent, newContent, path) {
|
|
|
19
25
|
// Add header
|
|
20
26
|
diffLines.push({ type: 'header', content: `--- a/${path}` });
|
|
21
27
|
diffLines.push({ type: 'header', content: `+++ b/${path}` });
|
|
28
|
+
// For large files, fall back to simple line-by-line comparison to avoid O(n*m) OOM
|
|
29
|
+
if (oldContent.length > MAX_LCS_SIZE || newContent.length > MAX_LCS_SIZE) {
|
|
30
|
+
return generateSimpleDiff(oldLines, newLines, path, diffLines);
|
|
31
|
+
}
|
|
22
32
|
// Simple LCS-based diff
|
|
23
33
|
const lcs = longestCommonSubsequence(oldLines, newLines);
|
|
24
34
|
let oldIdx = 0;
|
|
@@ -85,6 +95,32 @@ export function generateDiff(oldContent, newContent, path) {
|
|
|
85
95
|
deletions,
|
|
86
96
|
};
|
|
87
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Simple line-by-line diff for large files (avoids O(n*m) LCS)
|
|
100
|
+
*/
|
|
101
|
+
function generateSimpleDiff(oldLines, newLines, path, diffLines) {
|
|
102
|
+
let additions = 0;
|
|
103
|
+
let deletions = 0;
|
|
104
|
+
const maxLen = Math.max(oldLines.length, newLines.length);
|
|
105
|
+
for (let i = 0; i < maxLen; i++) {
|
|
106
|
+
const oldLine = i < oldLines.length ? oldLines[i] : undefined;
|
|
107
|
+
const newLine = i < newLines.length ? newLines[i] : undefined;
|
|
108
|
+
if (oldLine === newLine) {
|
|
109
|
+
diffLines.push({ type: 'context', content: oldLine, oldLineNum: i + 1, newLineNum: i + 1 });
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
if (oldLine !== undefined) {
|
|
113
|
+
diffLines.push({ type: 'remove', content: oldLine, oldLineNum: i + 1 });
|
|
114
|
+
deletions++;
|
|
115
|
+
}
|
|
116
|
+
if (newLine !== undefined) {
|
|
117
|
+
diffLines.push({ type: 'add', content: newLine, newLineNum: i + 1 });
|
|
118
|
+
additions++;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
return { path, oldContent: oldLines.join('\n'), newContent: newLines.join('\n'), lines: diffLines, additions, deletions };
|
|
123
|
+
}
|
|
88
124
|
/**
|
|
89
125
|
* LCS algorithm for diff
|
|
90
126
|
*/
|
|
@@ -123,16 +159,6 @@ function longestCommonSubsequence(a, b) {
|
|
|
123
159
|
// ============================================================================
|
|
124
160
|
// Diff Formatting
|
|
125
161
|
// ============================================================================
|
|
126
|
-
// ANSI colors
|
|
127
|
-
const COLORS = {
|
|
128
|
-
reset: '\x1b[0m',
|
|
129
|
-
red: '\x1b[31m',
|
|
130
|
-
green: '\x1b[32m',
|
|
131
|
-
cyan: '\x1b[36m',
|
|
132
|
-
dim: '\x1b[2m',
|
|
133
|
-
bgRed: '\x1b[41m',
|
|
134
|
-
bgGreen: '\x1b[42m',
|
|
135
|
-
};
|
|
136
162
|
/**
|
|
137
163
|
* Format diff for terminal display
|
|
138
164
|
*/
|
|
@@ -379,4 +405,383 @@ export function formatChangeSummary(additions, deletions) {
|
|
|
379
405
|
export function createDiff(oldContent, newContent, path) {
|
|
380
406
|
return generateDiff(oldContent, newContent, path);
|
|
381
407
|
}
|
|
408
|
+
// ============================================================================
|
|
409
|
+
// Skin-Aware Diff Formatting
|
|
410
|
+
// ============================================================================
|
|
411
|
+
/**
|
|
412
|
+
* Get diff colors from the current palette
|
|
413
|
+
*/
|
|
414
|
+
function getDiffColors() {
|
|
415
|
+
try {
|
|
416
|
+
const palette = getCurrentPalette();
|
|
417
|
+
return {
|
|
418
|
+
add: palette.colors.diffAdd || COLORS.green,
|
|
419
|
+
remove: palette.colors.diffRemove || COLORS.red,
|
|
420
|
+
context: palette.colors.diffContext || COLORS.dim,
|
|
421
|
+
header: palette.colors.info || COLORS.cyan,
|
|
422
|
+
reset: COLORS.reset,
|
|
423
|
+
};
|
|
424
|
+
}
|
|
425
|
+
catch {
|
|
426
|
+
return { add: COLORS.green, remove: COLORS.red, context: COLORS.dim, header: COLORS.cyan, reset: COLORS.reset };
|
|
427
|
+
}
|
|
428
|
+
}
|
|
429
|
+
/**
|
|
430
|
+
* Get diff config from the current skin
|
|
431
|
+
*/
|
|
432
|
+
function getDiffConfig() {
|
|
433
|
+
try {
|
|
434
|
+
return getCurrentSkin().diff;
|
|
435
|
+
}
|
|
436
|
+
catch {
|
|
437
|
+
return {
|
|
438
|
+
style: 'inline',
|
|
439
|
+
showLineNumbers: true,
|
|
440
|
+
contextLines: 2,
|
|
441
|
+
maxLineWidth: 80,
|
|
442
|
+
wordDiff: false,
|
|
443
|
+
header: 'action',
|
|
444
|
+
};
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
// ============================================================================
|
|
448
|
+
// Unified Diff Formatter
|
|
449
|
+
// ============================================================================
|
|
450
|
+
/**
|
|
451
|
+
* Format diff in unified style (standard @@ hunk markers, ---/+++ headers)
|
|
452
|
+
*/
|
|
453
|
+
export function formatUnifiedDiff(diff, options) {
|
|
454
|
+
const config = { ...getDiffConfig(), ...options };
|
|
455
|
+
const dc = getDiffColors();
|
|
456
|
+
const lines = [];
|
|
457
|
+
// Header
|
|
458
|
+
if (config.header === 'path' || config.header === 'hunk') {
|
|
459
|
+
lines.push(`${dc.header}--- a/${diff.path}${dc.reset}`);
|
|
460
|
+
lines.push(`${dc.header}+++ b/${diff.path}${dc.reset}`);
|
|
461
|
+
}
|
|
462
|
+
else if (config.header === 'action') {
|
|
463
|
+
const action = diff.deletions === 0 ? 'Create' : diff.additions === 0 ? 'Delete' : 'Update';
|
|
464
|
+
lines.push(`${dc.header}${action}(${diff.path})${dc.reset}`);
|
|
465
|
+
}
|
|
466
|
+
lines.push('');
|
|
467
|
+
// Group into hunks
|
|
468
|
+
const diffLines = diff.lines.filter(l => l.type !== 'header');
|
|
469
|
+
const chunks = groupDiffChunks(diffLines, config.contextLines);
|
|
470
|
+
for (const chunk of chunks) {
|
|
471
|
+
// Hunk header
|
|
472
|
+
const oldStart = chunk.find(l => l.oldLineNum)?.oldLineNum || 1;
|
|
473
|
+
const newStart = chunk.find(l => l.newLineNum)?.newLineNum || 1;
|
|
474
|
+
const oldCount = chunk.filter(l => l.type === 'remove' || l.type === 'context').length;
|
|
475
|
+
const newCount = chunk.filter(l => l.type === 'add' || l.type === 'context').length;
|
|
476
|
+
lines.push(`${dc.header}@@ -${oldStart},${oldCount} +${newStart},${newCount} @@${dc.reset}`);
|
|
477
|
+
for (const line of chunk) {
|
|
478
|
+
const rawContent = line.content.substring(0, config.maxLineWidth);
|
|
479
|
+
// Apply syntax highlighting to context lines for readability
|
|
480
|
+
const content = line.type === 'context' ? highlightSyntax(rawContent, diff.path) : rawContent;
|
|
481
|
+
const lineNum = config.showLineNumbers
|
|
482
|
+
? (line.type === 'remove'
|
|
483
|
+
? (line.oldLineNum?.toString() || '').padStart(4)
|
|
484
|
+
: (line.newLineNum?.toString() || '').padStart(4)) + ' '
|
|
485
|
+
: '';
|
|
486
|
+
switch (line.type) {
|
|
487
|
+
case 'add':
|
|
488
|
+
lines.push(`${dc.add}${lineNum}+${content}${dc.reset}`);
|
|
489
|
+
break;
|
|
490
|
+
case 'remove':
|
|
491
|
+
lines.push(`${dc.remove}${lineNum}-${content}${dc.reset}`);
|
|
492
|
+
break;
|
|
493
|
+
case 'context':
|
|
494
|
+
lines.push(`${dc.context}${lineNum} ${dc.reset}${content}`);
|
|
495
|
+
break;
|
|
496
|
+
}
|
|
497
|
+
}
|
|
498
|
+
lines.push('');
|
|
499
|
+
}
|
|
500
|
+
// Summary
|
|
501
|
+
lines.push(`${dc.add}+${diff.additions}${dc.reset} ${dc.remove}-${diff.deletions}${dc.reset}`);
|
|
502
|
+
return lines.join('\n');
|
|
503
|
+
}
|
|
504
|
+
// ============================================================================
|
|
505
|
+
// Side-by-Side Diff Formatter
|
|
506
|
+
// ============================================================================
|
|
507
|
+
/**
|
|
508
|
+
* Format diff in side-by-side two-column display
|
|
509
|
+
*/
|
|
510
|
+
export function formatSideBySideDiff(diff, termWidth, options) {
|
|
511
|
+
const config = { ...getDiffConfig(), ...options };
|
|
512
|
+
const dc = getDiffColors();
|
|
513
|
+
const lines = [];
|
|
514
|
+
const width = termWidth || (process.stdout.columns || 120);
|
|
515
|
+
const colWidth = Math.floor((width - 3) / 2); // 3 for the separator " | "
|
|
516
|
+
// Header
|
|
517
|
+
if (config.header === 'path' || config.header === 'hunk') {
|
|
518
|
+
lines.push(`${dc.header}--- a/${diff.path}${dc.reset}${''.padEnd(colWidth - diff.path.length - 6)}${dc.header}+++ b/${diff.path}${dc.reset}`);
|
|
519
|
+
}
|
|
520
|
+
else if (config.header === 'action') {
|
|
521
|
+
const action = diff.deletions === 0 ? 'Create' : diff.additions === 0 ? 'Delete' : 'Update';
|
|
522
|
+
lines.push(`${dc.header}${action}(${diff.path})${dc.reset}`);
|
|
523
|
+
}
|
|
524
|
+
lines.push(`${'─'.repeat(colWidth)} │ ${'─'.repeat(colWidth)}`);
|
|
525
|
+
// Pair up removed/added lines for side-by-side
|
|
526
|
+
const diffLines = diff.lines.filter(l => l.type !== 'header');
|
|
527
|
+
const chunks = groupDiffChunks(diffLines, config.contextLines);
|
|
528
|
+
for (const chunk of chunks) {
|
|
529
|
+
// Build paired lines
|
|
530
|
+
const pairs = [];
|
|
531
|
+
let i = 0;
|
|
532
|
+
while (i < chunk.length) {
|
|
533
|
+
const line = chunk[i];
|
|
534
|
+
if (line.type === 'context') {
|
|
535
|
+
pairs.push({ left: line, right: line });
|
|
536
|
+
i++;
|
|
537
|
+
}
|
|
538
|
+
else if (line.type === 'remove') {
|
|
539
|
+
// Collect consecutive removes, then pair with consecutive adds
|
|
540
|
+
const removes = [];
|
|
541
|
+
while (i < chunk.length && chunk[i].type === 'remove') {
|
|
542
|
+
removes.push(chunk[i]);
|
|
543
|
+
i++;
|
|
544
|
+
}
|
|
545
|
+
const adds = [];
|
|
546
|
+
while (i < chunk.length && chunk[i].type === 'add') {
|
|
547
|
+
adds.push(chunk[i]);
|
|
548
|
+
i++;
|
|
549
|
+
}
|
|
550
|
+
const maxPairs = Math.max(removes.length, adds.length);
|
|
551
|
+
for (let j = 0; j < maxPairs; j++) {
|
|
552
|
+
pairs.push({
|
|
553
|
+
left: j < removes.length ? removes[j] : null,
|
|
554
|
+
right: j < adds.length ? adds[j] : null,
|
|
555
|
+
});
|
|
556
|
+
}
|
|
557
|
+
}
|
|
558
|
+
else if (line.type === 'add') {
|
|
559
|
+
pairs.push({ left: null, right: line });
|
|
560
|
+
i++;
|
|
561
|
+
}
|
|
562
|
+
else {
|
|
563
|
+
i++;
|
|
564
|
+
}
|
|
565
|
+
}
|
|
566
|
+
for (const pair of pairs) {
|
|
567
|
+
const leftContent = pair.left ? pair.left.content.substring(0, colWidth - 6) : '';
|
|
568
|
+
const rightContent = pair.right ? pair.right.content.substring(0, colWidth - 6) : '';
|
|
569
|
+
const leftNum = pair.left
|
|
570
|
+
? (pair.left.oldLineNum?.toString() || '').padStart(4) + ' '
|
|
571
|
+
: ' ';
|
|
572
|
+
const rightNum = pair.right
|
|
573
|
+
? (pair.right.newLineNum?.toString() || '').padStart(4) + ' '
|
|
574
|
+
: ' ';
|
|
575
|
+
let leftFormatted;
|
|
576
|
+
let rightFormatted;
|
|
577
|
+
if (pair.left?.type === 'remove') {
|
|
578
|
+
leftFormatted = `${dc.remove}${leftNum}${leftContent}${dc.reset}`;
|
|
579
|
+
}
|
|
580
|
+
else if (pair.left?.type === 'context') {
|
|
581
|
+
leftFormatted = `${dc.context}${leftNum}${leftContent}${dc.reset}`;
|
|
582
|
+
}
|
|
583
|
+
else {
|
|
584
|
+
leftFormatted = `${leftNum}${leftContent}`;
|
|
585
|
+
}
|
|
586
|
+
if (pair.right?.type === 'add') {
|
|
587
|
+
rightFormatted = `${dc.add}${rightNum}${rightContent}${dc.reset}`;
|
|
588
|
+
}
|
|
589
|
+
else if (pair.right?.type === 'context') {
|
|
590
|
+
rightFormatted = `${dc.context}${rightNum}${rightContent}${dc.reset}`;
|
|
591
|
+
}
|
|
592
|
+
else {
|
|
593
|
+
rightFormatted = `${rightNum}${rightContent}`;
|
|
594
|
+
}
|
|
595
|
+
// Pad to column width (approximate — ANSI codes make exact alignment hard)
|
|
596
|
+
const leftPadded = leftContent.padEnd(colWidth - 5);
|
|
597
|
+
const rightPadded = rightContent;
|
|
598
|
+
if (pair.left?.type === 'remove') {
|
|
599
|
+
lines.push(`${dc.remove}${leftNum}${leftPadded}${dc.reset} ${COLORS.dim}│${COLORS.reset} ${pair.right ? (pair.right.type === 'add' ? dc.add : dc.context) : ''}${rightNum}${rightPadded}${dc.reset}`);
|
|
600
|
+
}
|
|
601
|
+
else if (pair.left?.type === 'context') {
|
|
602
|
+
lines.push(`${dc.context}${leftNum}${leftPadded}${dc.reset} ${COLORS.dim}│${COLORS.reset} ${dc.context}${rightNum}${rightPadded}${dc.reset}`);
|
|
603
|
+
}
|
|
604
|
+
else {
|
|
605
|
+
lines.push(`${leftNum}${leftPadded} ${COLORS.dim}│${COLORS.reset} ${pair.right?.type === 'add' ? dc.add : ''}${rightNum}${rightPadded}${dc.reset}`);
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
lines.push('');
|
|
609
|
+
}
|
|
610
|
+
lines.push(`${dc.add}+${diff.additions}${dc.reset} ${dc.remove}-${diff.deletions}${dc.reset}`);
|
|
611
|
+
return lines.join('\n');
|
|
612
|
+
}
|
|
613
|
+
// ============================================================================
|
|
614
|
+
// Word-Level Diff
|
|
615
|
+
// ============================================================================
|
|
616
|
+
/**
|
|
617
|
+
* Compute word-level diff between two lines, returning highlighted segments
|
|
618
|
+
*/
|
|
619
|
+
export function wordDiff(oldLine, newLine) {
|
|
620
|
+
const dc = getDiffColors();
|
|
621
|
+
const oldWords = oldLine.split(/(\s+)/);
|
|
622
|
+
const newWords = newLine.split(/(\s+)/);
|
|
623
|
+
// Simple LCS on words
|
|
624
|
+
const m = oldWords.length;
|
|
625
|
+
const n = newWords.length;
|
|
626
|
+
const dp = Array(m + 1).fill(null).map(() => Array(n + 1).fill(0));
|
|
627
|
+
for (let i = 1; i <= m; i++) {
|
|
628
|
+
for (let j = 1; j <= n; j++) {
|
|
629
|
+
if (oldWords[i - 1] === newWords[j - 1]) {
|
|
630
|
+
dp[i][j] = dp[i - 1][j - 1] + 1;
|
|
631
|
+
}
|
|
632
|
+
else {
|
|
633
|
+
dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
|
|
634
|
+
}
|
|
635
|
+
}
|
|
636
|
+
}
|
|
637
|
+
// Backtrack
|
|
638
|
+
const lcs = [];
|
|
639
|
+
let i = m, j = n;
|
|
640
|
+
while (i > 0 && j > 0) {
|
|
641
|
+
if (oldWords[i - 1] === newWords[j - 1]) {
|
|
642
|
+
lcs.unshift([i - 1, j - 1]);
|
|
643
|
+
i--;
|
|
644
|
+
j--;
|
|
645
|
+
}
|
|
646
|
+
else if (dp[i - 1][j] > dp[i][j - 1]) {
|
|
647
|
+
i--;
|
|
648
|
+
}
|
|
649
|
+
else {
|
|
650
|
+
j--;
|
|
651
|
+
}
|
|
652
|
+
}
|
|
653
|
+
// Build highlighted old line
|
|
654
|
+
let oldResult = '';
|
|
655
|
+
let oi = 0;
|
|
656
|
+
for (const [oldIdx] of lcs) {
|
|
657
|
+
// Removed words before this match
|
|
658
|
+
while (oi < oldIdx) {
|
|
659
|
+
oldResult += `${dc.remove}${COLORS.bold}${oldWords[oi]}${dc.reset}${dc.remove}`;
|
|
660
|
+
oi++;
|
|
661
|
+
}
|
|
662
|
+
oldResult += oldWords[oi];
|
|
663
|
+
oi++;
|
|
664
|
+
}
|
|
665
|
+
while (oi < oldWords.length) {
|
|
666
|
+
oldResult += `${dc.remove}${COLORS.bold}${oldWords[oi]}${dc.reset}${dc.remove}`;
|
|
667
|
+
oi++;
|
|
668
|
+
}
|
|
669
|
+
// Build highlighted new line
|
|
670
|
+
let newResult = '';
|
|
671
|
+
let ni = 0;
|
|
672
|
+
for (const [, newIdx] of lcs) {
|
|
673
|
+
while (ni < newIdx) {
|
|
674
|
+
newResult += `${dc.add}${COLORS.bold}${newWords[ni]}${dc.reset}${dc.add}`;
|
|
675
|
+
ni++;
|
|
676
|
+
}
|
|
677
|
+
newResult += newWords[ni];
|
|
678
|
+
ni++;
|
|
679
|
+
}
|
|
680
|
+
while (ni < newWords.length) {
|
|
681
|
+
newResult += `${dc.add}${COLORS.bold}${newWords[ni]}${dc.reset}${dc.add}`;
|
|
682
|
+
ni++;
|
|
683
|
+
}
|
|
684
|
+
return { old: oldResult, new: newResult };
|
|
685
|
+
}
|
|
686
|
+
// ============================================================================
|
|
687
|
+
// Syntax Highlighting (#30)
|
|
688
|
+
// ============================================================================
|
|
689
|
+
/** Language detection from file extension */
|
|
690
|
+
function detectLanguage(path) {
|
|
691
|
+
const ext = path.split('.').pop()?.toLowerCase();
|
|
692
|
+
const langMap = {
|
|
693
|
+
ts: 'typescript', tsx: 'typescript', js: 'javascript', jsx: 'javascript', mjs: 'javascript',
|
|
694
|
+
py: 'python', rb: 'ruby', rs: 'rust', go: 'go', java: 'java', c: 'c', cpp: 'cpp', h: 'c',
|
|
695
|
+
cs: 'csharp', swift: 'swift', kt: 'kotlin', sh: 'shell', bash: 'shell', zsh: 'shell',
|
|
696
|
+
json: 'json', yaml: 'yaml', yml: 'yaml', toml: 'toml', md: 'markdown',
|
|
697
|
+
html: 'html', css: 'css', scss: 'css', sql: 'sql',
|
|
698
|
+
};
|
|
699
|
+
return ext ? langMap[ext] || null : null;
|
|
700
|
+
}
|
|
701
|
+
/** Syntax highlighting rules per language group */
|
|
702
|
+
const SYNTAX_RULES = {
|
|
703
|
+
typescript: [
|
|
704
|
+
{ pattern: /(\/\/[^\n]*)/g, color: COLORS.dim }, // comments
|
|
705
|
+
{ pattern: /(\/\*[\s\S]*?\*\/)/g, color: COLORS.dim }, // block comments
|
|
706
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*`)/g, color: COLORS.green }, // strings
|
|
707
|
+
{ pattern: /\b(import|export|from|const|let|var|function|class|interface|type|enum|return|if|else|for|while|switch|case|break|continue|try|catch|throw|new|async|await|extends|implements)\b/g, color: COLORS.magenta }, // keywords
|
|
708
|
+
{ pattern: /\b(\d+\.?\d*)\b/g, color: COLORS.yellow }, // numbers
|
|
709
|
+
],
|
|
710
|
+
python: [
|
|
711
|
+
{ pattern: /(#[^\n]*)/g, color: COLORS.dim },
|
|
712
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|'''[\s\S]*?'''|"""[\s\S]*?""")/g, color: COLORS.green },
|
|
713
|
+
{ pattern: /\b(import|from|def|class|return|if|elif|else|for|while|try|except|raise|with|as|yield|lambda|pass|break|continue|and|or|not|in|is|None|True|False)\b/g, color: COLORS.magenta },
|
|
714
|
+
{ pattern: /\b(\d+\.?\d*)\b/g, color: COLORS.yellow },
|
|
715
|
+
],
|
|
716
|
+
go: [
|
|
717
|
+
{ pattern: /(\/\/[^\n]*)/g, color: COLORS.dim },
|
|
718
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`[^`]*`)/g, color: COLORS.green },
|
|
719
|
+
{ pattern: /\b(package|import|func|type|struct|interface|return|if|else|for|range|switch|case|break|continue|go|defer|chan|select|map|var|const)\b/g, color: COLORS.magenta },
|
|
720
|
+
{ pattern: /\b(\d+\.?\d*)\b/g, color: COLORS.yellow },
|
|
721
|
+
],
|
|
722
|
+
rust: [
|
|
723
|
+
{ pattern: /(\/\/[^\n]*)/g, color: COLORS.dim },
|
|
724
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/g, color: COLORS.green },
|
|
725
|
+
{ pattern: /\b(fn|let|mut|const|struct|enum|impl|trait|pub|use|mod|match|if|else|for|while|loop|return|self|Self|where|async|await|move|unsafe)\b/g, color: COLORS.magenta },
|
|
726
|
+
{ pattern: /\b(\d+\.?\d*)\b/g, color: COLORS.yellow },
|
|
727
|
+
],
|
|
728
|
+
shell: [
|
|
729
|
+
{ pattern: /(#[^\n]*)/g, color: COLORS.dim },
|
|
730
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/g, color: COLORS.green },
|
|
731
|
+
{ pattern: /\b(if|then|else|elif|fi|for|do|done|while|case|esac|function|return|export|local|readonly)\b/g, color: COLORS.magenta },
|
|
732
|
+
],
|
|
733
|
+
json: [
|
|
734
|
+
{ pattern: /("(?:[^"\\]|\\.)*")\s*:/g, color: COLORS.cyan }, // keys
|
|
735
|
+
{ pattern: /:\s*("(?:[^"\\]|\\.)*")/g, color: COLORS.green }, // string values
|
|
736
|
+
{ pattern: /:\s*(\d+\.?\d*)/g, color: COLORS.yellow }, // number values
|
|
737
|
+
{ pattern: /:\s*(true|false|null)\b/g, color: COLORS.magenta }, // special values
|
|
738
|
+
],
|
|
739
|
+
default: [
|
|
740
|
+
{ pattern: /(\/\/[^\n]*|#[^\n]*)/g, color: COLORS.dim },
|
|
741
|
+
{ pattern: /('(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/g, color: COLORS.green },
|
|
742
|
+
{ pattern: /\b(\d+\.?\d*)\b/g, color: COLORS.yellow },
|
|
743
|
+
],
|
|
744
|
+
};
|
|
745
|
+
// Aliases
|
|
746
|
+
SYNTAX_RULES.javascript = SYNTAX_RULES.typescript;
|
|
747
|
+
SYNTAX_RULES.c = SYNTAX_RULES.rust;
|
|
748
|
+
SYNTAX_RULES.cpp = SYNTAX_RULES.rust;
|
|
749
|
+
SYNTAX_RULES.java = SYNTAX_RULES.typescript;
|
|
750
|
+
SYNTAX_RULES.csharp = SYNTAX_RULES.typescript;
|
|
751
|
+
SYNTAX_RULES.swift = SYNTAX_RULES.rust;
|
|
752
|
+
SYNTAX_RULES.kotlin = SYNTAX_RULES.typescript;
|
|
753
|
+
SYNTAX_RULES.ruby = SYNTAX_RULES.python;
|
|
754
|
+
SYNTAX_RULES.css = SYNTAX_RULES.default;
|
|
755
|
+
SYNTAX_RULES.html = SYNTAX_RULES.default;
|
|
756
|
+
SYNTAX_RULES.sql = SYNTAX_RULES.default;
|
|
757
|
+
SYNTAX_RULES.yaml = SYNTAX_RULES.default;
|
|
758
|
+
SYNTAX_RULES.toml = SYNTAX_RULES.default;
|
|
759
|
+
SYNTAX_RULES.markdown = SYNTAX_RULES.default;
|
|
760
|
+
/**
|
|
761
|
+
* Apply syntax highlighting to a line of code
|
|
762
|
+
*/
|
|
763
|
+
export function highlightSyntax(line, filePath) {
|
|
764
|
+
const lang = detectLanguage(filePath);
|
|
765
|
+
const rules = lang ? SYNTAX_RULES[lang] || SYNTAX_RULES.default : SYNTAX_RULES.default;
|
|
766
|
+
let result = line;
|
|
767
|
+
for (const rule of rules) {
|
|
768
|
+
result = result.replace(rule.pattern, `${rule.color}$1${COLORS.reset}`);
|
|
769
|
+
}
|
|
770
|
+
return result;
|
|
771
|
+
}
|
|
772
|
+
/**
|
|
773
|
+
* Format a diff using the style from the current skin (or override)
|
|
774
|
+
*/
|
|
775
|
+
export function formatSkinDiff(diff, styleOverride, termWidth) {
|
|
776
|
+
const style = styleOverride || getDiffConfig().style;
|
|
777
|
+
switch (style) {
|
|
778
|
+
case 'unified':
|
|
779
|
+
return formatUnifiedDiff(diff);
|
|
780
|
+
case 'side-by-side':
|
|
781
|
+
return formatSideBySideDiff(diff, termWidth);
|
|
782
|
+
case 'inline':
|
|
783
|
+
default:
|
|
784
|
+
return formatDiff(diff, getDiffConfig().contextLines);
|
|
785
|
+
}
|
|
786
|
+
}
|
|
382
787
|
//# sourceMappingURL=diff.js.map
|
package/dist/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"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"}
|
package/dist/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,YAAY,GACZ,MAAM,GACN,iBAAiB,GACjB,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpE;AAMD;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,YAAY,GACZ,MAAM,GACN,iBAAiB,GACjB,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpE;AAMD;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CA+Q7D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CA4ClG;AAoBD;;GAEG;AACH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,CAAC,CAAC,CAmCZ;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAC1E,EAAE,EAAE,CAAC,EACL,OAAO,GAAE,YAAiB,GACzB,CAAC,CAEH;AAMD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAwCrF"}
|
package/dist/errors.js
CHANGED
|
@@ -12,12 +12,15 @@
|
|
|
12
12
|
export function classifyError(error) {
|
|
13
13
|
const message = error instanceof Error ? error.message : String(error);
|
|
14
14
|
const lowerMessage = message.toLowerCase();
|
|
15
|
+
// Extract HTTP status code from error object properties if available
|
|
16
|
+
const statusCode = error?.status ?? error?.statusCode ?? error?.code;
|
|
17
|
+
const numericStatus = typeof statusCode === 'number' ? statusCode : parseInt(String(statusCode), 10);
|
|
15
18
|
// Network errors
|
|
16
19
|
if (lowerMessage.includes('econnrefused') ||
|
|
17
20
|
lowerMessage.includes('enotfound') ||
|
|
18
21
|
lowerMessage.includes('network') ||
|
|
19
22
|
lowerMessage.includes('dns') ||
|
|
20
|
-
|
|
23
|
+
/\bsocket\b/i.test(message)) {
|
|
21
24
|
return {
|
|
22
25
|
category: 'network',
|
|
23
26
|
message: 'Network connection failed',
|
|
@@ -41,7 +44,8 @@ export function classifyError(error) {
|
|
|
41
44
|
// Rate limiting (temporary, can retry)
|
|
42
45
|
if (lowerMessage.includes('rate limit') ||
|
|
43
46
|
lowerMessage.includes('too many requests') ||
|
|
44
|
-
|
|
47
|
+
numericStatus === 429 ||
|
|
48
|
+
/\b429\b/.test(message) ||
|
|
45
49
|
lowerMessage.includes('quota exceeded') // Generic rate limit (not billing)
|
|
46
50
|
) {
|
|
47
51
|
// Try to extract retry-after from error
|
|
@@ -57,7 +61,8 @@ export function classifyError(error) {
|
|
|
57
61
|
}
|
|
58
62
|
// Authentication errors
|
|
59
63
|
if (lowerMessage.includes('unauthorized') ||
|
|
60
|
-
|
|
64
|
+
numericStatus === 401 ||
|
|
65
|
+
/\b401\b/.test(message) ||
|
|
61
66
|
lowerMessage.includes('api key') ||
|
|
62
67
|
lowerMessage.includes('authentication') ||
|
|
63
68
|
lowerMessage.includes('invalid key') ||
|
|
@@ -71,8 +76,11 @@ export function classifyError(error) {
|
|
|
71
76
|
}
|
|
72
77
|
// Invalid request errors
|
|
73
78
|
if (lowerMessage.includes('bad request') ||
|
|
74
|
-
|
|
75
|
-
|
|
79
|
+
numericStatus === 400 ||
|
|
80
|
+
/\b400\b/.test(message) ||
|
|
81
|
+
lowerMessage.includes('invalid request') ||
|
|
82
|
+
lowerMessage.includes('invalid model') ||
|
|
83
|
+
lowerMessage.includes('invalid parameter') ||
|
|
76
84
|
lowerMessage.includes('malformed')) {
|
|
77
85
|
return {
|
|
78
86
|
category: 'invalid_request',
|
|
@@ -94,10 +102,11 @@ export function classifyError(error) {
|
|
|
94
102
|
};
|
|
95
103
|
}
|
|
96
104
|
// Server errors
|
|
97
|
-
if (
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
105
|
+
if (numericStatus === 500 || numericStatus === 502 || numericStatus === 503 || numericStatus === 504 ||
|
|
106
|
+
/\b500\b/.test(message) ||
|
|
107
|
+
/\b502\b/.test(message) ||
|
|
108
|
+
/\b503\b/.test(message) ||
|
|
109
|
+
/\b504\b/.test(message) ||
|
|
101
110
|
lowerMessage.includes('internal server') ||
|
|
102
111
|
lowerMessage.includes('service unavailable')) {
|
|
103
112
|
return {
|
|
@@ -180,8 +189,8 @@ export function classifyError(error) {
|
|
|
180
189
|
};
|
|
181
190
|
}
|
|
182
191
|
// Vision/image capability errors
|
|
183
|
-
if (lowerMessage.includes('vision') ||
|
|
184
|
-
lowerMessage.includes('image') && (lowerMessage.includes('not supported') || lowerMessage.includes('cannot'))) {
|
|
192
|
+
if ((lowerMessage.includes('vision') && (lowerMessage.includes('not supported') || lowerMessage.includes('not available') || lowerMessage.includes('does not support') || lowerMessage.includes('cannot'))) ||
|
|
193
|
+
(lowerMessage.includes('image') && (lowerMessage.includes('not supported') || lowerMessage.includes('cannot')))) {
|
|
185
194
|
return {
|
|
186
195
|
category: 'invalid_request',
|
|
187
196
|
message: 'Vision not supported',
|