@coeiro-operator/core 1.4.2 → 1.4.4
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-background.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-background.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAOrE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,WAAW,CAAkB;gBAEzB,aAAa,EAAE,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM;IAM5D;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BjC;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAenC;;OAEG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEzD;;OAEG;YACW,kBAAkB;IA4ChC;;OAEG;YACW,yBAAyB;IAiDvC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,IAAI;CAGrC"}
|
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { TerminalBackground as TermBg } from '@coeiro-operator/term-bg';
|
|
2
2
|
import { join } from 'path';
|
|
3
3
|
import { writeFile } from 'fs/promises';
|
|
4
|
+
import { exec } from 'child_process';
|
|
5
|
+
import { promisify } from 'util';
|
|
4
6
|
import { getSpeakerProvider } from '../environment/speaker-provider.js';
|
|
5
7
|
import { logger } from '@coeiro-operator/common';
|
|
6
8
|
import { getSessionId } from '../operator/index.js';
|
|
9
|
+
const execAsync = promisify(exec);
|
|
7
10
|
export class TerminalBackground {
|
|
8
11
|
currentCharacterId = null;
|
|
9
12
|
configManager;
|
|
10
13
|
termBg;
|
|
11
14
|
sessionId;
|
|
15
|
+
projectName;
|
|
12
16
|
initialized = false;
|
|
13
17
|
constructor(configManager, sessionId) {
|
|
14
18
|
this.configManager = configManager;
|
|
@@ -19,11 +23,28 @@ export class TerminalBackground {
|
|
|
19
23
|
* セッションIDを取得して初期化
|
|
20
24
|
*/
|
|
21
25
|
async initialize() {
|
|
22
|
-
if (!this.sessionId) {
|
|
23
|
-
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
if (!this.sessionId && !this.projectName) {
|
|
27
|
+
// 背景画像の対象ウィンドウ特定にはサニタイズ前のオリジナル値が必要なため、
|
|
28
|
+
// getSessionId()（セッション管理用にサニタイズ済み）とは別に直接取得する
|
|
29
|
+
if (process.env.TMUX) {
|
|
30
|
+
try {
|
|
31
|
+
const { stdout } = await execAsync('itmux current');
|
|
32
|
+
const projectName = stdout.trim();
|
|
33
|
+
if (projectName) {
|
|
34
|
+
this.projectName = projectName;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
// itmuxコマンドが存在しない、またはプロジェクト外
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (!this.projectName) {
|
|
42
|
+
const fullSessionId = await getSessionId();
|
|
43
|
+
if (fullSessionId.startsWith('ITERM_SESSION_ID:')) {
|
|
44
|
+
this.sessionId = fullSessionId.substring('ITERM_SESSION_ID:'.length);
|
|
45
|
+
}
|
|
46
|
+
// TMUX:やPID:の場合はどちらも未設定 → Python側でcurrent_sessionを使用
|
|
47
|
+
}
|
|
27
48
|
}
|
|
28
49
|
this.initialized = true;
|
|
29
50
|
}
|
|
@@ -127,7 +148,8 @@ export class TerminalBackground {
|
|
|
127
148
|
position,
|
|
128
149
|
scale,
|
|
129
150
|
mode: 'fit', // アスペクト比を保持
|
|
130
|
-
sessionId: this.sessionId
|
|
151
|
+
sessionId: this.sessionId,
|
|
152
|
+
projectName: this.projectName,
|
|
131
153
|
});
|
|
132
154
|
logger.error(`✅ 背景画像の設定に成功: ${absolutePath}${this.sessionId ? ` (Session: ${this.sessionId})` : ''}`);
|
|
133
155
|
}
|
|
@@ -194,9 +216,9 @@ export class TerminalBackground {
|
|
|
194
216
|
return;
|
|
195
217
|
}
|
|
196
218
|
try {
|
|
197
|
-
await this.termBg.clearBackground(this.sessionId);
|
|
219
|
+
await this.termBg.clearBackground(this.sessionId, this.projectName);
|
|
198
220
|
this.currentCharacterId = null;
|
|
199
|
-
logger.info(`背景画像をクリアしました${this.sessionId ? ` (Session: ${this.sessionId})` : ''}`);
|
|
221
|
+
logger.info(`背景画像をクリアしました${this.sessionId ? ` (Session: ${this.sessionId})` : this.projectName ? ` (Project: ${this.projectName})` : ''}`);
|
|
200
222
|
}
|
|
201
223
|
catch (error) {
|
|
202
224
|
logger.error(`背景のクリアに失敗しました: ${error}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-background.js","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-background.js","sourceRoot":"","sources":["../../src/terminal/terminal-background.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,OAAO,kBAAkB;IACrB,kBAAkB,GAAkB,IAAI,CAAC;IACzC,aAAa,CAAgB;IAC7B,MAAM,CAAS;IACf,SAAS,CAAqB;IAC9B,WAAW,CAAqB;IAChC,WAAW,GAAY,KAAK,CAAC;IAErC,YAAY,aAA4B,EAAE,SAAkB;QAC1D,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACzC,uCAAuC;YACvC,6CAA6C;YAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,CAAC;oBACpD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;oBAClC,IAAI,WAAW,EAAE,CAAC;wBAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;oBACjC,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,6BAA6B;gBAC/B,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACtB,MAAM,aAAa,GAAG,MAAM,YAAY,EAAE,CAAC;gBAC3C,IAAI,aAAa,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAClD,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACvE,CAAC;gBACD,qDAAqD;YACvD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEvC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE;YAC5C,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,QAAQ,EAAE,OAAO;YACjB,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;YACtC,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YAC9C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;SAC7C,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,WAAmB;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC;QAEtE,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;YAChC,WAAW;YACX,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;SACjC,CAAC,CAAC;QAEH,iBAAiB;QACjB,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBAC9B,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY;gBAChD,aAAa,EAAE,MAAM,CAAC,OAAO;gBAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;aACjC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;QAEtC,IAAI,CAAC;YACH,aAAa;YACb,IAAI,SAAS,GAAkB,IAAI,CAAC;YAEpC,IAAI,MAAM,CAAC,UAAU,IAAI,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBAC1D,cAAc;gBACd,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;gBACjD,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;oBAC9C,6BAA6B;oBAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW,UAAU,CAAC,CAAC;oBAC1C,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBACD,kBAAkB;gBAClB,SAAS,GAAG,SAAS,CAAC;gBACtB,MAAM,CAAC,KAAK,CAAC,qBAAqB,WAAW,EAAE,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,kBAAkB;gBAClB,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBACvC,SAAS,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC;gBAC9D,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;YAED,sBAAsB;YACtB,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,iBAAiB,SAAS,EAAE,CAAC,CAAC;gBAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;oBACvC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,GAAG;oBAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,cAAc;oBAC5C,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI;iBAC7B,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,kBAAkB;gBAClB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC/B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAC9B,SAAiB,EACjB,OAIC;QAED,IAAI,CAAC;YACH,UAAU;YACV,MAAM,YAAY,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;YAE5F,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE,QAAQ,GAAG,cAAc,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;YAEjF,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE;gBAC7B,SAAS,EAAE,YAAY;gBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO;gBACP,QAAQ;gBACR,KAAK;aACN,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;gBAC9B,SAAS,EAAE,YAAY;gBACvB,OAAO;gBACP,QAAQ;gBACR,KAAK;gBACL,IAAI,EAAE,KAAK,EAAG,YAAY;gBAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;YAEH,MAAM,CAAC,KAAK,CAAC,iBAAiB,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACrB,YAAY,EAAG,KAAe,CAAC,OAAO;gBACtC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS;aACV,CAAC,CAAC;YACH,MAAM,KAAK,CAAC,CAAE,WAAW;QAC3B,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,yBAAyB,CAAC,WAAmB;QACzD,IAAI,CAAC;YACH,6BAA6B;YAC7B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YACjF,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;gBACnD,MAAM,CAAC,IAAI,CAAC,UAAU,WAAW,cAAc,CAAC,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,0BAA0B;YAC1B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC;YACxE,MAAM,eAAe,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAErF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,CAAC,UAAU,WAAW,eAAe,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,0BAA0B;YAC1B,IAAI,UAAU,GAAG,QAAQ,CAAC;YAC1B,IAAI,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3C,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;oBACtB,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;gBACpD,CAAC;YACH,CAAC;YAED,qBAAqB;YACrB,MAAM,QAAQ,GAAG,iBAAiB,WAAW,MAAM,CAAC;YACpD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACtD,MAAM,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEvC,aAAa;YACb,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;YAEnG,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAC3C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACpE,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7I,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@coeiro-operator/core",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.4",
|
|
4
4
|
"description": "Core utilities and shared functionality for COEIRO Operator",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
],
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@coeiro-operator/common": "1.0.2",
|
|
23
|
-
"@coeiro-operator/term-bg": "1.0.
|
|
23
|
+
"@coeiro-operator/term-bg": "1.0.4"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@types/node": "^22.18.3",
|