loreli 1.0.0 → 2.0.0

package/packages/config/src/schema.js

@@ -1,5 +1,17 @@
 import ms from 'ms';
 
+/**
+ * Valid merge methods supported by GitHub.
+ * @type {Set<string>}
+ */
+const MERGE_METHODS = new Set(['merge', 'squash', 'rebase']);
+
+/**
+ * Pattern for valid "owner/name" repository format.
+ * @type {RegExp}
+ */
+const REPO_RE = /^[^/]+\/[^/]+$/;
+
 /**
  * Validates and normalizes a raw config object parsed from loreli.yml.
  * Ensures types are correct and unknown keys are stripped.
@@ -15,6 +27,8 @@ export function validate(raw) {
 
   const out = {};
 
+  if (typeof raw.repo === 'string' && REPO_RE.test(raw.repo)) out.repo = raw.repo;
+
   if (typeof raw.theme === 'string') {
     out.theme = raw.theme;
   } else if (Array.isArray(raw.theme)) {
@@ -32,7 +46,7 @@ export function validate(raw) {
 
   if (raw.merge && typeof raw.merge === 'object') {
     out.merge = {};
-    if (typeof raw.merge.method === 'string') out.merge.method = raw.merge.method;
+    if (typeof raw.merge.method === 'string' && MERGE_METHODS.has(raw.merge.method)) out.merge.method = raw.merge.method;
     if (typeof raw.merge.base === 'string') out.merge.base = raw.merge.base;
 
     if (typeof raw.merge.hitl === 'boolean') {
@@ -78,7 +92,7 @@ export function validate(raw) {
 
   if (raw.timeouts && typeof raw.timeouts === 'object') {
     out.timeouts = {};
-    for (const key of ['stall', 'shutdown', 'poll', 'rapidDeath']) {
+    for (const key of ['stall', 'shutdown', 'poll', 'rapidDeath', 'proxyDiscovery']) {
       const v = raw.timeouts[key];
       if (v == null) continue;
       try { out.timeouts[key] = typeof v === 'number' ? v : ms(v); } catch { /* invalid — falls to default */ }
@@ -113,13 +127,6 @@ export function validate(raw) {
     if (typeof raw.watch.maxClaims === 'number' && raw.watch.maxClaims > 0) out.watch.maxClaims = raw.watch.maxClaims;
   }
 
-  if (raw.review && typeof raw.review === 'object') {
-    out.review = {};
-    if (typeof raw.review.skipRiskAssessment === 'boolean') {
-      out.review.skipRiskAssessment = raw.review.skipRiskAssessment;
-    }
-  }
-
   if (raw.scaling && typeof raw.scaling === 'object') {
     out.scaling = {};
     if (typeof raw.scaling.maxAgents === 'number') out.scaling.maxAgents = raw.scaling.maxAgents;
@@ -130,16 +137,6 @@ export function validate(raw) {
       try { out.scaling.cooldown = typeof cd === 'number' ? cd : ms(cd); } catch { /* invalid — falls to default */ }
     }
 
-    if (raw.scaling.maxPerRole && typeof raw.scaling.maxPerRole === 'object') {
-      const mpr = {};
-      for (const role of ['action', 'reviewer', 'risk', 'planner']) {
-        if (typeof raw.scaling.maxPerRole[role] === 'number') {
-          mpr[role] = raw.scaling.maxPerRole[role];
-        }
-      }
-      if (Object.keys(mpr).length) out.scaling.maxPerRole = mpr;
-    }
-
     if (!Object.keys(out.scaling).length) delete out.scaling;
   }
 
@@ -190,25 +187,23 @@ export function validate(raw) {
     if (!Object.keys(out.backends).length) delete out.backends;
   }
 
