Compare commits
8 Commits
fix/int9-n
...
chore/1117
| Author | SHA1 | Date | |
|---|---|---|---|
| c5a605ab1d | |||
| 517b3ee844 | |||
| 75aa931f85 | |||
| 2d4113e581 | |||
| e324240b7e | |||
| 68f85717de | |||
| 50b29d4b12 | |||
| f3b972119b |
@@ -9,7 +9,7 @@
|
||||
* הלוגיקה כאן טהורה (תלויות מוזרקות) כדי שאפשר לבדוק אותה בלי host.
|
||||
*/
|
||||
|
||||
/** חברה → agent id של שטן-מליץ (Gemini) באותה חברה. */
|
||||
/** חברה → agent id של שטן-מליץ באותה חברה (Fable מאז legal-ai #978; היה Gemini). */
|
||||
export const DEVIL_AGENT_IDS: Record<string, string> = {
|
||||
"42a7acd0-30c5-4cbd-ac97-7424f65df294":
|
||||
"9c86e06a-5a92-4723-af6d-e8cc6ae1d45b", // CMP
|
||||
@@ -17,6 +17,12 @@ export const DEVIL_AGENT_IDS: Record<string, string> = {
|
||||
"46cc1228-a232-410b-a36b-71a6928499a2", // CMPA
|
||||
};
|
||||
|
||||
/** קובץ המזכר: critique.md (Fable, legal-ai #978); critique-gemini.md לתיקים שרצו לפני המעבר. */
|
||||
export const CRITIQUE_FILENAMES = [
|
||||
"critique.md",
|
||||
"critique-gemini.md",
|
||||
] as const;
|
||||
|
||||
export const DEFAULT_CASES_DIR = "/home/chaim/legal-ai/data/cases";
|
||||
/** מזכר קצר מזה = כנראה ריצה ריקה/חלקית, לא סוגרים. */
|
||||
export const MIN_CRITIQUE_BYTES = 2000;
|
||||
@@ -72,7 +78,7 @@ export type CloseOutcome =
|
||||
|
||||
/**
|
||||
* מופעל על `agent.run.finished` (status=succeeded בלבד). סוגר את ה-issue רק אם:
|
||||
* הריצה של שטן-מליץ של אותה חברה, ה-issue שלו פתוח, וקיים `critique-gemini.md` עדכני ולא ריק.
|
||||
* הריצה של שטן-מליץ של אותה חברה, ה-issue שלו פתוח, וקיים מזכר (`critique.md`) עדכני ולא ריק.
|
||||
*/
|
||||
export async function closeDevilIssueIfDone(
|
||||
companyId: string | undefined,
|
||||
@@ -113,7 +119,7 @@ export async function closeDevilIssueIfDone(
|
||||
if (!st || st.size < MIN_CRITIQUE_BYTES || st.mtimeMs < created) {
|
||||
deps.log(
|
||||
"warn",
|
||||
"devil auto-close: no fresh critique-gemini.md; leaving issue open",
|
||||
"devil auto-close: no fresh critique memo; leaving issue open",
|
||||
{
|
||||
issueId: issue.id,
|
||||
caseNumber,
|
||||
|
||||
@@ -36,6 +36,15 @@ export class LegalApi {
|
||||
return this.request("/api/cases");
|
||||
}
|
||||
|
||||
/**
|
||||
* Minimal `{case_number, status}` index for `sync-case-status` (legal-ai #1117).
|
||||
* Lives on the internal machine route; the fuller `/api/cases` listing does not
|
||||
* (session-only), so the sync job must not call `listCases()`.
|
||||
*/
|
||||
async listCaseStatuses(): Promise<CaseStatusEntry[]> {
|
||||
return this.request("/api/cases/status-index");
|
||||
}
|
||||
|
||||
async getStatusModel(): Promise<StatusModel> {
|
||||
return this.request("/api/status-model");
|
||||
}
|
||||
@@ -182,6 +191,12 @@ export class LegalApi {
|
||||
|
||||
// Types
|
||||
|
||||
export interface CaseStatusEntry {
|
||||
case_number: string;
|
||||
status: string;
|
||||
updated_at?: string | null;
|
||||
}
|
||||
|
||||
export interface CaseSummary {
|
||||
case_number: string;
|
||||
title: string;
|
||||
|
||||
@@ -179,13 +179,10 @@ export default {
|
||||
},
|
||||
],
|
||||
jobs: [
|
||||
{
|
||||
jobKey: "sync-case-status",
|
||||
displayName: "Sync Legal Case Status",
|
||||
description:
|
||||
"Polls legal-ai for case status changes and updates Paperclip issues",
|
||||
schedule: "*/15 * * * *",
|
||||
},
|
||||
// הושבת (legal-ai #1117, INV-INT9 — כותב יחיד ל-issue.status): הסנכרון עבר
|
||||
// לצד-השרת (`_case_status_sync_loop` ב-legal-ai, CASE_STATUS_SYNC_MODE).
|
||||
// הסרה מההצהרה גורמת ל-Paperclip להעביר את הג'וב ל-`paused` בהתקנה הבאה.
|
||||
// ה-handler ב-worker.ts נשאר רשום אך לא יופעל.
|
||||
{
|
||||
jobKey: "stale-case-reminder",
|
||||
displayName: "תזכורת תיקים תקועים",
|
||||
|
||||
24
src/worker-fetch.test.ts
Normal file
24
src/worker-fetch.test.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
/// <reference types="node" />
|
||||
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
// Excluded from tsc (tsconfig.json), run natively via `node --test` (literal `.ts`).
|
||||
import { fetchLegalApi } from "./worker-fetch.ts";
|
||||
|
||||
test("fetchLegalApi uses the worker's global fetch (not the host-mediated ctx.http.fetch)", async () => {
|
||||
const original = globalThis.fetch;
|
||||
let called = "";
|
||||
globalThis.fetch = (async (url: string) => {
|
||||
called = url;
|
||||
return new Response("{}", { status: 200 });
|
||||
}) as typeof fetch;
|
||||
try {
|
||||
const resp = await fetchLegalApi(
|
||||
"http://127.0.0.1:8001/api/cases/stale?days=30",
|
||||
);
|
||||
assert.equal(resp.ok, true);
|
||||
assert.equal(called, "http://127.0.0.1:8001/api/cases/stale?days=30");
|
||||
} finally {
|
||||
globalThis.fetch = original;
|
||||
}
|
||||
});
|
||||
16
src/worker-fetch.ts
Normal file
16
src/worker-fetch.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
/**
|
||||
* `fetch` of the worker process — used by the scheduled jobs that read legal-ai's
|
||||
* internal-machine routes at `http://127.0.0.1:8001`. `ctx.http.fetch` is host-mediated
|
||||
* and Paperclip's SSRF guard rejects loopback/private targets ("All resolved IPs for
|
||||
* 127.0.0.1 are in private/reserved ranges"), which is why `stale-case-reminder` and
|
||||
* `weekly-feedback-analysis` failed (legal-ai #1117). `LegalApi` already uses this fetch.
|
||||
*
|
||||
* Kept in its own module (no TypeScript parameter properties) so `node --test` can
|
||||
* load it in strip-only mode.
|
||||
*/
|
||||
export function fetchLegalApi(
|
||||
url: string,
|
||||
init?: RequestInit,
|
||||
): Promise<Response> {
|
||||
return fetch(url, init);
|
||||
}
|
||||
@@ -13,7 +13,11 @@ import {
|
||||
resolveApiBaseFrom,
|
||||
runJobHandler,
|
||||
} from "./company-scope.js";
|
||||
import { closeDevilIssueIfDone, DEFAULT_CASES_DIR } from "./devil-closer.js";
|
||||
import {
|
||||
CRITIQUE_FILENAMES,
|
||||
closeDevilIssueIfDone,
|
||||
DEFAULT_CASES_DIR,
|
||||
} from "./devil-closer.js";
|
||||
import type { StatusModelEntry } from "./legal-api.js";
|
||||
import { LegalApi } from "./legal-api.js";
|
||||
import {
|
||||
@@ -31,6 +35,7 @@ import {
|
||||
resolveStatusLabel,
|
||||
type SyncCandidate,
|
||||
} from "./sync-target.js";
|
||||
import { fetchLegalApi } from "./worker-fetch.js";
|
||||
|
||||
// Hoisted so onWebhook can access the context after setup() completes.
|
||||
let pluginCtx: PluginContext | null = null;
|
||||
@@ -768,21 +773,24 @@ const plugin = definePlugin({
|
||||
: null;
|
||||
},
|
||||
statCritique: async (caseNumber) => {
|
||||
try {
|
||||
const st = await stat(
|
||||
`${casesDir}/${caseNumber}/documents/research/critique-gemini.md`,
|
||||
);
|
||||
return { size: st.size, mtimeMs: st.mtimeMs };
|
||||
} catch (err) {
|
||||
if ((err as NodeJS.ErrnoException).code === "ENOENT")
|
||||
return null;
|
||||
throw err;
|
||||
// critique.md = שטן מליץ על Fable (legal-ai #978); critique-gemini.md = תיקים ישנים.
|
||||
for (const name of CRITIQUE_FILENAMES) {
|
||||
try {
|
||||
const st = await stat(
|
||||
`${casesDir}/${caseNumber}/documents/research/${name}`,
|
||||
);
|
||||
return { size: st.size, mtimeMs: st.mtimeMs };
|
||||
} catch (err) {
|
||||
if ((err as NodeJS.ErrnoException).code !== "ENOENT")
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
},
|
||||
// סטטוס בלבד, בלי comment: comment מעיר את ה-CEO פעם שנייה (user_commented).
|
||||
closeIssue: async (id, companyId) => {
|
||||
// כותב-סטטוס שני וצר בכוונה: רק issue של שטן-מליץ (נבדק בכותרת ובסוכן), רק open→done,
|
||||
// רק אחרי ריצה מוצלחת + critique-gemini.md עדכני (devil-closer.ts). בלי זה הסוכן
|
||||
// רק אחרי ריצה מוצלחת + מזכר (critique.md) עדכני (devil-closer.ts). בלי זה הסוכן
|
||||
// (בלי shell, #872) לא סוגר והתהליך נתקע; אין flip-flop כי done סופי.
|
||||
// noqa: INT9 — סגירת issue של שטן-מליץ אחרי ריצה מוצלחת (legal-ai #892), ראה devil-closer.ts
|
||||
await ctx.issues.update(id, { status: "done" }, companyId);
|
||||
@@ -965,7 +973,7 @@ const plugin = definePlugin({
|
||||
// כשה-scope נדחה (legal-ai issue #637). ה-`try/catch` הישן כאן בלע
|
||||
// את הכשל, וה-run נרשם `succeeded` בלי לעשות כלום — 13,928 ריצות כוזבות.
|
||||
await runJobHandler("sync-case-status", ctx.logger, async () => {
|
||||
const cases = await api.listCases();
|
||||
const cases = await api.listCaseStatuses();
|
||||
// נקבע מיד — לפני כל קריאת-מארח שעלולה ליפול. אחרת ריצה
|
||||
// שנפלה באמצע (או `!companies.length`) הייתה מדווחת scanned=0
|
||||
// ומאבדת בדיוק את האבחנה שה-issue הזה נועד לתת.
|
||||
@@ -1083,9 +1091,9 @@ const plugin = definePlugin({
|
||||
|
||||
// כשל-fetch/API אמיתי חייב **לזרוק**, לא `return` בשקט — אחרת
|
||||
// ה-run נרשם `succeeded` בלי שקרה כלום (legal-ai issue #637).
|
||||
let resp: Awaited<ReturnType<typeof ctx.http.fetch>>;
|
||||
let resp: Response;
|
||||
try {
|
||||
resp = await ctx.http.fetch(`${apiBase}/api/cases/stale?days=30`);
|
||||
resp = await fetchLegalApi(`${apiBase}/api/cases/stale?days=30`);
|
||||
} catch (err) {
|
||||
throw new Error(
|
||||
`stale-case-reminder: fetch failed against ${apiBase}: ${String(err)}`,
|
||||
@@ -1162,7 +1170,7 @@ const plugin = definePlugin({
|
||||
// throws CompanyScopeUnavailableError rather than guessing.
|
||||
const apiBase = await resolveApiBase(ctx);
|
||||
|
||||
const resp = await ctx.http.fetch(
|
||||
const resp = await fetchLegalApi(
|
||||
`${apiBase}/api/chair-feedback/weekly-summary`,
|
||||
);
|
||||
if (!resp.ok) {
|
||||
@@ -1383,7 +1391,7 @@ const plugin = definePlugin({
|
||||
if (!caseNumber) return null;
|
||||
const apiBase = await resolveApiBase(ctx, companyIdOf(params));
|
||||
try {
|
||||
const resp = await ctx.http.fetch(
|
||||
const resp = await fetchLegalApi(
|
||||
`${apiBase}/api/cases/${encodeURIComponent(caseNumber)}/legal-arguments`,
|
||||
);
|
||||
if (!resp.ok) {
|
||||
@@ -1420,7 +1428,7 @@ const plugin = definePlugin({
|
||||
if (!caseNumber) return [];
|
||||
const apiBase = await resolveApiBase(ctx, companyIdOf(params));
|
||||
try {
|
||||
const resp = await ctx.http.fetch(
|
||||
const resp = await fetchLegalApi(
|
||||
`${apiBase}/api/cases/${encodeURIComponent(caseNumber)}/precedents`,
|
||||
);
|
||||
if (!resp.ok) {
|
||||
@@ -1459,7 +1467,7 @@ const plugin = definePlugin({
|
||||
const url = new URL(`${apiBase}/api/missing-precedents`);
|
||||
url.searchParams.set("case_number", caseNumber);
|
||||
url.searchParams.set("status", "open");
|
||||
const resp = await ctx.http.fetch(url.toString());
|
||||
const resp = await fetchLegalApi(url.toString());
|
||||
if (!resp.ok) {
|
||||
ctx.logger.warn("legal-case-missing-precedents: API error", {
|
||||
caseNumber,
|
||||
@@ -1480,13 +1488,13 @@ const plugin = definePlugin({
|
||||
|
||||
ctx.data.register("legal-dashboard-stats", async () => {
|
||||
try {
|
||||
const cases = await api.listCases();
|
||||
const cases = await api.listCaseStatuses();
|
||||
const byStatus: Record<string, number> = {};
|
||||
let weekActivity = 0;
|
||||
const weekAgoMs = Date.now() - 7 * 24 * 60 * 60 * 1000;
|
||||
for (const c of cases) {
|
||||
byStatus[c.status] = (byStatus[c.status] ?? 0) + 1;
|
||||
const updated = (c as { updated_at?: string | null }).updated_at;
|
||||
const updated = c.updated_at;
|
||||
if (updated) {
|
||||
const t = Date.parse(updated);
|
||||
if (!Number.isNaN(t) && t >= weekAgoMs) weekActivity += 1;
|
||||
|
||||
Reference in New Issue
Block a user