@ai-support-agent/cli 0.0.10-beta.0 → 0.0.10
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/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +3 -1
- package/dist/agent-runner.js.map +1 -1
- package/dist/agent-transport.d.ts +2 -1
- package/dist/agent-transport.d.ts.map +1 -1
- package/dist/agent-transport.js +6 -2
- package/dist/agent-transport.js.map +1 -1
- package/dist/appsync-subscriber.d.ts.map +1 -1
- package/dist/appsync-subscriber.js +13 -4
- package/dist/appsync-subscriber.js.map +1 -1
- package/dist/commands/chat-executor.d.ts +1 -1
- package/dist/commands/chat-executor.d.ts.map +1 -1
- package/dist/commands/chat-executor.js +26 -4
- package/dist/commands/chat-executor.js.map +1 -1
- package/dist/commands/claude-code-runner.d.ts +7 -0
- package/dist/commands/claude-code-runner.d.ts.map +1 -1
- package/dist/commands/claude-code-runner.js +11 -2
- package/dist/commands/claude-code-runner.js.map +1 -1
- package/dist/commands/file-executor.d.ts +6 -6
- package/dist/commands/file-executor.d.ts.map +1 -1
- package/dist/commands/file-executor.js +15 -14
- package/dist/commands/file-executor.js.map +1 -1
- package/dist/commands/file-path-guard.d.ts +1 -1
- package/dist/commands/file-path-guard.d.ts.map +1 -1
- package/dist/commands/file-path-guard.js +2 -2
- package/dist/commands/file-path-guard.js.map +1 -1
- package/dist/commands/index.d.ts +1 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +7 -7
- package/dist/commands/index.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +4 -2
- package/dist/constants.js.map +1 -1
- package/dist/docker/docker-runner.d.ts.map +1 -1
- package/dist/docker/docker-runner.js +1 -0
- package/dist/docker/docker-runner.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/mcp/tools/db-query.d.ts.map +1 -1
- package/dist/mcp/tools/db-query.js +65 -4
- package/dist/mcp/tools/db-query.js.map +1 -1
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +3 -2
- package/dist/project-agent.js.map +1 -1
- package/dist/security.d.ts +2 -2
- package/dist/security.d.ts.map +1 -1
- package/dist/security.js +13 -7
- package/dist/security.js.map +1 -1
- package/dist/terminal/terminal-session.d.ts +6 -3
- package/dist/terminal/terminal-session.d.ts.map +1 -1
- package/dist/terminal/terminal-session.js +161 -24
- package/dist/terminal/terminal-session.js.map +1 -1
- package/dist/terminal/terminal-websocket.d.ts.map +1 -1
- package/dist/terminal/terminal-websocket.js +69 -7
- package/dist/terminal/terminal-websocket.js.map +1 -1
- package/dist/types/server.d.ts +1 -0
- package/dist/types/server.d.ts.map +1 -1
- package/docker/Dockerfile +54 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runner.d.ts","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAA;AAKzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAMnG,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,GACA;IAAE,IAAI,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,CAQrF;AAYD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,EAAE,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,cAAc,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAEnE,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,IAAI,CAkBN;
|
|
1
|
+
{"version":3,"file":"agent-runner.d.ts","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAA;AAKzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAMnG,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,GACA;IAAE,IAAI,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,EAAE,OAAO,cAAc,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,CAQrF;AAYD,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,EAAE,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,cAAc,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAEnE,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,EACtB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,IAAI,CAkBN;AAmCD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,gBAAgB,CAAA;CAAE,GAAG,IAAI,GAAG,gBAAgB,CAWnI;AAmCD,wBAAsB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAiItE"}
|
package/dist/agent-runner.js
CHANGED
|
@@ -99,7 +99,9 @@ function initAutoUpdater(options, config, client, agentId, stopAllAgents) {
|
|
|
99
99
|
if (!autoUpdateConfig.enabled)
|
|
100
100
|
return undefined;
|
|
101
101
|
return (0, auto_updater_1.startAutoUpdater)([client], autoUpdateConfig, stopAllAgents, (error) => {
|
|
102
|
-
void client.heartbeat(agentId, (0, system_info_1.getSystemInfo)(), error).catch(() => {
|
|
102
|
+
void client.heartbeat(agentId, (0, system_info_1.getSystemInfo)(), error).catch((err) => {
|
|
103
|
+
logger_1.logger.warn(`[auto-update] Failed to send error heartbeat: ${err instanceof Error ? err.message : String(err)}`);
|
|
104
|
+
});
|
|
103
105
|
});
|
|
104
106
|
}
|
|
105
107
|
function resolveAutoUpdateConfig(options, config) {
|
package/dist/agent-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BA,8CAiBC;AAgBD,sDAqBC;
|
|
1
|
+
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,9 @@ export declare function startSubscriptionMode(deps: TransportDeps, state: Transp
|
|
|
38
38
|
export declare function startHeartbeat(deps: TransportDeps, state: TransportState, configSyncState: ConfigSyncState, configSyncDeps: ConfigSyncDeps): void;
|
|
39
39
|
/**
|
|
40
40
|
* Start terminal WebSocket connection.
|
|
41
|
+
* @param wsUrl - サーバーから返されたWebSocket URL（指定時はapiUrlの代わりに使用）
|
|
41
42
|
*/
|
|
42
|
-
export declare function startTerminalWebSocket(deps: TransportDeps, state: TransportState): void;
|
|
43
|
+
export declare function startTerminalWebSocket(deps: TransportDeps, state: TransportState, wsUrl?: string): void;
|
|
43
44
|
/**
|
|
44
45
|
* Handle an incoming AppSync notification.
|
|
45
46
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-transport.d.ts","sourceRoot":"","sources":["../src/agent-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAKvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAG1E,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,IAAI,CAAA;IACrD,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,UAAU,EAAE,OAAO,CAAA;IACnB,uBAAuB,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAA;CAC9D;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,oGAAoG;IACpG,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAClC;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,GAAG,EAAE,cAAc,EACnB,sBAAsB,EAAE,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,iBAAiB,EAC9E,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,GAC7B,IAAI,CAuCN;AAED
|
|
1
|
+
{"version":3,"file":"agent-transport.d.ts","sourceRoot":"","sources":["../src/agent-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAKvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAG1E,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,IAAI,CAAA;IACrD,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,UAAU,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACpC,UAAU,EAAE,OAAO,CAAA;IACnB,uBAAuB,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAA;CAC9D;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,MAAM,CAAA;IAClB,oGAAoG;IACpG,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,eAAe,CAAA;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,cAAc,CAAA;IAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAClC;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,GAAG,EAAE,cAAc,EACnB,sBAAsB,EAAE,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,iBAAiB,EAC9E,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,GAC7B,IAAI,CAuCN;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,KAAK,CAAC,EAAE,MAAM,GACb,IAAI,CAaN;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,cAAc,EACrB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC,CAcf;AAkDD;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAKzD"}
|
package/dist/agent-transport.js
CHANGED
|
@@ -68,9 +68,12 @@ function startHeartbeat(deps, state, configSyncState, configSyncDeps) {
|
|
|
68
68
|
}
|
|
69
69
|
/**
|
|
70
70
|
* Start terminal WebSocket connection.
|
|
71
|
+
* @param wsUrl - サーバーから返されたWebSocket URL（指定時はapiUrlの代わりに使用）
|
|
71
72
|
*/
|
|
72
|
-
function startTerminalWebSocket(deps, state) {
|
|
73
|
-
|
|
73
|
+
function startTerminalWebSocket(deps, state, wsUrl) {
|
|
74
|
+
// wsUrl が指定された場合はそれを使う（Next.jsプロキシ経由ではWSが通らないため）
|
|
75
|
+
const baseUrl = wsUrl ?? deps.apiUrl;
|
|
76
|
+
state.terminalWs = new terminal_1.TerminalWebSocket(baseUrl, deps.token, deps.agentId, deps.projectDir);
|
|
74
77
|
state.terminalWs.connect().catch((error) => {
|
|
75
78
|
logger_1.logger.warn(`${deps.prefix} Terminal WebSocket connection failed: ${(0, utils_1.getDetailedErrorMessage)(error)}`);
|
|
76
79
|
});
|
|
@@ -154,6 +157,7 @@ async function processCommand(deps, ctx, commandId) {
|
|
|
154
157
|
projectDir: deps.projectDir,
|
|
155
158
|
projectConfig: ctx.configSyncState.projectConfig,
|
|
156
159
|
mcpConfigPath: ctx.configSyncState.mcpConfigPath,
|
|
160
|
+
tenantCode: deps.tenantCode,
|
|
157
161
|
onSetup: ctx.onSetup,
|
|
158
162
|
onConfigSync: ctx.onConfigSync,
|
|
159
163
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-transport.js","sourceRoot":"","sources":["../src/agent-transport.ts"],"names":[],"mappings":";;AA4CA,sDA4BC;AAKD,wCA4CC;
|
|
1
|
+
{"version":3,"file":"agent-transport.js","sourceRoot":"","sources":["../src/agent-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appsync-subscriber.d.ts","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAI1D,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC;AAED,UAAU,cAAc;IACtB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC;AAcD,qBAAa,iBAAkB,SAAQ,uBAAuB,CAAC,cAAc,CAAC;IAC5E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,cAAc,CAA6D;IACnF,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,kBAAkB,CAAI;gBAElB,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"appsync-subscriber.d.ts","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAI1D,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC;AAED,UAAU,cAAc;IACtB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC;AAcD,qBAAa,iBAAkB,SAAQ,uBAAuB,CAAC,cAAc,CAAC;IAC5E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,cAAc,CAA6D;IACnF,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,kBAAkB,CAAI;gBAElB,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IA0B9C,SAAS,CACP,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,CAAC,YAAY,EAAE,mBAAmB,KAAK,IAAI,GACrD,IAAI;IAQP,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAIvC,SAAS,CAAC,eAAe,IAAI,SAAS;IAKtC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAKrC,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,GAAG,IAAI;IA8C5F,SAAS,CAAC,YAAY,IAAI,IAAI;IAgB9B,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAIlC,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,mBAAmB;CAM5B"}
|
|
@@ -41,10 +41,19 @@ class AppSyncSubscriber extends base_websocket_1.BaseWebSocketConnection {
|
|
|
41
41
|
throw new Error('AppSync URL must use HTTP or HTTPS protocol');
|
|
42
42
|
}
|
|
43
43
|
this.host = url.host;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
.
|
|
47
|
-
|
|
44
|
+
const isAwsAppSync = url.host.includes('.appsync-api.');
|
|
45
|
+
if (isAwsAppSync) {
|
|
46
|
+
this.realtimeUrl = appsyncUrl
|
|
47
|
+
.replace('https://', 'wss://')
|
|
48
|
+
.replace('.appsync-api.', '.appsync-realtime-api.');
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// Local AppSync simulator uses /graphql/realtime path
|
|
52
|
+
this.realtimeUrl = appsyncUrl
|
|
53
|
+
.replace('https://', 'wss://')
|
|
54
|
+
.replace('http://', 'ws://')
|
|
55
|
+
.replace(/\/graphql$/, '/graphql/realtime');
|
|
56
|
+
}
|
|
48
57
|
}
|
|
49
58
|
subscribe(tenantCode, onMessage) {
|
|
50
59
|
this.tenantCode = tenantCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appsync-subscriber.js","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA0B;AAE1B,qDAA0D;AAC1D,2CAAwH;AACxH,qCAAiC;AAkBjC,MAAM,kBAAkB,GAAG;;;;;;;;;;EAUzB,CAAA;AAEF,MAAa,iBAAkB,SAAQ,wCAAuC;IAC3D,WAAW,CAAQ;IACnB,IAAI,CAAQ;IACZ,MAAM,CAAQ;IACvB,cAAc,GAAkB,IAAI,CAAA;IACpC,UAAU,GAAkB,IAAI,CAAA;IAChC,cAAc,GAAyD,IAAI,CAAA;IAC3E,iBAAiB,GAAwB,IAAI,CAAA;IAC7C,cAAc,GAAyC,IAAI,CAAA;IAC3D,kBAAkB,GAAG,CAAC,CAAA;IAE9B,YAAY,UAAkB,EAAE,MAAc;QAC5C,KAAK,CAAC;YACJ,mBAAmB,EAAE,yCAA6B;YAClD,oBAAoB,EAAE,2CAA+B;YACrD,SAAS,EAAE,UAAU;SACtB,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAA;QAC/B,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAC1D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAChE,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,UAAU;
|
|
1
|
+
{"version":3,"file":"appsync-subscriber.js","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare function _getRunningProcesses(): Map<string, {
|
|
|
17
17
|
*
|
|
18
18
|
* activeChatMode はサーバーの chatMode ではなく、エージェント内部の実行方式を指す
|
|
19
19
|
*/
|
|
20
|
-
export declare function executeChatCommand(payload: ChatPayload, commandId: string, client: ApiClient, serverConfig?: AgentServerConfig, activeChatMode?: AgentChatMode, agentId?: string, projectDir?: string, projectConfig?: ProjectConfigResponse, mcpConfigPath?: string): Promise<CommandResult>;
|
|
20
|
+
export declare function executeChatCommand(payload: ChatPayload, commandId: string, client: ApiClient, serverConfig?: AgentServerConfig, activeChatMode?: AgentChatMode, agentId?: string, projectDir?: string, projectConfig?: ProjectConfigResponse, mcpConfigPath?: string, tenantCode?: string): Promise<CommandResult>;
|
|
21
21
|
export declare function buildConversationFileNotice(conversationFiles: ChatFileInfo[]): string;
|
|
22
22
|
export declare function buildMetadataNotice(conversationId: string | null, commandId: string, projectCode: string | undefined, mcpConfigPath?: string): string;
|
|
23
23
|
//# sourceMappingURL=chat-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,aAAa,CAAC,CAcxB;AA2KD,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,MAAM,CAMrF;AAED,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAGR"}
|
|
@@ -42,7 +42,7 @@ function _getRunningProcesses() {
|
|
|
42
42
|
*
|
|
43
43
|
* activeChatMode はサーバーの chatMode ではなく、エージェント内部の実行方式を指す
|
|
44
44
|
*/
|
|
45
|
-
async function executeChatCommand(payload, commandId, client, serverConfig, activeChatMode, agentId, projectDir, projectConfig, mcpConfigPath) {
|
|
45
|
+
async function executeChatCommand(payload, commandId, client, serverConfig, activeChatMode, agentId, projectDir, projectConfig, mcpConfigPath, tenantCode) {
|
|
46
46
|
if (!agentId) {
|
|
47
47
|
return (0, types_1.errorResult)(constants_1.ERR_AGENT_ID_REQUIRED);
|
|
48
48
|
}
|
|
@@ -52,7 +52,7 @@ async function executeChatCommand(payload, commandId, client, serverConfig, acti
|
|
|
52
52
|
return (0, api_chat_executor_1.executeApiChatCommand)(payload, commandId, client, serverConfig, agentId);
|
|
53
53
|
case 'claude_code':
|
|
54
54
|
default:
|
|
55
|
-
return executeClaudeCodeChat(payload, commandId, client, agentId, serverConfig, projectDir, projectConfig, mcpConfigPath);
|
|
55
|
+
return executeClaudeCodeChat(payload, commandId, client, agentId, serverConfig, projectDir, projectConfig, mcpConfigPath, tenantCode);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
/**
|
|
@@ -60,7 +60,7 @@ async function executeChatCommand(payload, commandId, client, serverConfig, acti
|
|
|
60
60
|
* サブプロセスとして起動し、stdout をストリーミングで読み取り、
|
|
61
61
|
* チャンクとしてAPIに送信する
|
|
62
62
|
*/
|
|
63
|
-
async function executeClaudeCodeChat(payload, commandId, client, agentId, serverConfig, projectDir, projectConfig, mcpConfigPath) {
|
|
63
|
+
async function executeClaudeCodeChat(payload, commandId, client, agentId, serverConfig, projectDir, projectConfig, mcpConfigPath, tenantCode) {
|
|
64
64
|
const message = (0, utils_1.parseString)(payload.message);
|
|
65
65
|
if (!message) {
|
|
66
66
|
return (0, types_1.errorResult)(constants_1.ERR_MESSAGE_REQUIRED);
|
|
@@ -74,7 +74,23 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
74
74
|
try {
|
|
75
75
|
collectedToolCalls.push(JSON.parse(content));
|
|
76
76
|
}
|
|
77
|
-
catch {
|
|
77
|
+
catch (err) {
|
|
78
|
+
logger_1.logger.warn(`[chat] Failed to parse tool_call JSON: ${err instanceof Error ? err.message : String(err)}`);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
// tool_result チャンクの success/output を対応する tool_call エントリにマージ
|
|
82
|
+
if (type === 'tool_result') {
|
|
83
|
+
try {
|
|
84
|
+
const result = JSON.parse(content);
|
|
85
|
+
const entry = collectedToolCalls.find((tc) => tc.toolName === result.toolName);
|
|
86
|
+
if (entry) {
|
|
87
|
+
entry.success = result.success;
|
|
88
|
+
entry.result = result.output;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
logger_1.logger.warn(`[chat] Failed to parse tool_result JSON: ${err instanceof Error ? err.message : String(err)}`);
|
|
93
|
+
}
|
|
78
94
|
}
|
|
79
95
|
return rawSendChunk(type, content);
|
|
80
96
|
};
|
|
@@ -147,6 +163,7 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
147
163
|
].filter(Boolean).join(', ');
|
|
148
164
|
logger_1.logger.debug(`[chat] Spawning claude CLI for command [${commandId}]: ${logDetails}`);
|
|
149
165
|
logger_1.logger.debug(`[chat] serverConfig.claudeCodeConfig: ${JSON.stringify(serverConfig?.claudeCodeConfig ?? null)}`);
|
|
166
|
+
const conversationIdStr = conversationId ?? undefined;
|
|
150
167
|
const handle = (0, claude_code_runner_1.runClaudeCode)({
|
|
151
168
|
message: messageWithHistory,
|
|
152
169
|
sendChunk,
|
|
@@ -157,6 +174,11 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
157
174
|
mcpConfigPath,
|
|
158
175
|
cwd: projectDir,
|
|
159
176
|
systemPrompt,
|
|
177
|
+
policyContext: {
|
|
178
|
+
tenantCode,
|
|
179
|
+
projectCode,
|
|
180
|
+
conversationId: conversationIdStr,
|
|
181
|
+
},
|
|
160
182
|
});
|
|
161
183
|
// プロセスを管理 Map に登録
|
|
162
184
|
processManager.register(commandId, handle);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":";;;AAwBA,8CAEC;AAGD,oDAEC;AASD,
|
|
1
|
+
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,12 @@ export interface ClaudeCodeHandle {
|
|
|
17
17
|
result: Promise<ClaudeCodeResult>;
|
|
18
18
|
cancel: () => void;
|
|
19
19
|
}
|
|
20
|
+
/** Hook payload に含めるポリシー評価コンテキスト */
|
|
21
|
+
export interface PolicyContext {
|
|
22
|
+
tenantCode?: string;
|
|
23
|
+
projectCode?: string;
|
|
24
|
+
conversationId?: string;
|
|
25
|
+
}
|
|
20
26
|
/** runClaudeCode のオプション */
|
|
21
27
|
export interface RunClaudeCodeOptions {
|
|
22
28
|
message: string;
|
|
@@ -28,6 +34,7 @@ export interface RunClaudeCodeOptions {
|
|
|
28
34
|
mcpConfigPath?: string;
|
|
29
35
|
cwd?: string;
|
|
30
36
|
systemPrompt?: string;
|
|
37
|
+
policyContext?: PolicyContext;
|
|
31
38
|
}
|
|
32
39
|
/**
|
|
33
40
|
* Claude Code CLI をサブプロセスとして実行し、出力をストリーミングで返す
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAS7C,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACnF,YAAY,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED,uCAAuC;AACvC,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACjC,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED,2BAA2B;AAC3B,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAS7C,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACnF,YAAY,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED,uCAAuC;AACvC,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACjC,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,2BAA2B;AAC3B,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,gBAAgB,CAuH7E"}
|
|
@@ -23,7 +23,7 @@ Object.defineProperty(exports, "parseFileUploadResult", { enumerable: true, get:
|
|
|
23
23
|
* ClaudeCodeHandle を返す: result Promise と kill 関数
|
|
24
24
|
*/
|
|
25
25
|
function runClaudeCode(options) {
|
|
26
|
-
const { message, sendChunk, allowedTools, addDirs, locale, awsEnv, mcpConfigPath, cwd, systemPrompt } = options;
|
|
26
|
+
const { message, sendChunk, allowedTools, addDirs, locale, awsEnv, mcpConfigPath, cwd, systemPrompt, policyContext } = options;
|
|
27
27
|
let killFn = () => { };
|
|
28
28
|
const result = new Promise((resolve, reject) => {
|
|
29
29
|
const startTime = Date.now();
|
|
@@ -31,7 +31,16 @@ function runClaudeCode(options) {
|
|
|
31
31
|
// Claude Code セッション内からの起動時にネスト検出やSSEポート干渉を回避するため、
|
|
32
32
|
// CLAUDECODE および CLAUDE_CODE_* 環境変数を除外
|
|
33
33
|
const cleanEnv = (0, claude_code_args_1.buildCleanEnv)();
|
|
34
|
-
const env = awsEnv ? { ...cleanEnv, ...awsEnv } : cleanEnv;
|
|
34
|
+
const env = awsEnv ? { ...cleanEnv, ...awsEnv } : { ...cleanEnv };
|
|
35
|
+
// Hook payload 用のポリシーコンテキスト環境変数を設定
|
|
36
|
+
if (policyContext) {
|
|
37
|
+
if (policyContext.tenantCode)
|
|
38
|
+
env.AI_SUPPORT_TENANT_CODE = policyContext.tenantCode;
|
|
39
|
+
if (policyContext.projectCode)
|
|
40
|
+
env.AI_SUPPORT_PROJECT_CODE = policyContext.projectCode;
|
|
41
|
+
if (policyContext.conversationId)
|
|
42
|
+
env.AI_SUPPORT_CONVERSATION_ID = policyContext.conversationId;
|
|
43
|
+
}
|
|
35
44
|
const args = (0, claude_code_args_1.buildClaudeArgs)(message, { allowedTools, addDirs, locale, mcpConfigPath, systemPrompt });
|
|
36
45
|
(0, claude_config_validator_1.ensureClaudeJsonIntegrity)();
|
|
37
46
|
const child = (0, child_process_1.spawn)('claude', args, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-runner.js","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"claude-code-runner.js","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type CommandResult, type FileDeletePayload, type FileListPayload, type FileMkdirPayload, type FileReadPayload, type FileRenamePayload, type FileWritePayload } from '../types';
|
|
2
|
-
export declare function fileRead(payload: FileReadPayload): Promise<CommandResult>;
|
|
3
|
-
export declare function fileWrite(payload: FileWritePayload): Promise<CommandResult>;
|
|
4
|
-
export declare function fileList(payload: FileListPayload): Promise<CommandResult>;
|
|
5
|
-
export declare function fileRename(payload: FileRenamePayload): Promise<CommandResult>;
|
|
6
|
-
export declare function fileDelete(payload: FileDeletePayload): Promise<CommandResult>;
|
|
7
|
-
export declare function fileMkdir(payload: FileMkdirPayload): Promise<CommandResult>;
|
|
2
|
+
export declare function fileRead(payload: FileReadPayload, baseDir?: string): Promise<CommandResult>;
|
|
3
|
+
export declare function fileWrite(payload: FileWritePayload, baseDir?: string): Promise<CommandResult>;
|
|
4
|
+
export declare function fileList(payload: FileListPayload, baseDir?: string): Promise<CommandResult>;
|
|
5
|
+
export declare function fileRename(payload: FileRenamePayload, baseDir?: string): Promise<CommandResult>;
|
|
6
|
+
export declare function fileDelete(payload: FileDeletePayload, baseDir?: string): Promise<CommandResult>;
|
|
7
|
+
export declare function fileMkdir(payload: FileMkdirPayload, baseDir?: string): Promise<CommandResult>;
|
|
8
8
|
//# sourceMappingURL=file-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-executor.d.ts","sourceRoot":"","sources":["../../src/commands/file-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,aAAa,EAAe,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,gBAAgB,EAAiB,MAAM,UAAU,CAAA;AAKnN,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"file-executor.d.ts","sourceRoot":"","sources":["../../src/commands/file-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,aAAa,EAAe,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,KAAK,gBAAgB,EAAE,KAAK,eAAe,EAAE,KAAK,iBAAiB,EAAE,KAAK,gBAAgB,EAAiB,MAAM,UAAU,CAAA;AAKnN,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAUxB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,EACzB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAiBxB;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAsBxB;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAcxB;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAcxB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,gBAAgB,EACzB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAKxB"}
|
|
@@ -46,7 +46,7 @@ const security_1 = require("../security");
|
|
|
46
46
|
const types_1 = require("../types");
|
|
47
47
|
const utils_1 = require("../utils");
|
|
48
48
|
const file_path_guard_1 = require("./file-path-guard");
|
|
49
|
-
async function fileRead(payload) {
|
|
49
|
+
async function fileRead(payload, baseDir) {
|
|
50
50
|
return (0, file_path_guard_1.withValidatedPath)(payload, async (filePath) => {
|
|
51
51
|
const stat = await fs.promises.stat(filePath);
|
|
52
52
|
if (stat.size > constants_1.MAX_FILE_READ_SIZE) {
|
|
@@ -54,9 +54,9 @@ async function fileRead(payload) {
|
|
|
54
54
|
}
|
|
55
55
|
const content = await fs.promises.readFile(filePath, 'utf-8');
|
|
56
56
|
return (0, types_1.successResult)(content);
|
|
57
|
-
});
|
|
57
|
+
}, undefined, baseDir);
|
|
58
58
|
}
|
|
59
|
-
async function fileWrite(payload) {
|
|
59
|
+
async function fileWrite(payload, baseDir) {
|
|
60
60
|
return (0, file_path_guard_1.withValidatedPath)(payload, async (filePath) => {
|
|
61
61
|
const content = typeof payload.content === 'string' ? payload.content : null;
|
|
62
62
|
if (content === null) {
|
|
@@ -70,11 +70,12 @@ async function fileWrite(payload) {
|
|
|
70
70
|
}
|
|
71
71
|
await fs.promises.writeFile(filePath, content, 'utf-8');
|
|
72
72
|
return (0, types_1.successResult)(`Written to ${filePath}`);
|
|
73
|
-
});
|
|
73
|
+
}, undefined, baseDir);
|
|
74
74
|
}
|
|
75
|
-
async function fileList(payload) {
|
|
75
|
+
async function fileList(payload, baseDir) {
|
|
76
76
|
return (0, file_path_guard_1.withValidatedPath)(payload, async (dirPath) => {
|
|
77
|
-
const
|
|
77
|
+
const rawEntries = await fs.promises.readdir(dirPath, { withFileTypes: true });
|
|
78
|
+
const allEntries = rawEntries.filter((e) => !constants_1.HIDDEN_ENTRIES.includes(e.name));
|
|
78
79
|
const truncated = allEntries.length > constants_1.MAX_DIR_ENTRIES;
|
|
79
80
|
const entries = allEntries.slice(0, constants_1.MAX_DIR_ENTRIES);
|
|
80
81
|
const items = await Promise.all(entries.map(async (entry) => {
|
|
@@ -89,24 +90,24 @@ async function fileList(payload) {
|
|
|
89
90
|
}
|
|
90
91
|
}));
|
|
91
92
|
return (0, types_1.successResult)({ items, truncated, total: allEntries.length });
|
|
92
|
-
}, '.');
|
|
93
|
+
}, '.', baseDir);
|
|
93
94
|
}
|
|
94
|
-
async function fileRename(payload) {
|
|
95
|
+
async function fileRename(payload, baseDir) {
|
|
95
96
|
const oldPath = (0, utils_1.parseString)(payload.oldPath);
|
|
96
97
|
const newPath = (0, utils_1.parseString)(payload.newPath);
|
|
97
98
|
if (!oldPath || !newPath) {
|
|
98
99
|
return (0, types_1.errorResult)(constants_1.ERR_NO_FILE_PATH_SPECIFIED);
|
|
99
100
|
}
|
|
100
|
-
const oldPathOrError = await (0, security_1.resolveAndValidatePath)({ path: oldPath });
|
|
101
|
+
const oldPathOrError = await (0, security_1.resolveAndValidatePath)({ path: oldPath }, undefined, baseDir);
|
|
101
102
|
if (typeof oldPathOrError !== 'string')
|
|
102
103
|
return oldPathOrError;
|
|
103
|
-
const newPathOrError = await (0, security_1.resolveAndValidatePath)({ path: newPath });
|
|
104
|
+
const newPathOrError = await (0, security_1.resolveAndValidatePath)({ path: newPath }, undefined, baseDir);
|
|
104
105
|
if (typeof newPathOrError !== 'string')
|
|
105
106
|
return newPathOrError;
|
|
106
107
|
await fs.promises.rename(oldPathOrError, newPathOrError);
|
|
107
108
|
return (0, types_1.successResult)(`Renamed ${oldPathOrError} to ${newPathOrError}`);
|
|
108
109
|
}
|
|
109
|
-
async function fileDelete(payload) {
|
|
110
|
+
async function fileDelete(payload, baseDir) {
|
|
110
111
|
return (0, file_path_guard_1.withValidatedPath)(payload, async (resolvedPath) => {
|
|
111
112
|
if (payload.recursive) {
|
|
112
113
|
await fs.promises.rm(resolvedPath, { recursive: true, force: true });
|
|
@@ -121,12 +122,12 @@ async function fileDelete(payload) {
|
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
return (0, types_1.successResult)(`Deleted ${resolvedPath}`);
|
|
124
|
-
});
|
|
125
|
+
}, undefined, baseDir);
|
|
125
126
|
}
|
|
126
|
-
async function fileMkdir(payload) {
|
|
127
|
+
async function fileMkdir(payload, baseDir) {
|
|
127
128
|
return (0, file_path_guard_1.withValidatedPath)(payload, async (resolvedPath) => {
|
|
128
129
|
await fs.promises.mkdir(resolvedPath, { recursive: true });
|
|
129
130
|
return (0, types_1.successResult)(`Created directory ${resolvedPath}`);
|
|
130
|
-
});
|
|
131
|
+
}, undefined, baseDir);
|
|
131
132
|
}
|
|
132
133
|
//# sourceMappingURL=file-executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-executor.js","sourceRoot":"","sources":["../../src/commands/file-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,
|
|
1
|
+
{"version":3,"file":"file-executor.js","sourceRoot":"","sources":["../../src/commands/file-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ import type { CommandResult } from '../types';
|
|
|
5
5
|
*/
|
|
6
6
|
export declare function withValidatedPath(payload: {
|
|
7
7
|
path?: unknown;
|
|
8
|
-
}, handler: (filePath: string) => Promise<CommandResult>, defaultPath?: string): Promise<CommandResult>;
|
|
8
|
+
}, handler: (filePath: string) => Promise<CommandResult>, defaultPath?: string, baseDir?: string): Promise<CommandResult>;
|
|
9
9
|
//# sourceMappingURL=file-path-guard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-path-guard.d.ts","sourceRoot":"","sources":["../../src/commands/file-path-guard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3B,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,EACrD,WAAW,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"file-path-guard.d.ts","sourceRoot":"","sources":["../../src/commands/file-path-guard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3B,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,EACrD,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAIxB"}
|
|
@@ -6,8 +6,8 @@ const security_1 = require("../security");
|
|
|
6
6
|
* resolveAndValidatePath + typeof チェックの共通ガード
|
|
7
7
|
* ファイルパスの解決・検証を行い、成功時に handler を呼び出す
|
|
8
8
|
*/
|
|
9
|
-
async function withValidatedPath(payload, handler, defaultPath) {
|
|
10
|
-
const result = await (0, security_1.resolveAndValidatePath)(payload, defaultPath);
|
|
9
|
+
async function withValidatedPath(payload, handler, defaultPath, baseDir) {
|
|
10
|
+
const result = await (0, security_1.resolveAndValidatePath)(payload, defaultPath, baseDir);
|
|
11
11
|
if (typeof result !== 'string')
|
|
12
12
|
return result;
|
|
13
13
|
return handler(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-path-guard.js","sourceRoot":"","sources":["../../src/commands/file-path-guard.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"file-path-guard.js","sourceRoot":"","sources":["../../src/commands/file-path-guard.ts"],"names":[],"mappings":";;AAOA,8CASC;AAhBD,0CAAoD;AAGpD;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CACrC,OAA2B,EAC3B,OAAqD,EACrD,WAAoB,EACpB,OAAgB;IAEhB,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAsB,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;IAC1E,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAA;IAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC"}
|
package/dist/commands/index.d.ts
CHANGED