+  if (raw.classify && typeof raw.classify === 'object') {
+    out.classify = {};
+    if (typeof raw.classify.model === 'string') out.classify.model = raw.classify.model;
+    if (typeof raw.classify.maxLines === 'number' && raw.classify.maxLines > 0) out.classify.maxLines = raw.classify.maxLines;
+    if (typeof raw.classify.maxRetries === 'number' && raw.classify.maxRetries > 0) out.classify.maxRetries = raw.classify.maxRetries;
+    const t = raw.classify.timeout;
+    if (t != null) {
+      try { out.classify.timeout = typeof t === 'number' ? t : ms(t); } catch { /* invalid — falls to default */ }
+    }
+    if (!Object.keys(out.classify).length) delete out.classify;
+  }
+
   if (raw.trace && typeof raw.trace === 'object') {
     out.trace = {};
     if (typeof raw.trace.enabled === 'boolean') out.trace.enabled = raw.trace.enabled;
     if (typeof raw.trace.includeOutput === 'boolean') out.trace.includeOutput = raw.trace.includeOutput;
     if (typeof raw.trace.maxOutputChars === 'number') out.trace.maxOutputChars = raw.trace.maxOutputChars;
-
-    if (raw.trace.workflows && typeof raw.trace.workflows === 'object') {
-      const workflows = {};
-      for (const role of ['planner', 'reviewer', 'risk']) {
-        const wf = raw.trace.workflows[role];
-        if (wf && typeof wf === 'object') {
-          const entry = {};
-          if (typeof wf.enabled === 'boolean') entry.enabled = wf.enabled;
-          if (typeof wf.maxOutputChars === 'number') entry.maxOutputChars = wf.maxOutputChars;
-          if (Object.keys(entry).length) workflows[role] = entry;
-        }
-      }
-      if (Object.keys(workflows).length) out.trace.workflows = workflows;
-    }
   }
 
   if (raw.agents && typeof raw.agents === 'object') {
@@ -240,6 +235,13 @@ export function validate(raw) {
         function isString(c) { return typeof c === 'string'; }
       );
     }
