@agents-ensemble/core 0.5.3 → 0.6.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/dist/conductor/conductor-agent.d.ts.map +1 -1
- package/dist/conductor/conductor-agent.js +2 -1
- package/dist/conductor/conductor-agent.js.map +1 -1
- package/dist/conductor/conductor-session-driver.d.ts +7 -0
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +88 -6
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts +8 -0
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +77 -29
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/configure-cursor-sdk-env.d.ts +27 -0
- package/dist/conductor/configure-cursor-sdk-env.d.ts.map +1 -1
- package/dist/conductor/configure-cursor-sdk-env.js +191 -1
- package/dist/conductor/configure-cursor-sdk-env.js.map +1 -1
- package/dist/conductor/index.d.ts +3 -1
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +2 -1
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts +28 -0
- package/dist/conductor/session/dispatch-hold.d.ts.map +1 -0
- package/dist/conductor/session/dispatch-hold.js +35 -0
- package/dist/conductor/session/dispatch-hold.js.map +1 -0
- package/dist/conductor/session/events/index.d.ts +1 -1
- package/dist/conductor/session/events/index.d.ts.map +1 -1
- package/dist/conductor/session/events/index.js.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +2 -2
- package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.js +1 -0
- package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
- package/dist/conductor/session/events/session-log-event.d.ts +8 -1
- package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.js +1 -0
- package/dist/conductor/session/session-logger.js.map +1 -1
- package/dist/conductor/session-policy.d.ts +4 -1
- package/dist/conductor/session-policy.d.ts.map +1 -1
- package/dist/conductor/session-policy.js +12 -0
- package/dist/conductor/session-policy.js.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +4 -0
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/index.d.ts +2 -2
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/parse-config.d.ts.map +1 -1
- package/dist/config/parse-config.js +36 -0
- package/dist/config/parse-config.js.map +1 -1
- package/dist/config/resolve-settings.d.ts +13 -1
- package/dist/config/resolve-settings.d.ts.map +1 -1
- package/dist/config/resolve-settings.js +44 -0
- package/dist/config/resolve-settings.js.map +1 -1
- package/dist/config/types.d.ts +11 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/dispatch/index.d.ts +2 -0
- package/dist/dispatch/index.d.ts.map +1 -1
- package/dist/dispatch/index.js +1 -0
- package/dist/dispatch/index.js.map +1 -1
- package/dist/dispatch/set-dispatch-hold-tool.d.ts +11 -0
- package/dist/dispatch/set-dispatch-hold-tool.d.ts.map +1 -0
- package/dist/dispatch/set-dispatch-hold-tool.js +60 -0
- package/dist/dispatch/set-dispatch-hold-tool.js.map +1 -0
- package/dist/github/fetch-github-updates.d.ts +9 -1
- package/dist/github/fetch-github-updates.d.ts.map +1 -1
- package/dist/github/fetch-github-updates.js +225 -54
- package/dist/github/fetch-github-updates.js.map +1 -1
- package/dist/github/github-client.d.ts.map +1 -1
- package/dist/github/github-client.js +4 -0
- package/dist/github/github-client.js.map +1 -1
- package/dist/github/github-monitor-cursor.d.ts +29 -2
- package/dist/github/github-monitor-cursor.d.ts.map +1 -1
- package/dist/github/github-monitor-cursor.js +49 -3
- package/dist/github/github-monitor-cursor.js.map +1 -1
- package/dist/github/github-monitor.d.ts +7 -0
- package/dist/github/github-monitor.d.ts.map +1 -1
- package/dist/github/github-monitor.js +46 -3
- package/dist/github/github-monitor.js.map +1 -1
- package/dist/github/github-update-types.d.ts +1 -1
- package/dist/github/github-update-types.d.ts.map +1 -1
- package/dist/github/index.d.ts +4 -1
- package/dist/github/index.d.ts.map +1 -1
- package/dist/github/index.js +2 -0
- package/dist/github/index.js.map +1 -1
- package/dist/github/register-github-watch-tool.d.ts +16 -0
- package/dist/github/register-github-watch-tool.d.ts.map +1 -0
- package/dist/github/register-github-watch-tool.js +143 -0
- package/dist/github/register-github-watch-tool.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/permission/format-permission-summary-for-operator.d.ts +1 -1
- package/dist/permission/format-permission-summary-for-operator.d.ts.map +1 -1
- package/dist/permission/format-permission-summary-for-operator.js +75 -19
- package/dist/permission/format-permission-summary-for-operator.js.map +1 -1
- package/dist/permission/pending-permission.d.ts +1 -0
- package/dist/permission/pending-permission.d.ts.map +1 -1
- package/dist/permission/pending-permission.js +7 -0
- package/dist/permission/pending-permission.js.map +1 -1
- package/dist/permission/permission-pipeline.d.ts +2 -0
- package/dist/permission/permission-pipeline.d.ts.map +1 -1
- package/dist/permission/permission-pipeline.js +9 -1
- package/dist/permission/permission-pipeline.js.map +1 -1
- package/dist/permission/permission-request.d.ts.map +1 -1
- package/dist/permission/permission-request.js +122 -4
- package/dist/permission/permission-request.js.map +1 -1
- package/dist/profiles/implementer-and-reviewer/conductor.prompt.yaml +1 -0
- package/dist/profiles/implementer-and-reviewer/team.md +23 -4
- package/dist/prompt/modules/ensemble/conductor-base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js +20 -0
- package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
- package/dist/representation/index.d.ts +3 -0
- package/dist/representation/index.d.ts.map +1 -0
- package/dist/representation/index.js +2 -0
- package/dist/representation/index.js.map +1 -0
- package/dist/representation/session-log-representation.d.ts +24 -0
- package/dist/representation/session-log-representation.d.ts.map +1 -0
- package/dist/representation/session-log-representation.js +27 -0
- package/dist/representation/session-log-representation.js.map +1 -0
- package/dist/runtime/worker-session.d.ts.map +1 -1
- package/dist/runtime/worker-session.js +4 -1
- package/dist/runtime/worker-session.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,10 +1,54 @@
|
|
|
1
|
+
/** 明示登録で監視する PR 更新の既定種別。 */
|
|
2
|
+
export const DEFAULT_GITHUB_WATCH_KINDS = [
|
|
3
|
+
'pr.review',
|
|
4
|
+
'pr.review_comment',
|
|
5
|
+
'ci.completed',
|
|
6
|
+
];
|
|
1
7
|
export function emptyGitHubMonitorCursor() {
|
|
2
|
-
return { pullRequests: {} };
|
|
8
|
+
return { pullRequests: {}, explicitPullRequests: {} };
|
|
3
9
|
}
|
|
4
10
|
export function normalizeGitHubMonitorCursor(cursor) {
|
|
5
11
|
return {
|
|
6
12
|
lastIssueCommentId: cursor?.lastIssueCommentId,
|
|
7
|
-
pullRequests:
|
|
13
|
+
pullRequests: Object.fromEntries(Object.entries(cursor?.pullRequests ?? {}).map(([prNumber, prCursor]) => [
|
|
14
|
+
prNumber,
|
|
15
|
+
normalizePullRequestMonitorCursor(prCursor),
|
|
16
|
+
])),
|
|
17
|
+
explicitPullRequests: Object.fromEntries(Object.entries(cursor?.explicitPullRequests ?? {}).map(([prNumber, watch]) => [
|
|
18
|
+
prNumber,
|
|
19
|
+
{
|
|
20
|
+
registeredAt: watch.registeredAt,
|
|
21
|
+
...(watch.kinds ? { kinds: [...watch.kinds] } : {}),
|
|
22
|
+
},
|
|
23
|
+
])),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
function normalizePullRequestMonitorCursor(cursor) {
|
|
27
|
+
return {
|
|
28
|
+
...(cursor.lastReviewId !== undefined
|
|
29
|
+
? { lastReviewId: cursor.lastReviewId }
|
|
30
|
+
: {}),
|
|
31
|
+
...(cursor.lastReviewCommentId !== undefined
|
|
32
|
+
? { lastReviewCommentId: cursor.lastReviewCommentId }
|
|
33
|
+
: {}),
|
|
34
|
+
...(cursor.pendingCheckNames !== undefined
|
|
35
|
+
? { pendingCheckNames: [...cursor.pendingCheckNames] }
|
|
36
|
+
: {}),
|
|
37
|
+
...(cursor.notifiedCheckNames !== undefined
|
|
38
|
+
? { notifiedCheckNames: [...cursor.notifiedCheckNames] }
|
|
39
|
+
: {}),
|
|
40
|
+
...(cursor.ciChecks !== undefined
|
|
41
|
+
? {
|
|
42
|
+
ciChecks: Object.fromEntries(Object.entries(cursor.ciChecks).map(([name, ciCursor]) => [
|
|
43
|
+
name,
|
|
44
|
+
{
|
|
45
|
+
runKey: ciCursor.runKey,
|
|
46
|
+
status: ciCursor.status,
|
|
47
|
+
},
|
|
48
|
+
])),
|
|
49
|
+
}
|
|
50
|
+
: {}),
|
|
51
|
+
...(cursor.ciBootstrapPending ? { ciBootstrapPending: true } : {}),
|
|
8
52
|
};
|
|
9
53
|
}
|
|
10
54
|
/** 新規セッション初回 poll のカーソル初期化のみか(sidecar 復元済みなら false)。worker の init prompt とは無関係。 */
|
|
@@ -16,7 +60,9 @@ export function isEmptyGitHubMonitorCursor(cursor) {
|
|
|
16
60
|
if (pr.lastReviewId ||
|
|
17
61
|
pr.lastReviewCommentId ||
|
|
18
62
|
(pr.pendingCheckNames?.length ?? 0) > 0 ||
|
|
19
|
-
(pr.notifiedCheckNames?.length ?? 0) > 0
|
|
63
|
+
(pr.notifiedCheckNames?.length ?? 0) > 0 ||
|
|
64
|
+
Object.keys(pr.ciChecks ?? {}).length > 0 ||
|
|
65
|
+
pr.ciBootstrapPending === true) {
|
|
20
66
|
return false;
|
|
21
67
|
}
|
|
22
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-monitor-cursor.js","sourceRoot":"","sources":["../../src/github/github-monitor-cursor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"github-monitor-cursor.js","sourceRoot":"","sources":["../../src/github/github-monitor-cursor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { EnsembleConfig } from '../config/types.js';
|
|
|
2
2
|
import type { GitHubClient } from './github-client.js';
|
|
3
3
|
import { type GitHubMonitorCursor } from './github-monitor-cursor.js';
|
|
4
4
|
import type { GitHubUpdatePayload } from './github-update-types.js';
|
|
5
|
+
import type { GitHubUpdateKind } from './github-update-types.js';
|
|
5
6
|
export declare const DEFAULT_GITHUB_MONITOR_DEBOUNCE_MS = 30000;
|
|
6
7
|
export declare const DEFAULT_GITHUB_MONITOR_POLL_INTERVAL_MS = 60000;
|
|
7
8
|
export declare const DEFAULT_GITHUB_MONITOR_ACTIVE_POLL_INTERVAL_MS = 15000;
|
|
@@ -28,6 +29,12 @@ export interface GitHubMonitor {
|
|
|
28
29
|
stop(): Promise<void>;
|
|
29
30
|
flush(): void;
|
|
30
31
|
getCursor(): GitHubMonitorCursor;
|
|
32
|
+
/** Add a runtime PR watch without waiting for GitHub Search to find it. */
|
|
33
|
+
registerPullRequest(registration: {
|
|
34
|
+
prNumber: number;
|
|
35
|
+
registeredAt: string;
|
|
36
|
+
kinds?: GitHubUpdateKind[];
|
|
37
|
+
}): void;
|
|
31
38
|
}
|
|
32
39
|
export declare function createGitHubMonitor(options: GitHubMonitorOptions): GitHubMonitor;
|
|
33
40
|
//# sourceMappingURL=github-monitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-monitor.d.ts","sourceRoot":"","sources":["../../src/github/github-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAQzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAIL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAoB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"github-monitor.d.ts","sourceRoot":"","sources":["../../src/github/github-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAQzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAIL,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAoB,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,eAAO,MAAM,kCAAkC,QAAS,CAAC;AACzD,eAAO,MAAM,uCAAuC,QAAS,CAAC;AAC9D,eAAO,MAAM,8CAA8C,QAAS,CAAC;AACrE,kEAAkE;AAClE,eAAO,MAAM,wCAAwC,OAAQ,CAAC;AAE9D,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oDAAoD;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACvD,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,IAAI,CAAC;IACd,SAAS,IAAI,mBAAmB,CAAC;IACjC,2EAA2E;IAC3E,mBAAmB,CAAC,YAAY,EAAE;QAChC,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;KAC5B,GAAG,IAAI,CAAC;CACV;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAqKhF"}
|
|
@@ -21,6 +21,8 @@ export function createGitHubMonitor(options) {
|
|
|
21
21
|
let pollAbortController;
|
|
22
22
|
let hasPendingCi = false;
|
|
23
23
|
let needsBootstrapPoll = isEmptyGitHubMonitorCursor(cursor);
|
|
24
|
+
let pollRequested = false;
|
|
25
|
+
const pendingRegistrations = new Map();
|
|
24
26
|
const buffer = new DebounceBuffer({
|
|
25
27
|
debounceMs,
|
|
26
28
|
shutdownSignal: options.shutdownSignal,
|
|
@@ -41,6 +43,15 @@ export function createGitHubMonitor(options) {
|
|
|
41
43
|
void pollOnce();
|
|
42
44
|
}, delayMs);
|
|
43
45
|
};
|
|
46
|
+
const requestPoll = (delayMs) => {
|
|
47
|
+
if (stopped || !started)
|
|
48
|
+
return;
|
|
49
|
+
if (pollInFlight) {
|
|
50
|
+
pollRequested = true;
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
schedulePoll(delayMs);
|
|
54
|
+
};
|
|
44
55
|
const pollOnce = async () => {
|
|
45
56
|
if (stopped || pollInFlight)
|
|
46
57
|
return;
|
|
@@ -56,7 +67,8 @@ export function createGitHubMonitor(options) {
|
|
|
56
67
|
abortSignal: pollAbortController.signal,
|
|
57
68
|
};
|
|
58
69
|
const result = await fetchGitHubUpdates(input);
|
|
59
|
-
cursor = result.cursor;
|
|
70
|
+
cursor = mergePendingRegistrations(result.cursor, pendingRegistrations);
|
|
71
|
+
pendingRegistrations.clear();
|
|
60
72
|
options.onCursorChange?.(cursor);
|
|
61
73
|
needsBootstrapPoll = false;
|
|
62
74
|
hasPendingCi = result.hasPendingCi;
|
|
@@ -83,8 +95,14 @@ export function createGitHubMonitor(options) {
|
|
|
83
95
|
pollAbortController = undefined;
|
|
84
96
|
pollInFlight = false;
|
|
85
97
|
if (!stopped && started) {
|
|
86
|
-
|
|
87
|
-
|
|
98
|
+
if (pollRequested) {
|
|
99
|
+
pollRequested = false;
|
|
100
|
+
schedulePoll(0);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
const nextDelay = hasPendingCi ? activePollIntervalMs : pollIntervalMs;
|
|
104
|
+
schedulePoll(nextDelay);
|
|
105
|
+
}
|
|
88
106
|
}
|
|
89
107
|
}
|
|
90
108
|
};
|
|
@@ -128,8 +146,33 @@ export function createGitHubMonitor(options) {
|
|
|
128
146
|
getCursor() {
|
|
129
147
|
return normalizeGitHubMonitorCursor(cursor);
|
|
130
148
|
},
|
|
149
|
+
registerPullRequest(registration) {
|
|
150
|
+
const key = String(registration.prNumber);
|
|
151
|
+
cursor.explicitPullRequests ??= {};
|
|
152
|
+
const watch = cursor.explicitPullRequests[key] ?? {
|
|
153
|
+
registeredAt: registration.registeredAt,
|
|
154
|
+
...(registration.kinds ? { kinds: [...registration.kinds] } : {}),
|
|
155
|
+
};
|
|
156
|
+
cursor.explicitPullRequests[key] ??= watch;
|
|
157
|
+
pendingRegistrations.set(key, watch);
|
|
158
|
+
options.onCursorChange?.(cursor);
|
|
159
|
+
requestPoll(0);
|
|
160
|
+
},
|
|
131
161
|
};
|
|
132
162
|
}
|
|
163
|
+
function mergePendingRegistrations(cursor, pendingRegistrations) {
|
|
164
|
+
if (pendingRegistrations.size === 0) {
|
|
165
|
+
return cursor;
|
|
166
|
+
}
|
|
167
|
+
cursor.explicitPullRequests ??= {};
|
|
168
|
+
for (const [key, watch] of pendingRegistrations) {
|
|
169
|
+
cursor.explicitPullRequests[key] ??= {
|
|
170
|
+
registeredAt: watch.registeredAt,
|
|
171
|
+
...(watch.kinds ? { kinds: [...watch.kinds] } : {}),
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
return cursor;
|
|
175
|
+
}
|
|
133
176
|
function isAbortError(error) {
|
|
134
177
|
return error instanceof Error && error.name === 'AbortError';
|
|
135
178
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-monitor.js","sourceRoot":"","sources":["../../src/github/github-monitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,4BAA4B,GAE7B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"github-monitor.js","sourceRoot":"","sources":["../../src/github/github-monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export type GitHubUpdateKind = 'issue.comment' | 'pr.review' | 'pr.review_comment' | 'ci.completed';
|
|
3
3
|
/** 1 件の GitHub 更新(debounce 前の単位)。 */
|
|
4
4
|
export interface GitHubUpdateItem {
|
|
5
|
-
/** 安定 ID(comment / review /
|
|
5
|
+
/** 安定 ID(comment / review / CI 実行の識別子)。 */
|
|
6
6
|
id: string;
|
|
7
7
|
kind: GitHubUpdateKind;
|
|
8
8
|
/** conductor 向け 1 行要約。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github-update-types.d.ts","sourceRoot":"","sources":["../../src/github/github-update-types.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,MAAM,gBAAgB,GACxB,eAAe,GACf,WAAW,GACX,mBAAmB,GACnB,cAAc,CAAC;AAEnB,qCAAqC;AACrC,MAAM,WAAW,gBAAgB;IAC/B,
|
|
1
|
+
{"version":3,"file":"github-update-types.d.ts","sourceRoot":"","sources":["../../src/github/github-update-types.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,MAAM,gBAAgB,GACxB,eAAe,GACf,WAAW,GACX,mBAAmB,GACnB,cAAc,CAAC;AAEnB,qCAAqC;AACrC,MAAM,WAAW,gBAAgB;IAC/B,2CAA2C;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,0CAA0C;AAC1C,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B"}
|
package/dist/github/index.d.ts
CHANGED
|
@@ -12,7 +12,10 @@ export type { IssueContext, IssueComment, } from './issue-context.js';
|
|
|
12
12
|
export { createGitHubMonitor, DEFAULT_GITHUB_MONITOR_DEBOUNCE_MS, DEFAULT_GITHUB_MONITOR_POLL_INTERVAL_MS, DEFAULT_GITHUB_MONITOR_ACTIVE_POLL_INTERVAL_MS, } from './github-monitor.js';
|
|
13
13
|
export type { GitHubMonitor, GitHubMonitorOptions } from './github-monitor.js';
|
|
14
14
|
export { emptyGitHubMonitorCursor, isEmptyGitHubMonitorCursor, normalizeGitHubMonitorCursor, } from './github-monitor-cursor.js';
|
|
15
|
-
export type { GitHubMonitorCursor, PullRequestMonitorCursor, } from './github-monitor-cursor.js';
|
|
15
|
+
export type { ExplicitPullRequestWatch, GitHubMonitorCursor, PullRequestCiCursor, PullRequestMonitorCursor, } from './github-monitor-cursor.js';
|
|
16
|
+
export { DEFAULT_GITHUB_WATCH_KINDS, } from './github-monitor-cursor.js';
|
|
17
|
+
export { createRegisterGitHubWatchTool, } from './register-github-watch-tool.js';
|
|
18
|
+
export type { GitHubWatchRegistration, RegisterGitHubWatchToolOptions, } from './register-github-watch-tool.js';
|
|
16
19
|
export type { GitHubUpdateItem, GitHubUpdateKind, GitHubUpdatePayload, } from './github-update-types.js';
|
|
17
20
|
export { fetchGitHubUpdates, normalizeStatusCheckRollup } from './fetch-github-updates.js';
|
|
18
21
|
export type { FetchGitHubUpdatesInput, FetchGitHubUpdatesResult, } from './fetch-github-updates.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/github/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChD,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,YAAY,EACV,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,GAC7B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,yBAAyB,EACzB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACvB,8BAA8B,EAC9B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,YAAY,EACZ,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,mBAAmB,EACnB,kCAAkC,EAClC,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC3F,YAAY,EACV,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/github/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChD,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,YAAY,EACV,qBAAqB,EACrB,6BAA6B,EAC7B,4BAA4B,GAC7B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,yBAAyB,EACzB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACvB,8BAA8B,EAC9B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EACV,YAAY,EACZ,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,mBAAmB,EACnB,kCAAkC,EAClC,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,6BAA6B,GAC9B,MAAM,iCAAiC,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,8BAA8B,GAC/B,MAAM,iCAAiC,CAAC;AACzC,YAAY,EACV,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC3F,YAAY,EACV,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,uBAAuB,EACvB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC"}
|
package/dist/github/index.js
CHANGED
|
@@ -6,6 +6,8 @@ export { fetchIssueContext, } from './issue-context.js';
|
|
|
6
6
|
export { formatIssueContextForPrompt, formatIssueContextYaml, } from './format-issue-context-prompt.js';
|
|
7
7
|
export { createGitHubMonitor, DEFAULT_GITHUB_MONITOR_DEBOUNCE_MS, DEFAULT_GITHUB_MONITOR_POLL_INTERVAL_MS, DEFAULT_GITHUB_MONITOR_ACTIVE_POLL_INTERVAL_MS, } from './github-monitor.js';
|
|
8
8
|
export { emptyGitHubMonitorCursor, isEmptyGitHubMonitorCursor, normalizeGitHubMonitorCursor, } from './github-monitor-cursor.js';
|
|
9
|
+
export { DEFAULT_GITHUB_WATCH_KINDS, } from './github-monitor-cursor.js';
|
|
10
|
+
export { createRegisterGitHubWatchTool, } from './register-github-watch-tool.js';
|
|
9
11
|
export { fetchGitHubUpdates, normalizeStatusCheckRollup } from './fetch-github-updates.js';
|
|
10
12
|
export { GitHubMonitorError, safeUpperString, classifyGitHubMonitorError, createGitHubMonitorPhaseError, } from './github-monitor-error.js';
|
|
11
13
|
//# sourceMappingURL=index.js.map
|
package/dist/github/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/github/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAMxE,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAW5B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAK1C,OAAO,EACL,mBAAmB,EACnB,kCAAkC,EAClC,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/github/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAMxE,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAW5B,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,kCAAkC,CAAC;AAK1C,OAAO,EACL,mBAAmB,EACnB,kCAAkC,EAClC,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EACL,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,6BAA6B,GAC9B,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAK3F,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { SDKCustomTool } from '@cursor/sdk';
|
|
2
|
+
import { type ExplicitPullRequestWatch, type GitHubMonitorCursor } from './github-monitor-cursor.js';
|
|
3
|
+
export interface GitHubWatchRegistration extends ExplicitPullRequestWatch {
|
|
4
|
+
prNumber: number;
|
|
5
|
+
}
|
|
6
|
+
export interface RegisterGitHubWatchToolOptions {
|
|
7
|
+
issueUrl: string;
|
|
8
|
+
/** The mutable session cursor that is persisted by the conductor session. */
|
|
9
|
+
getCursor: () => GitHubMonitorCursor;
|
|
10
|
+
/** Called only when a PR is newly registered. */
|
|
11
|
+
onRegistered?: (registration: GitHubWatchRegistration) => void | Promise<void>;
|
|
12
|
+
/** Test hook for deterministic registration timestamps. */
|
|
13
|
+
now?: () => Date;
|
|
14
|
+
}
|
|
15
|
+
export declare function createRegisterGitHubWatchTool(options: RegisterGitHubWatchToolOptions): Record<string, SDKCustomTool>;
|
|
16
|
+
//# sourceMappingURL=register-github-watch-tool.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-github-watch-tool.d.ts","sourceRoot":"","sources":["../../src/github/register-github-watch-tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,mBAAmB,EACzB,MAAM,4BAA4B,CAAC;AAQpC,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB;IACvE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,mBAAmB,CAAC;IACrC,iDAAiD;IACjD,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,2DAA2D;IAC3D,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,8BAA8B,GACtC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CA8F/B"}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import { parseIssueUrl } from '../issue/issue-ref.js';
|
|
2
|
+
import { DEFAULT_GITHUB_WATCH_KINDS, } from './github-monitor-cursor.js';
|
|
3
|
+
import { yamlToolResult } from '../dispatch/yaml-tool-result.js';
|
|
4
|
+
const PULL_REQUEST_WATCH_KINDS = new Set(DEFAULT_GITHUB_WATCH_KINDS);
|
|
5
|
+
export function createRegisterGitHubWatchTool(options) {
|
|
6
|
+
return {
|
|
7
|
+
register_github_watch: {
|
|
8
|
+
description: [
|
|
9
|
+
'Register a pull request for the harness GitHub monitor.',
|
|
10
|
+
'Provide prNumber or prUrl; the pull request must belong to the session Issue repository.',
|
|
11
|
+
'If kinds is omitted, monitor PR reviews, review comments, and CI completion.',
|
|
12
|
+
'An immediate bootstrap poll records the current PR and CI state; already-completed checks are baseline only and are not emitted.',
|
|
13
|
+
'Registering the same pull request more than once is a no-op.',
|
|
14
|
+
].join(' '),
|
|
15
|
+
inputSchema: {
|
|
16
|
+
type: 'object',
|
|
17
|
+
properties: {
|
|
18
|
+
prNumber: {
|
|
19
|
+
type: 'integer',
|
|
20
|
+
minimum: 1,
|
|
21
|
+
description: 'Pull request number (provide this or prUrl)',
|
|
22
|
+
},
|
|
23
|
+
prUrl: {
|
|
24
|
+
type: 'string',
|
|
25
|
+
description: 'GitHub pull request URL (provide this or prNumber)',
|
|
26
|
+
},
|
|
27
|
+
kinds: {
|
|
28
|
+
type: 'array',
|
|
29
|
+
items: {
|
|
30
|
+
type: 'string',
|
|
31
|
+
enum: [...DEFAULT_GITHUB_WATCH_KINDS],
|
|
32
|
+
},
|
|
33
|
+
description: 'Optional PR update kinds to monitor; defaults to review, review_comment, and ci.completed',
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
async execute(args) {
|
|
38
|
+
const issue = parseIssueUrl(options.issueUrl);
|
|
39
|
+
const numberFromArgs = parsePullRequestNumber(args.prNumber);
|
|
40
|
+
const urlRef = parsePullRequestUrl(args.prUrl);
|
|
41
|
+
if (numberFromArgs === undefined && urlRef === undefined) {
|
|
42
|
+
throw new Error('register_github_watch requires prNumber or prUrl');
|
|
43
|
+
}
|
|
44
|
+
if (urlRef && !sameRepository(issue, urlRef)) {
|
|
45
|
+
throw new Error('register_github_watch prUrl must belong to the same repository as the session Issue');
|
|
46
|
+
}
|
|
47
|
+
if (numberFromArgs !== undefined &&
|
|
48
|
+
urlRef !== undefined &&
|
|
49
|
+
numberFromArgs !== urlRef.number) {
|
|
50
|
+
throw new Error('register_github_watch prNumber and prUrl refer to different pull requests');
|
|
51
|
+
}
|
|
52
|
+
const prNumber = numberFromArgs ?? urlRef.number;
|
|
53
|
+
const url = `https://github.com/${issue.owner}/${issue.repo}/pull/${prNumber}`;
|
|
54
|
+
const requestedKinds = parseKinds(args.kinds);
|
|
55
|
+
const cursor = options.getCursor();
|
|
56
|
+
cursor.explicitPullRequests ??= {};
|
|
57
|
+
const key = String(prNumber);
|
|
58
|
+
const existing = cursor.explicitPullRequests[key];
|
|
59
|
+
const kinds = existing
|
|
60
|
+
? resolveKinds(existing.kinds)
|
|
61
|
+
: requestedKinds;
|
|
62
|
+
if (!existing) {
|
|
63
|
+
const registration = {
|
|
64
|
+
prNumber,
|
|
65
|
+
registeredAt: (options.now ?? (() => new Date()))().toISOString(),
|
|
66
|
+
kinds,
|
|
67
|
+
};
|
|
68
|
+
cursor.explicitPullRequests[key] = {
|
|
69
|
+
registeredAt: registration.registeredAt,
|
|
70
|
+
kinds: [...kinds],
|
|
71
|
+
};
|
|
72
|
+
await options.onRegistered?.(registration);
|
|
73
|
+
}
|
|
74
|
+
return yamlToolResult('register_github_watch', {
|
|
75
|
+
ok: true,
|
|
76
|
+
prNumber,
|
|
77
|
+
url,
|
|
78
|
+
kinds,
|
|
79
|
+
message: existing
|
|
80
|
+
? 'Pull request is already registered for the harness GitHub monitor'
|
|
81
|
+
: 'Registered for harness GitHub monitor',
|
|
82
|
+
});
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
function parsePullRequestNumber(value) {
|
|
88
|
+
if (value === undefined)
|
|
89
|
+
return undefined;
|
|
90
|
+
if (typeof value === 'number') {
|
|
91
|
+
if (Number.isSafeInteger(value) && value > 0)
|
|
92
|
+
return value;
|
|
93
|
+
}
|
|
94
|
+
else if (typeof value === 'string' && /^\d+$/.test(value.trim())) {
|
|
95
|
+
const parsed = Number(value.trim());
|
|
96
|
+
if (Number.isSafeInteger(parsed) && parsed > 0)
|
|
97
|
+
return parsed;
|
|
98
|
+
}
|
|
99
|
+
throw new Error('register_github_watch prNumber must be a positive integer');
|
|
100
|
+
}
|
|
101
|
+
function parsePullRequestUrl(value) {
|
|
102
|
+
if (value === undefined)
|
|
103
|
+
return undefined;
|
|
104
|
+
if (typeof value !== 'string' || value.trim().length === 0) {
|
|
105
|
+
throw new Error('register_github_watch prUrl must be a non-empty URL');
|
|
106
|
+
}
|
|
107
|
+
const match = /^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)\/?$/.exec(value.trim());
|
|
108
|
+
if (!match) {
|
|
109
|
+
throw new Error('register_github_watch prUrl must be a GitHub pull request URL');
|
|
110
|
+
}
|
|
111
|
+
const number = Number(match[3]);
|
|
112
|
+
if (!Number.isSafeInteger(number) || number <= 0) {
|
|
113
|
+
throw new Error('register_github_watch prUrl must contain a valid PR number');
|
|
114
|
+
}
|
|
115
|
+
return { owner: match[1], repo: match[2], number };
|
|
116
|
+
}
|
|
117
|
+
function sameRepository(issue, pr) {
|
|
118
|
+
return (issue.owner.toLowerCase() === pr.owner.toLowerCase() &&
|
|
119
|
+
issue.repo.toLowerCase() === pr.repo.toLowerCase());
|
|
120
|
+
}
|
|
121
|
+
function parseKinds(value) {
|
|
122
|
+
if (value === undefined)
|
|
123
|
+
return [...DEFAULT_GITHUB_WATCH_KINDS];
|
|
124
|
+
if (!Array.isArray(value)) {
|
|
125
|
+
throw new Error('register_github_watch kinds must be an array');
|
|
126
|
+
}
|
|
127
|
+
const kinds = [];
|
|
128
|
+
for (const item of value) {
|
|
129
|
+
if (typeof item !== 'string' || !PULL_REQUEST_WATCH_KINDS.has(item)) {
|
|
130
|
+
throw new Error('register_github_watch kinds must contain only pr.review, pr.review_comment, or ci.completed');
|
|
131
|
+
}
|
|
132
|
+
if (!kinds.includes(item)) {
|
|
133
|
+
kinds.push(item);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
return kinds;
|
|
137
|
+
}
|
|
138
|
+
function resolveKinds(kinds) {
|
|
139
|
+
if (!kinds)
|
|
140
|
+
return [...DEFAULT_GITHUB_WATCH_KINDS];
|
|
141
|
+
return parseKinds(kinds);
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=register-github-watch-tool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-github-watch-tool.js","sourceRoot":"","sources":["../../src/github/register-github-watch-tool.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export * from './dispatch/index.js';
|
|
|
10
10
|
export * from './github/index.js';
|
|
11
11
|
export * from './conductor/index.js';
|
|
12
12
|
export * from './permission/index.js';
|
|
13
|
+
export * from './representation/index.js';
|
|
13
14
|
export * from './usage/index.js';
|
|
14
15
|
export * from './escalation/index.js';
|
|
15
16
|
export * from './session/index.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,eAAO,MAAM,YAAY,0BAA0B,CAAC;AAEpD,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,uEAAuE;AACvE,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAC5B,uEAAuE;AACvE,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,eAAO,MAAM,YAAY,0BAA0B,CAAC;AAEpD,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,uEAAuE;AACvE,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAC5B,uEAAuE;AACvE,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@ export * from './dispatch/index.js';
|
|
|
10
10
|
export * from './github/index.js';
|
|
11
11
|
export * from './conductor/index.js';
|
|
12
12
|
export * from './permission/index.js';
|
|
13
|
+
export * from './representation/index.js';
|
|
13
14
|
export * from './usage/index.js';
|
|
14
15
|
export * from './escalation/index.js';
|
|
15
16
|
export * from './session/index.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAEpD,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,uEAAuE;AACvE,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAEhE,MAAM,CAAC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAEpD,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,uEAAuE;AACvE,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC"}
|
|
@@ -10,6 +10,6 @@ export interface PermissionOperationSummary {
|
|
|
10
10
|
field: string;
|
|
11
11
|
value: string;
|
|
12
12
|
}
|
|
13
|
-
/**
|
|
13
|
+
/** ACP payload の構造化フィールドから、ツールに依存しない操作概要を抜き出す。 */
|
|
14
14
|
export declare function extractPermissionOperationSummary(request: PermissionRequest): PermissionOperationSummary | undefined;
|
|
15
15
|
//# sourceMappingURL=format-permission-summary-for-operator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-permission-summary-for-operator.d.ts","sourceRoot":"","sources":["../../src/permission/format-permission-summary-for-operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,MAAM,WAAW,yCAAyC;IACxD,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,kDAAkD;AAClD,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE,yCAA8C,GACtD,MAAM,CAgBR;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,
|
|
1
|
+
{"version":3,"file":"format-permission-summary-for-operator.d.ts","sourceRoot":"","sources":["../../src/permission/format-permission-summary-for-operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAIjE,MAAM,WAAW,yCAAyC;IACxD,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,kDAAkD;AAClD,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE,yCAA8C,GACtD,MAAM,CAgBR;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,kDAAkD;AAClD,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,iBAAiB,GACzB,0BAA0B,GAAG,SAAS,CAuExC"}
|
|
@@ -15,32 +15,58 @@ export function formatPermissionSummaryForOperator(pending, options = {}) {
|
|
|
15
15
|
parts.push(`id=${formatLogValue(shortPermissionId(pending.id))}`);
|
|
16
16
|
return parts.join(' ');
|
|
17
17
|
}
|
|
18
|
-
/**
|
|
18
|
+
/** ACP payload の構造化フィールドから、ツールに依存しない操作概要を抜き出す。 */
|
|
19
19
|
export function extractPermissionOperationSummary(request) {
|
|
20
20
|
const raw = asRecord(request.raw) ?? {};
|
|
21
|
-
const toolCall =
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
raw
|
|
21
|
+
const toolCall = asRecordOrJson(raw.toolCall) ?? asRecordOrJson(raw.tool_call);
|
|
22
|
+
const inputs = [
|
|
23
|
+
asRecordOrJson(raw.input),
|
|
24
|
+
asRecordOrJson(raw.arguments),
|
|
25
|
+
asRecordOrJson(raw.rawInput),
|
|
26
|
+
asRecordOrJson(raw.raw_input),
|
|
27
|
+
asRecordOrJson(toolCall?.args),
|
|
28
|
+
asRecordOrJson(toolCall?.rawInput),
|
|
29
|
+
asRecordOrJson(toolCall?.raw_input),
|
|
30
|
+
raw,
|
|
31
|
+
].filter((input) => input !== undefined);
|
|
32
|
+
const command = inputs
|
|
33
|
+
.map((input) => readString(input, 'command', 'cmd', 'commandLine', 'shellCommand', 'script'))
|
|
34
|
+
.find((value) => value !== undefined);
|
|
35
|
+
if (command) {
|
|
36
|
+
return { field: 'cmd', value: sanitizeSummaryValue(command) };
|
|
37
|
+
}
|
|
27
38
|
const tool = request.toolName.trim().toLowerCase();
|
|
28
39
|
if (tool === 'shell' || tool === 'bash') {
|
|
29
|
-
const
|
|
30
|
-
readString(
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return { field: 'cmd', value: sanitizeSummaryValue(command) };
|
|
40
|
+
const description = inputs
|
|
41
|
+
.map((input) => readString(input, 'description', 'working_directory'))
|
|
42
|
+
.find((value) => value !== undefined);
|
|
43
|
+
if (description) {
|
|
44
|
+
return { field: 'cmd', value: sanitizeSummaryValue(description) };
|
|
35
45
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
readString(raw, 'path', 'file_path', 'filePath', 'target_file');
|
|
40
|
-
if (path) {
|
|
41
|
-
return { field: 'path', value: sanitizeSummaryValue(path) };
|
|
46
|
+
const rawInputText = readString(toolCall, 'rawInput', 'raw_input');
|
|
47
|
+
if (rawInputText && !asRecordOrJson(rawInputText)) {
|
|
48
|
+
return { field: 'cmd', value: sanitizeSummaryValue(rawInputText) };
|
|
42
49
|
}
|
|
43
50
|
}
|
|
51
|
+
const path = inputs
|
|
52
|
+
.map((input) => readString(input, 'path', 'file_path', 'filePath', 'target_file', 'filename'))
|
|
53
|
+
.find((value) => value !== undefined);
|
|
54
|
+
if (path) {
|
|
55
|
+
return { field: 'path', value: sanitizeSummaryValue(path) };
|
|
56
|
+
}
|
|
57
|
+
const locationPath = readLocationPath(raw, toolCall);
|
|
58
|
+
if (locationPath) {
|
|
59
|
+
return { field: 'path', value: sanitizeSummaryValue(locationPath) };
|
|
60
|
+
}
|
|
61
|
+
const toolCallId = readString(toolCall, 'toolCallId', 'tool_call_id') ??
|
|
62
|
+
readString(raw, 'toolCallId', 'tool_call_id');
|
|
63
|
+
if (toolCallId) {
|
|
64
|
+
return { field: 'toolCallId', value: sanitizeSummaryValue(toolCallId) };
|
|
65
|
+
}
|
|
66
|
+
const title = readString(toolCall, 'title', 'description');
|
|
67
|
+
if (title) {
|
|
68
|
+
return { field: 'detail', value: sanitizeSummaryValue(title) };
|
|
69
|
+
}
|
|
44
70
|
const fallback = sanitizeSummaryValue(safeShortenRaw(request.raw));
|
|
45
71
|
if (fallback) {
|
|
46
72
|
return { field: 'detail', value: fallback };
|
|
@@ -59,6 +85,36 @@ function asRecord(value) {
|
|
|
59
85
|
? value
|
|
60
86
|
: undefined;
|
|
61
87
|
}
|
|
88
|
+
function asRecordOrJson(value) {
|
|
89
|
+
const record = asRecord(value);
|
|
90
|
+
if (record) {
|
|
91
|
+
return record;
|
|
92
|
+
}
|
|
93
|
+
if (typeof value !== 'string') {
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
try {
|
|
97
|
+
return asRecord(JSON.parse(value));
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
function readLocationPath(raw, toolCall) {
|
|
104
|
+
for (const candidate of [raw.locations, toolCall?.locations]) {
|
|
105
|
+
if (!Array.isArray(candidate)) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
for (const location of candidate) {
|
|
109
|
+
const record = asRecord(location);
|
|
110
|
+
const path = readString(record, 'path', 'file_path', 'filePath', 'uri');
|
|
111
|
+
if (path) {
|
|
112
|
+
return path;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return undefined;
|
|
117
|
+
}
|
|
62
118
|
function readString(record, ...keys) {
|
|
63
119
|
if (!record) {
|
|
64
120
|
return undefined;
|