@buyong/pi-devin 0.1.0 → 0.1.2

package/README.md

@@ -77,7 +77,7 @@ Running `/devin` in the TUI shows the following on one screen. Use ↑↓ to mov
 
 There are two toggles, both off by default. Changes apply to all sessions at once.
 
-- **Recommended models only**: `/model` shows only the models Devin marks as Recommended, plus Devin Fusion. Recommended models are variants with a fixed thinking level, such as `swe-2-high`, rather than families, so you cannot pick another level with `/thinking`. If your account has no recommended models, the full list is shown.
+- **Recommended models only**: `/model` shows only the models that have a variant Devin marks as Recommended, plus Devin Fusion. Devin marks single variants such as `swe-2-high`, but the list keeps the model itself (`swe-2`), so you still pick the thinking level with `/thinking`. The recommended level is not applied automatically. If your account has no recommended models, the full list is shown.
 - **Usage in status line**: the TUI footer shows the remaining daily and weekly quota as bars, plus this session's input and output tokens, like `devin day ▕█████████░▏98% week ▕█████████░▏98% · ↑263 ↓49`. A bar turns to the warning color at 40% or less and to the error color at 20% or less.
 
 Quota is not live. It is refreshed when you log in and when Pi checks the login right before sending a model request, so the usage of the message you just sent shows up after the next request. `/devin` and the status line send no network requests. Credits, per-request costs and usage history are not shown.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buyong/pi-devin",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "description": "Unofficial Pi provider for Devin accounts (OAuth)",
   "license": "MIT",

package/src/pi/devin-panel.ts

@@ -4,7 +4,7 @@ import type { PickerTheme } from "./fusion-picker.ts";
 import type { UsageLine } from "./usage.ts";
 
 export const PREFERENCE_ITEMS: readonly { key: keyof DevinPreferences; label: string; detail: string }[] = [
-  { key: "recommendedOnly", label: "Recommended models only", detail: "/model shows only recommended variants and Devin Fusion" },
+  { key: "recommendedOnly", label: "Recommended models only", detail: "/model shows only models with a recommended variant and Devin Fusion" },
   { key: "showUsageStatus", label: "Usage in status line", detail: "shows quota and session tokens in the footer" },
 ];
 const HELP = "↑↓ move · space/↵ toggle · esc close";

package/src/pi/devin-settings.ts

@@ -5,7 +5,7 @@ const SCHEMA_VERSION = 1;
 
 /** Display settings toggled by `/devin`. Both default to off and never change how models are used or requested. */
 export interface DevinPreferences {
-  /** Lists only the variants that the catalog marks as recommended. */
+  /** Lists only the models that have a variant the catalog marks as recommended. */
   recommendedOnly: boolean;
   /** Shows quota and session usage in the TUI status line. */
   showUsageStatus: boolean;

package/src/pi/messages.ts

@@ -44,7 +44,8 @@ export function toDevinTranscript(context: TranscriptContext, model: ModelInfo):
   const declarations = getCurrentTools(context.messages);
   if (declarations.length && !model.supportsToolCalls) throw new Error("This model does not support the current Pi tool declarations.");
   const tools = declarations.map((tool) => {
-    if (tool.constrainedSampling && (tool.constrainedSampling.type === "grammar" || tool.constrainedSampling.strict === "require")) {
+    // Grammar sampling is optional; like Pi's providers without grammar tools, send the JSON schema instead.
+    if (tool.constrainedSampling && tool.constrainedSampling.type === "json_schema" && tool.constrainedSampling.strict === "require") {
       throw new Error(`Devin does not support this tool's forced sampling format: ${tool.name}`);
     }
     return { name: tool.name, description: tool.description, jsonSchemaString: JSON.stringify(tool.parameters) };

package/src/pi/models.ts

@@ -35,7 +35,7 @@ export interface DevinModel extends Model<typeof DEVIN_API> {
 export interface ProjectionOptions {
   /** Saved Fusion choice. false (sidekick child Pi) creates no Fusion entry. */
   fusion?: FusionSelection | false;
-  /** Lists only variants marked as recommended. The Fusion entry is unaffected. */
+  /** Lists only models with a variant marked as recommended. Groups stay groups. The Fusion entry is unaffected. */
   recommendedOnly?: boolean;
   /** Also lists exact UIDs that a group already covers. Used only by the sidekick child Pi. */
   listsAllExactModels?: boolean;
@@ -186,25 +186,26 @@ export function effectiveFusion(projection: VariantProjection, requested: Fusion
 
 /**
  * Exact UIDs covered by a published group are hidden and chosen with `/thinking`. Their catalog configs are stored on the group model.
- * `recommendedOnly` lists only recommended variants by exact UID. Without any, it falls back to the group list.
+ * `recommendedOnly` keeps only groups and uncovered exact UIDs that hold a recommended variant, so `/thinking` still picks the UID.
+ * Without any recommended variant, it falls back to the default list.
  * `listsAllExactModels` is only for processes that pick exact UIDs directly, such as the sidekick child.
  */
 export function modelsFromProjection(projection: VariantProjection, credential: Credential, options: ProjectionOptions = {}): DevinModel[] {
   const models: DevinModel[] = [], names = groupDisplayNames(projection), ids = publicModelIDs(projection);
   const published = projection.groups.filter((group) => group.canPublish);
-  const recommended = projection.variants.filter((variant) => isUsable(variant) && variant.model.isRecommended);
+  const recommendedUIDs = new Set(projection.variants.filter((variant) => isUsable(variant) && variant.model.isRecommended).map((variant) => variant.model.id));
   // Fall back to the default projection so accounts without recommended flags never get an empty list.
-  const isRecommendedOnly = options.recommendedOnly === true && recommended.length > 0;
-  if (!isRecommendedOnly) {
-    for (const group of published) {
-      const model = modelDefinition(ids.groups.get(group.id)!, names.get(group.id)!, publishedVariants(group), group.mappings, credential);
-      if (group.variants.some((variant) => variant.model.isRecommended)) model.devin.recommended = true;
-      models.push(model);
-    }
+  const isRecommendedOnly = options.recommendedOnly === true && recommendedUIDs.size > 0;
+  const isListed = (uids: readonly string[]) => !isRecommendedOnly || uids.some((uid) => recommendedUIDs.has(uid));
+  for (const group of published) {
+    if (!isListed(Object.values(group.mappings))) continue;
+    const model = modelDefinition(ids.groups.get(group.id)!, names.get(group.id)!, publishedVariants(group), group.mappings, credential);
+    if (group.variants.some((variant) => variant.model.isRecommended)) model.devin.recommended = true;
+    models.push(model);
   }
   const covered = new Set(published.flatMap((group) => Object.values(group.mappings)));
-  const exact = isRecommendedOnly ? recommended
-    : projection.variants.filter((variant) => isUsable(variant) && (options.listsAllExactModels === true || !covered.has(variant.model.id)));
+  const exact = projection.variants.filter((variant) => isUsable(variant) && isListed([variant.model.id])
+    && (options.listsAllExactModels === true || !covered.has(variant.model.id)));
   const listedNames = new Set(models.map((model) => model.name));
   for (const variant of exact) {
     const name = listedNames.has(variant.model.name) ? `${variant.model.name} (${variant.model.id})` : variant.model.name;