@agi-fans/dsh-tui 0.26.0 → 0.26.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.
- package/lib/CHANGELOG.md +9 -2
- package/lib/definition.d.ts +5 -0
- package/lib/input/clipboard.js +2 -1
- package/lib/input/clipboard.js.map +1 -1
- package/lib/runtime/herdr-agent.d.ts +2 -0
- package/lib/runtime/herdr-agent.js +7 -1
- package/lib/runtime/herdr-agent.js.map +1 -1
- package/lib/runtime/provider-local.d.ts +5 -0
- package/lib/runtime/provider-local.js +39 -22
- package/lib/runtime/provider-local.js.map +1 -1
- package/lib/runtime/terminal-state.d.ts +4 -1
- package/lib/runtime/terminal-state.js +28 -7
- package/lib/runtime/terminal-state.js.map +1 -1
- package/lib/session/session-controller.js +16 -0
- package/lib/session/session-controller.js.map +1 -1
- package/package.json +1 -1
package/lib/CHANGELOG.md
CHANGED
|
@@ -6,7 +6,13 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
|
|
|
6
6
|
|
|
7
7
|
## [Unreleased]
|
|
8
8
|
|
|
9
|
-
## [0.26.
|
|
9
|
+
## [0.26.1] - 2026-11-12
|
|
10
|
+
|
|
11
|
+
### Fixed
|
|
12
|
+
|
|
13
|
+
- OSC 7501 lifecycle reporting emits live `done`, `blocked`, and `error` states immediately instead of clearing program status when turns finish or notifications are muted, keeping completed sessions visible in Herdr App. Session names use the OSC 7501 `title` field, context compaction reports `working`, native-status terminals omit duplicate state and app labels from window titles, clipboard copies forward over OSC 52 in `herdr-core` terminals, and nested `omdsh` processes no longer claim a parent Herdr pane.
|
|
14
|
+
|
|
15
|
+
## [0.26.0] - 2026-11-10
|
|
10
16
|
|
|
11
17
|
### Added
|
|
12
18
|
|
|
@@ -1072,7 +1078,8 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
|
|
|
1072
1078
|
- Preserved terminal-cell alignment and right padding for long commands, CJK text, emoji, ANSI styling, and narrow viewports.
|
|
1073
1079
|
- Stabilized incremental rendering, transcript scrolling, cursor placement, tool-output folding, and queued input during active turns.
|
|
1074
1080
|
|
|
1075
|
-
[Unreleased]: https://github.com/agi-fans/oh-my-dsh/compare/v0.26.
|
|
1081
|
+
[Unreleased]: https://github.com/agi-fans/oh-my-dsh/compare/v0.26.1...HEAD
|
|
1082
|
+
[0.26.1]: https://github.com/agi-fans/oh-my-dsh/compare/v0.26.0...v0.26.1
|
|
1076
1083
|
[0.26.0]: https://github.com/agi-fans/oh-my-dsh/compare/v0.25.0...v0.26.0
|
|
1077
1084
|
[0.25.0]: https://github.com/agi-fans/oh-my-dsh/compare/v0.24.1...v0.25.0
|
|
1078
1085
|
[0.24.1]: https://github.com/agi-fans/oh-my-dsh/compare/v0.24.0...v0.24.1
|
package/lib/definition.d.ts
CHANGED
|
@@ -591,6 +591,11 @@ export interface TuiService {
|
|
|
591
591
|
setStatus(status: TuiStatus, options?: {
|
|
592
592
|
root?: boolean;
|
|
593
593
|
outcome?: string;
|
|
594
|
+
compaction?: {
|
|
595
|
+
phase: 'start' | 'end';
|
|
596
|
+
id?: string;
|
|
597
|
+
error?: string;
|
|
598
|
+
};
|
|
594
599
|
}): void;
|
|
595
600
|
/** Update the model and effective reasoning effort shown in the composer. */
|
|
596
601
|
setModel(model: string, reasoningEffort?: string): void;
|
package/lib/input/clipboard.js
CHANGED
|
@@ -77,7 +77,8 @@ export async function copyToClipboard(text, spawnCmd = spawn, options = {}) {
|
|
|
77
77
|
}
|
|
78
78
|
catch { /* Try terminal forwarding. */ }
|
|
79
79
|
}
|
|
80
|
-
const
|
|
80
|
+
const herdr = env.HERDR_ENV === '1' || Boolean(env.HC_TERMINAL_ID?.trim());
|
|
81
|
+
const forwardingNeeded = herdr || remote || Boolean(env.TMUX || env.TMUX_PANE) || !confirmed;
|
|
81
82
|
if (!forwardingNeeded)
|
|
82
83
|
return 'confirmed';
|
|
83
84
|
const bytes = Buffer.byteLength(text, 'utf8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../src/input/clipboard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../src/input/clipboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,6 +67,8 @@ export declare class HerdrAgentReporter {
|
|
|
67
67
|
settled(reason: string): void;
|
|
68
68
|
start(): void;
|
|
69
69
|
setRunning(running: boolean): void;
|
|
70
|
+
compactionStart(id?: string): void;
|
|
71
|
+
compactionEnd(id?: string, error?: string): void;
|
|
70
72
|
prompt(message?: string, kind?: TerminalAttentionKind): void;
|
|
71
73
|
promptResolved(): void;
|
|
72
74
|
/** Attach the native session reference Herdr exposes on its agent records. */
|
|
@@ -28,7 +28,7 @@ export const HERDR_AGENT_LABEL = 'omdsh';
|
|
|
28
28
|
* never detection evidence on their own.
|
|
29
29
|
*/
|
|
30
30
|
export function herdrEnvironment(env = process.env) {
|
|
31
|
-
if (env.HERDR_ENV !== '1')
|
|
31
|
+
if (env.HERDR_ENV !== '1' || env.OMDSH === '1')
|
|
32
32
|
return undefined;
|
|
33
33
|
const paneId = env.HERDR_PANE_ID?.trim();
|
|
34
34
|
const socketPath = env.HERDR_SOCKET_PATH?.trim();
|
|
@@ -80,6 +80,12 @@ export class HerdrAgentReporter {
|
|
|
80
80
|
setRunning(running) {
|
|
81
81
|
this.#report(this.#controller.setRunning(running));
|
|
82
82
|
}
|
|
83
|
+
compactionStart(id) {
|
|
84
|
+
this.#report(this.#controller.compactionStart(id));
|
|
85
|
+
}
|
|
86
|
+
compactionEnd(id, error) {
|
|
87
|
+
this.#report(this.#controller.compactionEnd(id, error));
|
|
88
|
+
}
|
|
83
89
|
prompt(message, kind) {
|
|
84
90
|
this.#report(this.#controller.prompt(message, kind));
|
|
85
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"herdr-agent.js","sourceRoot":"","sources":["../../src/runtime/herdr-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,OAAO,EAAe,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,uBAAuB,EAA0D,MAAM,qBAAqB,CAAA;AACrH,OAAO,EAAE,uBAAuB,IAAI,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAE3F,qFAAqF;AACrF,MAAM,CAAC,MAAM,mBAAmB,GAAG,cAAc,CAAA;AACjD,6DAA6D;AAC7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAA;AA2BxC;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAyB,OAAO,CAAC,GAAG;IACnE,IAAI,GAAG,CAAC,SAAS,KAAK,GAAG;QAAE,OAAO,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"herdr-agent.js","sourceRoot":"","sources":["../../src/runtime/herdr-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,6 +198,11 @@ export declare class LocalTui implements TuiService {
|
|
|
198
198
|
setStatus(status: TuiStatus, options?: {
|
|
199
199
|
root?: boolean;
|
|
200
200
|
outcome?: string;
|
|
201
|
+
compaction?: {
|
|
202
|
+
phase: 'start' | 'end';
|
|
203
|
+
id?: string;
|
|
204
|
+
error?: string;
|
|
205
|
+
};
|
|
201
206
|
}): void;
|
|
202
207
|
/** Update first-run model readiness without touching the model label. */
|
|
203
208
|
setModelReady(ready: boolean): void;
|
|
@@ -735,9 +735,19 @@ export class LocalTui {
|
|
|
735
735
|
this.#compactionStartedAt = Date.now();
|
|
736
736
|
else if (!compacting)
|
|
737
737
|
this.#compactionStartedAt = undefined;
|
|
738
|
-
if (
|
|
739
|
-
|
|
740
|
-
|
|
738
|
+
if (this.#inspected === undefined) {
|
|
739
|
+
if (event.type === 'compaction/start') {
|
|
740
|
+
this.#herdr.compactionStart(event.data.compactionId);
|
|
741
|
+
this.#syncWindowTitle();
|
|
742
|
+
}
|
|
743
|
+
else if (event.type === 'compaction/end') {
|
|
744
|
+
this.#herdr.compactionEnd(event.data.compactionId, event.data.error);
|
|
745
|
+
this.#syncWindowTitle();
|
|
746
|
+
}
|
|
747
|
+
else if (event.type === 'turn/end') {
|
|
748
|
+
this.#herdr.settled(event.data.reason.kind);
|
|
749
|
+
this.#syncWindowTitle();
|
|
750
|
+
}
|
|
741
751
|
}
|
|
742
752
|
this.#emitNotification(this.#notifications.event({
|
|
743
753
|
type: event.type,
|
|
@@ -800,6 +810,12 @@ export class LocalTui {
|
|
|
800
810
|
// Parent lifecycle remains authoritative while the child owns the visible view.
|
|
801
811
|
if (options.root === true || this.#inspected === undefined) {
|
|
802
812
|
this.#herdr.setRunning(status === 'running');
|
|
813
|
+
if (options.compaction?.phase === 'start') {
|
|
814
|
+
this.#herdr.compactionStart(options.compaction.id);
|
|
815
|
+
}
|
|
816
|
+
else if (options.compaction?.phase === 'end') {
|
|
817
|
+
this.#herdr.compactionEnd(options.compaction.id, options.compaction.error);
|
|
818
|
+
}
|
|
803
819
|
if (options.outcome !== undefined)
|
|
804
820
|
this.#herdr.settled(options.outcome);
|
|
805
821
|
this.#syncWindowTitle();
|
|
@@ -1283,9 +1299,9 @@ export class LocalTui {
|
|
|
1283
1299
|
this.#flushPasteBurst(true);
|
|
1284
1300
|
this.#pasteBurst.clear();
|
|
1285
1301
|
if (request.notify !== false) {
|
|
1286
|
-
this.#emitNotification(this.#notifications.humanPrompt());
|
|
1287
1302
|
this.#herdr.prompt(request.title, request.attentionKind);
|
|
1288
1303
|
this.#syncWindowTitle();
|
|
1304
|
+
this.#emitNotification(this.#notifications.humanPrompt());
|
|
1289
1305
|
}
|
|
1290
1306
|
if (this.#tty && request.documentImage !== undefined && this.#imageProtocol !== undefined)
|
|
1291
1307
|
this.#term.output.write('\x1b[16t');
|
|
@@ -1462,14 +1478,15 @@ export class LocalTui {
|
|
|
1462
1478
|
this.#render();
|
|
1463
1479
|
}
|
|
1464
1480
|
/** Only the foreground terminal owner emits title and program-state sequences. */
|
|
1465
|
-
#syncWindowTitle(
|
|
1481
|
+
#syncWindowTitle() {
|
|
1466
1482
|
if (!this.#tty || this.#disposed || this.#session.handedOff)
|
|
1467
1483
|
return;
|
|
1468
1484
|
const status = this.#herdr.programStatus;
|
|
1469
1485
|
this.#writeWorkingDirectory(this.#cwd);
|
|
1470
1486
|
this.#syncProgress(status.state);
|
|
1471
|
-
const
|
|
1472
|
-
|
|
1487
|
+
const nativeStatus = this.#reportsProgramState;
|
|
1488
|
+
const title = terminalTitle(this.#terminalTitle, status, this.#sessionTitle, this.#rootDirectory.cwd, this.#rootDirectory.branch, nativeStatus);
|
|
1489
|
+
if (title !== this.#writtenWindowTitle && !(title === '' && this.#writtenWindowTitle === undefined)) {
|
|
1473
1490
|
this.#writtenWindowTitle = title;
|
|
1474
1491
|
this.#term.output.write(`\x1b]2;${title}\x07`);
|
|
1475
1492
|
}
|
|
@@ -1477,7 +1494,7 @@ export class LocalTui {
|
|
|
1477
1494
|
this.#programQuerySent = true;
|
|
1478
1495
|
this.#term.output.write(PROGRAM_STATUS_QUERY);
|
|
1479
1496
|
}
|
|
1480
|
-
if (!
|
|
1497
|
+
if (!nativeStatus) {
|
|
1481
1498
|
if (this.#writtenProgramState !== undefined)
|
|
1482
1499
|
this.#term.output.write(programStatusSequence('clear'));
|
|
1483
1500
|
this.#writtenProgramState = undefined;
|
|
@@ -1486,17 +1503,8 @@ export class LocalTui {
|
|
|
1486
1503
|
// Only the session name is exported as metadata; prompt bodies and errors stay in the TUI.
|
|
1487
1504
|
const sequence = programStatusSequence({ state: status.state,
|
|
1488
1505
|
...(status.kind === undefined ? {} : { kind: status.kind }),
|
|
1489
|
-
...(this.#sessionTitle === undefined ? {} : {
|
|
1506
|
+
...(this.#sessionTitle === undefined ? {} : { title: this.#sessionTitle }),
|
|
1490
1507
|
});
|
|
1491
|
-
// Supporting terminals can turn these states into desktop notifications.
|
|
1492
|
-
// New attention reports use the same coalescing and focus gate as OSC 9.
|
|
1493
|
-
if (programStatusNeedsAttention(status.state)
|
|
1494
|
-
&& (this.#notificationPolicy === 'off' || !notify && sequence !== this.#writtenProgramState)) {
|
|
1495
|
-
if (this.#writtenProgramState !== undefined)
|
|
1496
|
-
this.#term.output.write(programStatusSequence('clear'));
|
|
1497
|
-
this.#writtenProgramState = undefined;
|
|
1498
|
-
return;
|
|
1499
|
-
}
|
|
1500
1508
|
if (sequence === this.#writtenProgramState)
|
|
1501
1509
|
return;
|
|
1502
1510
|
this.#writtenProgramState = sequence;
|
|
@@ -5281,6 +5289,8 @@ export class LocalTui {
|
|
|
5281
5289
|
#emitNotification(notification) {
|
|
5282
5290
|
if (notification === undefined || !this.#tty || this.#disposed)
|
|
5283
5291
|
return;
|
|
5292
|
+
if (this.#reportsProgramState && notification.programState !== undefined && programStatusNeedsAttention(notification.programState))
|
|
5293
|
+
return;
|
|
5284
5294
|
if (this.#notificationPolicy === 'unfocused' && this.#terminalFocused === true)
|
|
5285
5295
|
return;
|
|
5286
5296
|
this.#notificationQueue.offer(notification);
|
|
@@ -5299,10 +5309,8 @@ export class LocalTui {
|
|
|
5299
5309
|
return;
|
|
5300
5310
|
if (pending.programState !== undefined && pending.programState !== this.#herdr.programStatus.state)
|
|
5301
5311
|
return;
|
|
5302
|
-
if (this.#reportsProgramState && programStatusNeedsAttention(
|
|
5303
|
-
this.#syncWindowTitle(true);
|
|
5312
|
+
if (this.#reportsProgramState && pending.programState !== undefined && programStatusNeedsAttention(pending.programState))
|
|
5304
5313
|
return;
|
|
5305
|
-
}
|
|
5306
5314
|
const sequence = terminalNotificationSequence(pending);
|
|
5307
5315
|
if (sequence !== '')
|
|
5308
5316
|
this.#term.output.write(sequence);
|
|
@@ -6263,7 +6271,16 @@ export function apply(ctx, config) {
|
|
|
6263
6271
|
},
|
|
6264
6272
|
terminalProfile,
|
|
6265
6273
|
alternateScreenOverlays: terminalProfile === 'direct',
|
|
6266
|
-
herdrReporter:
|
|
6274
|
+
herdrReporter: (() => {
|
|
6275
|
+
const interactive = term.input.isTTY === true && term.output.isTTY === true;
|
|
6276
|
+
const reporter = new HerdrAgentReporter({ interactive });
|
|
6277
|
+
if (interactive && process.env.OMDSH === undefined) {
|
|
6278
|
+
process.env.OMDSH = '1';
|
|
6279
|
+
ctx.effect(() => () => { if (process.env.OMDSH === '1')
|
|
6280
|
+
delete process.env.OMDSH; });
|
|
6281
|
+
}
|
|
6282
|
+
return reporter;
|
|
6283
|
+
})(),
|
|
6267
6284
|
historyPath: config.historyPath ?? join(dshHome, 'omdsh', 'history.jsonl'),
|
|
6268
6285
|
draftsPath: join(config.dshHome ?? dshHome, 'omdsh', 'drafts'),
|
|
6269
6286
|
keybindingsPath: config.keybindingsPath ?? join(dshHome, 'omdsh', 'keybindings.json'),
|