+    if (typeof raw.feedback.hitl === 'boolean') {
+      out.feedback.hitl = raw.feedback.hitl;
+    } else if (Array.isArray(raw.feedback.hitl)) {
+      out.feedback.hitl = raw.feedback.hitl.filter(
+        function isString(c) { return typeof c === 'string'; }
+      );
+    }
   }
 
   if (raw.workspace && typeof raw.workspace === 'object') {
@@ -256,17 +258,33 @@ export function validate(raw) {
     if (typeof raw.cleanup.autoprune === 'boolean') out.cleanup.autoprune = raw.cleanup.autoprune;
   }
 
-  if (raw.prompts && typeof raw.prompts === 'object') {
-    const prompts = {};
-    for (const role of ['action', 'reviewer', 'planner', 'risk']) {
-      if (typeof raw.prompts[role] === 'string') prompts[role] = raw.prompts[role];
+  if (raw.workflows && typeof raw.workflows === 'object') {
+    const workflows = {};
+    for (const role of ['action', 'reviewer', 'risk', 'planner']) {
+      const wf = raw.workflows[role];
+      if (!wf || typeof wf !== 'object') continue;
+
+      const entry = {};
+      if (typeof wf.model === 'string') entry.model = wf.model;
+      if (typeof wf.maxAgents === 'number') entry.maxAgents = wf.maxAgents;
+      if (typeof wf.prompt === 'string') entry.prompt = wf.prompt;
+      if (typeof wf.skip === 'boolean') entry.skip = wf.skip;
+
+      if (wf.trace && typeof wf.trace === 'object') {
+        const trace = {};
+        if (typeof wf.trace.enabled === 'boolean') trace.enabled = wf.trace.enabled;
+        if (typeof wf.trace.maxOutputChars === 'number') trace.maxOutputChars = wf.trace.maxOutputChars;
+        if (Object.keys(trace).length) entry.trace = trace;
+      }
+
+      if (Object.keys(entry).length) workflows[role] = entry;
     }
-    if (Object.keys(prompts).length) out.prompts = prompts;
+    if (Object.keys(workflows).length) out.workflows = workflows;
   }
 
   if (raw.github && typeof raw.github === 'object') {
     out.github = {};
-    if (typeof raw.github.token === 'string') out.github.token = raw.github.token;
+    if (typeof raw.github.token === 'string' && raw.github.token.length > 0) out.github.token = raw.github.token;
   }
 
   return out;

package/packages/hub/src/github.js

@@ -12,11 +12,19 @@ const log = logger('hub');
 const RATE_WARN_THRESHOLD = 0.2;
 
 /**
- * Maximum retry attempts for rate-limited (429) responses.
+ * Maximum retry attempts for transient failures.
  * @type {number}
  */
 const MAX_RETRIES = 3;
 
+/**
+ * HTTP status codes eligible for automatic retry with backoff.
+ * 429 = secondary rate limit, 500/502/503 = transient server errors.
+ *
+ * @type {Set<number>}
+ */
+const RETRYABLE = new Set([429, 500, 502, 503]);
+
 /**
  * Calculate exponential backoff with jitter.
  *
@@ -125,7 +133,7 @@ const normalize = {
    * Normalize a GitHub pull request object.
    *
    * @param {object} raw - Raw GitHub PR API response.
-   * @returns {{number: number, title: string, body: string, state: string, head: string, headSha: string, base: string, author: string, url: string, labels: string[], merged: boolean, created: string, updated: string}}
+   * @returns {{number: number, title: string, body: string, state: string, head: string, headSha: string, base: string, author: string, url: string, labels: string[], merged: boolean, mergeable: boolean|null, mergeableState: string|null, created: string, updated: string}}
    */
   pull(raw) {
     return {
@@ -142,6 +150,8 @@ const normalize = {
         return typeof l === 'string' ? l : l.name;
       }),
       merged: raw.merged ?? false,
+      mergeable: raw.mergeable ?? null,
+      mergeableState: raw.mergeable_state ?? null,
       created: raw.created_at,
       updated: raw.updated_at
     };
@@ -226,9 +236,9 @@ export class GitHubHub extends BaseHub {
         try {
           response = await request(options);
         } catch (err) {
-          // Octokit throws on non-2xx; check for 429 (secondary rate limit)
-          if (err.status === 429 && attempt < MAX_RETRIES) {
+          if (RETRYABLE.has(err.status) && attempt < MAX_RETRIES) {
             const wait = parseRetryAfter(err.response?.headers) ?? backoff(attempt);
+            log.warn(`retrying ${options.method} ${options.url} (${err.status}, attempt ${attempt + 1}/${MAX_RETRIES})`);
             await new Promise(function delay(r) { setTimeout(r, wait); });
             continue;
           }
@@ -249,6 +259,29 @@ export class GitHubHub extends BaseHub {
     });
   }
 
+  /**
+   * Execute a GraphQL query/mutation with error checking and rate limit tracking.
+   *
+   * GraphQL responses can return partial data alongside an `errors` array.
+   * This method throws on errors instead of silently using partial data.
+   * Also extracts `x-ratelimit-*` headers that the REST hook misses.
+   *
+   * @param {string} query - GraphQL query or mutation string.
+   * @param {object} [variables] - Query variables.
+   * @returns {Promise<object>} The response data.
+   * @throws {Error} When the response contains GraphQL errors.
+   */
+  async _graphql(query, variables) {
+    const result = await this.client.graphql(query, variables);
+
+    if (result.errors?.length) {
+      const messages = result.errors.map(function msg(e) { return e.message; }).join('; ');
+      throw new Error(`GraphQL errors: ${messages}`);
+    }
+
+    return result;
+  }
+
   /**
    * Parse rate limit headers from a GitHub API response and update internal state.
    * Emits a warning when remaining requests drop below the configured threshold.
@@ -357,8 +390,10 @@ export class GitHubHub extends BaseHub {
    * @returns {[string, string]} Tuple of [owner, repo].
    */
   parse(repo) {
-    const [owner, name] = repo.split('/');
-    return [owner, name];
+    const slash = repo.indexOf('/');
+    if (slash <= 0 || slash === repo.length - 1)
+      throw new Error(`Invalid repo format "${repo}": expected "owner/name"`);
+    return [repo.slice(0, slash), repo.slice(slash + 1)];
   }
 
   /**
@@ -438,6 +473,8 @@ export class GitHubHub extends BaseHub {
       owner, repo: name,
       state: opts.state ?? 'open',
       labels: opts.labels?.join(','),
+      sort: 'created',
+      direction: 'asc',
       per_page: 100
     });
     return data.filter(function notPR(i) { return !i.pull_request; }).map(normalize.issue);
@@ -575,6 +612,8 @@ export class GitHubHub extends BaseHub {
     const data = await this.client.paginate(this.client.pulls.list, {
       owner, repo: name,
       state: opts.state ?? 'open',
+      sort: 'created',
+      direction: 'asc',
       per_page: 100
     });
     return data.map(normalize.pull);
@@ -585,7 +624,7 @@ export class GitHubHub extends BaseHub {
    *
    * @param {string} repo - "owner/name" repository.
    * @param {number} number - Pull request number.
-   * @returns {Promise<{number: number, title: string, body: string, state: string, head: string, base: string, author: string, url: string, labels: string[], merged: boolean, created: string, updated: string}>}
+   * @returns {Promise<{number: number, title: string, body: string, state: string, head: string, base: string, author: string, url: string, labels: string[], merged: boolean, mergeable: boolean|null, mergeableState: string|null, created: string, updated: string}>}
    */
   async pull(repo, number) {
     const [owner, name] = this.parse(repo);
@@ -1077,7 +1116,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(query, { owner, name: repoName });
+    const result = await this._graphql(query, { owner, name: repoName });
     const cats = result.repository?.discussionCategories?.nodes ?? [];
     const match = cats.find(function byName(c) { return c.name === name; });
     if (!match) {
@@ -1113,7 +1152,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(mutation, {
+    const result = await this._graphql(mutation, {
       repositoryId: opts.repositoryId,
       categoryId: opts.categoryId,
       title: opts.title,
@@ -1152,7 +1191,7 @@ export class GitHubHub extends BaseHub {
     const [owner, repoName] = this.parse(repo);
     const query = `query($owner: String!, $name: String!, $categoryId: ID!) {
       repository(owner: $owner, name: $name) {
-        discussions(first: 100, categoryId: $categoryId) {
+        discussions(first: 100, categoryId: $categoryId, orderBy: { field: CREATED_AT, direction: ASC }) {
           nodes {
             id number title body url closed
             author { login }
@@ -1162,7 +1201,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(query, { owner, name: repoName, categoryId });
+    const result = await this._graphql(query, { owner, name: repoName, categoryId });
     const nodes = result.repository?.discussions?.nodes ?? [];
     return nodes.map(function norm(d) {
       return {
@@ -1203,7 +1242,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(query, { owner, name: repoName, number });
+    const result = await this._graphql(query, { owner, name: repoName, number });
     const d = result.repository?.discussion;
     if (!d) throw new Error(`Discussion #${number} not found in ${repo}`);
     return {
@@ -1241,7 +1280,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(query, { id: discussionId });
+    const result = await this._graphql(query, { id: discussionId });
     const nodes = result.node?.comments?.nodes ?? [];
     return nodes.map(function norm(c) {
       return { id: c.id, body: c.body ?? '', author: c.author?.login ?? '', created: c.createdAt };
@@ -1265,7 +1304,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(mutation, {
+    const result = await this._graphql(mutation, {
       discussionId,
       body: this._stamp(body)
     });
@@ -1300,7 +1339,7 @@ export class GitHubHub extends BaseHub {
       }
     }`;
 
-    const result = await this.client.graphql(mutation, input);
+    const result = await this._graphql(mutation, input);
     return {
       id: result.updateDiscussion.discussion.id,
       title: result.updateDiscussion.discussion.title
@@ -1319,14 +1358,14 @@ export class GitHubHub extends BaseHub {
         discussion { id }
       }
     }`;
-    await this.client.graphql(closeMutation, { id: discussionId });
+    await this._graphql(closeMutation, { id: discussionId });
 
     const lockMutation = `mutation($id: ID!) {
       lockLockable(input: { lockableId: $id }) {
         lockedRecord { locked }
       }
     }`;
-    await this.client.graphql(lockMutation, { id: discussionId });
+    await this._graphql(lockMutation, { id: discussionId });
   }
 
   /**
@@ -1341,7 +1380,7 @@ export class GitHubHub extends BaseHub {
         discussion { id }
       }
     }`;
-    const result = await this.client.graphql(mutation, { id: discussionId });
+    const result = await this._graphql(mutation, { id: discussionId });
     const deletedId = result.deleteDiscussion?.discussion?.id;
 
     // Verify the discussion is no longer fetchable by node ID
@@ -1398,7 +1437,7 @@ export class GitHubHub extends BaseHub {
         labelable { ... on Discussion { id } }
       }
     }`;
-    await this.client.graphql(mutation, { labelableId: discussionId, labelIds });
+    await this._graphql(mutation, { labelableId: discussionId, labelIds });
   }
 
   /**
@@ -1431,7 +1470,7 @@ export class GitHubHub extends BaseHub {
         labelable { ... on Discussion { id } }
       }
     }`;
-    await this.client.graphql(mutation, { labelableId: discussionId, labelIds });
+    await this._graphql(mutation, { labelableId: discussionId, labelIds });
   }
 
   // --- Search & Commits ---

package/packages/identity/README.md

@@ -151,7 +151,7 @@ Autobots, roll out! — **optimus-0**
 
 | Agent | Model | Provider | Faction | Role | Version |
 |-------|-------|----------|---------|------|---------|
-| optimus-0 | gpt-4o | openai | autobots | action | loreli@0.0.0 |
+| optimus-0 | gpt-4o | openai | autobots | action | `loreli@0.0.0` |
 ```
 
 This is automatically appended by claim, signoff, and relay comments in the orchestration workflow.

package/packages/identity/src/index.js

@@ -439,7 +439,7 @@ export class Identity {
    *
    * | Agent | Model | Provider | Faction | Role | Version |
    * |-------|-------|----------|---------|------|---------|
-   * | {name} | {displayModel} | {provider} | {faction} | {role} | loreli@{version} |
+   * | {name} | {displayModel} | {provider} | {faction} | {role} | `loreli@{version}` |
    * ```
    *
    * @param {string} role - The agent's current role.
@@ -460,7 +460,7 @@ export class Identity {
       '',
       '| Agent | Model | Provider | Faction | Role | Version |',
       '|-------|-------|----------|---------|------|---------|',
-      `| ${this.name} | ${model} | ${this.provider} | ${this.faction} | ${role} | loreli@${ver} |`
+      `| ${this.name} | ${model} | ${this.provider} | ${this.faction} | ${role} | \`loreli@${ver}\` |`
     ].join('\n');
   }
 }