@unbrained/pm-cli 2026.5.18 → 2026.5.24

package/packages/pm-calendar/extensions/calendar/index.js

@@ -23,7 +23,7 @@ const calendarFlags = [
   { long: "--assignee-filter", value_name: "value", value_type: "string", description: "Filter assignee presence." },
   { long: "--sprint", value_name: "value", value_type: "string", description: "Filter by sprint." },
   { long: "--release", value_name: "value", value_type: "string", description: "Filter by release." },
-  { long: "--include", value_name: "value", value_type: "string", description: "Include sources: deadlines|reminders|events|all." },
+  { long: "--include", value_name: "value", value_type: "string", description: "Include sources: deadlines|reminders|events|scheduled|all." },
   { long: "--recurrence-lookahead-days", value_name: "n", value_type: "string", description: "Bound open-ended recurrence lookahead days." },
   { long: "--recurrence-lookback-days", value_name: "n", value_type: "string", description: "Bound open-ended recurrence lookback days." },
   { long: "--occurrence-limit", value_name: "n", value_type: "string", description: "Cap generated occurrences per recurring event." },
@@ -36,8 +36,27 @@ function calendarCommand(name) {
     name,
     action: "calendar",
     description: "Show deadline, reminder, and scheduled event calendar views.",
+    arguments: [{ name: "view", required: false, description: "Calendar view: agenda|day|week|month." }],
     flags: [...calendarFlags],
-    run: async (context) => runCalendarPackage(context.options, context.global),
+    run: async (context) => {
+      // Extension flags are parsed loosely, so context.args still contains flag
+      // tokens (e.g. ["day", "--date", "+7d"]). Only the leading non-flag tokens
+      // are true positionals, so a positional view combined with --date/--from/etc.
+      // must not be mistaken for multiple positional views.
+      const firstFlagIndex = context.args.findIndex((arg) => arg.startsWith("-"));
+      const positionalArgs = firstFlagIndex === -1 ? context.args : context.args.slice(0, firstFlagIndex);
+      const positionalView = positionalArgs[0]?.trim();
+      if (positionalArgs.length > 1) {
+        throw new Error("Calendar accepts at most one positional view: agenda|day|week|month.");
+      }
+      return runCalendarPackage(
+        {
+          ...context.options,
+          ...(positionalView && context.options.view === undefined ? { view: positionalView } : {}),
+        },
+        context.global,
+      );
+    },
   };
 }
 

package/packages/pm-calendar/extensions/calendar/index.ts

@@ -29,7 +29,7 @@ const calendarFlags = [
   { long: "--assignee-filter", value_name: "value", value_type: "string", description: "Filter assignee presence." },
   { long: "--sprint", value_name: "value", value_type: "string", description: "Filter by sprint." },
   { long: "--release", value_name: "value", value_type: "string", description: "Filter by release." },
-  { long: "--include", value_name: "value", value_type: "string", description: "Include sources: deadlines|reminders|events|all." },
+  { long: "--include", value_name: "value", value_type: "string", description: "Include sources: deadlines|reminders|events|scheduled|all." },
   { long: "--recurrence-lookahead-days", value_name: "n", value_type: "string", description: "Bound open-ended recurrence lookahead days." },
   { long: "--recurrence-lookback-days", value_name: "n", value_type: "string", description: "Bound open-ended recurrence lookback days." },
   { long: "--occurrence-limit", value_name: "n", value_type: "string", description: "Cap generated occurrences per recurring event." },
@@ -42,8 +42,27 @@ function calendarCommand(name: "calendar" | "cal"): CommandDefinition {
     name,
     action: "calendar",
     description: "Show deadline, reminder, and scheduled event calendar views.",
+    arguments: [{ name: "view", required: false, description: "Calendar view: agenda|day|week|month." }],
     flags: [...calendarFlags],
-    run: async (context) => runCalendarPackage(context.options as CalendarOptions, context.global),
+    run: async (context) => {
+      // Extension flags are parsed loosely, so context.args still contains flag
+      // tokens (e.g. ["day", "--date", "+7d"]). Only the leading non-flag tokens
+      // are true positionals, so a positional view combined with --date/--from/etc.
+      // must not be mistaken for multiple positional views.
+      const firstFlagIndex = context.args.findIndex((arg) => arg.startsWith("-"));
+      const positionalArgs = firstFlagIndex === -1 ? context.args : context.args.slice(0, firstFlagIndex);
+      const positionalView = positionalArgs[0]?.trim();
+      if (positionalArgs.length > 1) {
+        throw new Error("Calendar accepts at most one positional view: agenda|day|week|month.");
+      }
+      return runCalendarPackage(
+        {
+          ...(context.options as CalendarOptions),
+          ...(positionalView && (context.options as CalendarOptions).view === undefined ? { view: positionalView } : {}),
+        },
+        context.global,
+      );
+    },
   };
 }
 

package/packages/pm-search-advanced/README.md

@@ -6,9 +6,13 @@ First-party package that restores optional advanced search surfaces in bare-core
 
 - Adds `pm search-advanced` with:
   - `--mode keyword|semantic|hybrid`
+  - `--semantic`, `--hybrid`
   - `--include-linked`
   - `--title-exact`
   - `--phrase-exact`
+  - `--type`, `--tag`, `--priority`
+  - `--deadline-before`, `--deadline-after`
+  - `--limit`, `--fields`, `--compact`, `--full`
 - Adds `pm reindex` with:
   - `--mode keyword|semantic|hybrid`
   - `--progress`
@@ -23,5 +27,9 @@ pm install search-advanced --project
 
 ```bash
 pm search-advanced "vector cache" --mode hybrid --limit 5 --json
+pm search-advanced --hybrid "vector cache" --limit 5 --json
+pm search-advanced "calendar package" --mode keyword --fields id,title,score --compact --json
 pm reindex --mode hybrid --progress --json
 ```
+
+Without `--mode`, `--semantic`, or `--hybrid`, `search-advanced` stays keyword-first for fast agent reads.

package/packages/pm-search-advanced/extensions/search-advanced/index.js

@@ -15,6 +15,16 @@ const searchAdvancedFlags = [
     value_type: "string",
     description: "Search mode override: keyword|semantic|hybrid.",
   },
+  {
+    long: "--semantic",
+    value_type: "boolean",
+    description: "Alias for --mode semantic.",
+  },
+  {
+    long: "--hybrid",
+    value_type: "boolean",
+    description: "Alias for --mode hybrid.",
+  },
   {
     long: "--include-linked",
     value_type: "boolean",
@@ -45,6 +55,70 @@ const searchAdvancedFlags = [
     value_type: "boolean",
     description: "Alias for --phrase-exact.",
   },
+  {
+    long: "--type",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by item type.",
+  },
+  {
+    long: "--tag",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by tag.",
+  },
+  {
+    long: "--priority",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by priority.",
+  },
+  {
+    long: "--deadline-before",
+    value_name: "date",
+    value_type: "string",
+    description: "Filter to items with deadlines before a date.",
+  },
+  {
+    long: "--deadline_before",
+    value_name: "date",
+    value_type: "string",
+    description: "Alias for --deadline-before.",
+  },
+  {
+    long: "--deadline-after",
+    value_name: "date",
+    value_type: "string",
+    description: "Filter to items with deadlines after a date.",
+  },
+  {
+    long: "--deadline_after",
+    value_name: "date",
+    value_type: "string",
+    description: "Alias for --deadline-after.",
+  },
+  {
+    long: "--limit",
+    value_name: "count",
+    value_type: "string",
+    description: "Limit the number of search results.",
+  },
+  {
+    long: "--fields",
+    value_name: "list",
+    value_type: "string",
+    description: "Return only selected result fields.",
+  },
+  {
+    long: "--compact",
+    value_type: "boolean",
+    description: "Return compact token-efficient search results.",
+  },
+  {
+    long: "--full",
+    value_type: "boolean",
+    description: "Return full search results.",
+  },
 ];
 
 const reindexFlags = [

package/packages/pm-search-advanced/extensions/search-advanced/index.ts

@@ -16,6 +16,16 @@ const searchAdvancedFlags = [
     value_type: "string",
     description: "Search mode override: keyword|semantic|hybrid.",
   },
+  {
+    long: "--semantic",
+    value_type: "boolean",
+    description: "Alias for --mode semantic.",
+  },
+  {
+    long: "--hybrid",
+    value_type: "boolean",
+    description: "Alias for --mode hybrid.",
+  },
   {
     long: "--include-linked",
     value_type: "boolean",
@@ -46,6 +56,70 @@ const searchAdvancedFlags = [
     value_type: "boolean",
     description: "Alias for --phrase-exact.",
   },
+  {
+    long: "--type",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by item type.",
+  },
+  {
+    long: "--tag",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by tag.",
+  },
+  {
+    long: "--priority",
+    value_name: "value",
+    value_type: "string",
+    description: "Filter by priority.",
+  },
+  {
+    long: "--deadline-before",
+    value_name: "date",
+    value_type: "string",
+    description: "Filter to items with deadlines before a date.",
+  },
+  {
+    long: "--deadline_before",
+    value_name: "date",
+    value_type: "string",
+    description: "Alias for --deadline-before.",
+  },
+  {
+    long: "--deadline-after",
+    value_name: "date",
+    value_type: "string",
+    description: "Filter to items with deadlines after a date.",
+  },
+  {
+    long: "--deadline_after",
+    value_name: "date",
+    value_type: "string",
+    description: "Alias for --deadline-after.",
+  },
+  {
+    long: "--limit",
+    value_name: "count",
+    value_type: "string",
+    description: "Limit the number of search results.",
+  },
+  {
+    long: "--fields",
+    value_name: "list",
+    value_type: "string",
+    description: "Return only selected result fields.",
+  },
+  {
+    long: "--compact",
+    value_type: "boolean",
+    description: "Return compact token-efficient search results.",
+  },
+  {
+    long: "--full",
+    value_type: "boolean",
+    description: "Return full search results.",
+  },
 ] as const;
 
 const reindexFlags = [

package/packages/pm-search-advanced/extensions/search-advanced/runtime.js

@@ -48,6 +48,9 @@ function readStringOption(options, key, aliases = []) {
   return undefined;
 }
 
+const BOOLEAN_TRUE_VALUES = new Set(["true", "1", "yes", "on"]);
+const BOOLEAN_FALSE_VALUES = new Set(["false", "0", "no", "off"]);
+
 function readBooleanOption(options, key, aliases = []) {
   const keys = [key, ...aliases];
   for (const candidate of keys) {
@@ -60,10 +63,10 @@ function readBooleanOption(options, key, aliases = []) {
     }
     if (typeof value === "string") {
       const normalized = value.trim().toLowerCase();
-      if (normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "on") {
+      if (BOOLEAN_TRUE_VALUES.has(normalized)) {
         return true;
       }
-      if (normalized === "false" || normalized === "0" || normalized === "no" || normalized === "off") {
+      if (BOOLEAN_FALSE_VALUES.has(normalized)) {
         return false;
       }
     }
@@ -71,24 +74,79 @@ function readBooleanOption(options, key, aliases = []) {
   return undefined;
 }
 
+const SEARCH_VALUE_FLAGS = new Set([
+  "--mode",
+  "--type",
+  "--tag",
+  "--priority",
+  "--deadline-before",
+  "--deadline_before",
+  "--deadline-after",
+  "--deadline_after",
+  "--limit",
+  "--fields",
+]);
+
+const SEARCH_BOOLEAN_FLAGS = new Set([
+  "--semantic",
+  "--hybrid",
+  "--include-linked",
+  "--include_linked",
+  "--title-exact",
+  "--title_exact",
+  "--phrase-exact",
+  "--phrase_exact",
+  "--compact",
+  "--full",
+  "--json",
+]);
+
+function stripSearchOptionTokens(args) {
+  const queryTokens = [];
+  for (let index = 0; index < args.length; index += 1) {
+    const token = args[index]?.trim() ?? "";
+    const equalsIndex = token.indexOf("=");
+    const flagName = equalsIndex > 0 ? token.slice(0, equalsIndex) : token;
+    if (SEARCH_VALUE_FLAGS.has(flagName)) {
+      if (equalsIndex < 0) {
+        index += 1;
+      }
+      continue;
+    }
+    if (SEARCH_BOOLEAN_FLAGS.has(flagName)) {
+      continue;
+    }
+    if (token.length > 0) {
+      queryTokens.push(token);
+    }
+  }
+  return queryTokens;
+}
+
 function resolveSearchQuery(args) {
-  const query = args
-    .map((value) => value.trim())
-    .filter((value) => value.length > 0)
-    .join(" ");
+  const query = stripSearchOptionTokens(args).join(" ");
   if (query.length === 0) {
     throw new PmCliError("Search query must not be empty", EXIT_CODE.USAGE);
   }
   return query;
 }
 
-function normalizeAdvancedSearchOptions(rawOptions) {
+function normalizeAdvancedSearchOptions(rawOptions, args) {
   const fields = readStringOption(rawOptions, "fields");
   const compactRequested = readBooleanOption(rawOptions, "compact") === true;
   const fullRequested = readBooleanOption(rawOptions, "full") === true;
   const defaultCompact = !compactRequested && !fullRequested && fields === undefined;
+  const explicitMode = readStringOption(rawOptions, "mode");
+  const argFlags = new Set(args.map((value) => value?.trim() ?? ""));
+  const mode =
+    explicitMode ??
+    (readBooleanOption(rawOptions, "semantic") === true || argFlags.has("--semantic")
+      ? "semantic"
+      : readBooleanOption(rawOptions, "hybrid") === true || argFlags.has("--hybrid")
+        ? "hybrid"
+        : "keyword");
   return {
-    mode: readStringOption(rawOptions, "mode"),
+    mode,
     includeLinked: readBooleanOption(rawOptions, "includeLinked", ["include_linked"]) === true ? true : undefined,
     titleExact: readBooleanOption(rawOptions, "titleExact", ["title_exact"]) === true ? true : undefined,
     phraseExact: readBooleanOption(rawOptions, "phraseExact", ["phrase_exact"]) === true ? true : undefined,
@@ -112,7 +170,7 @@ function normalizeReindexOptions(rawOptions) {
 }
 
 export async function runAdvancedSearchPackage(args, rawOptions, global) {
-  return runSearch(resolveSearchQuery(args), normalizeAdvancedSearchOptions(rawOptions), global);
+  return runSearch(resolveSearchQuery(args), normalizeAdvancedSearchOptions(rawOptions, args), global);
 }
 
 export async function runAdvancedReindexPackage(rawOptions, global) {

package/packages/pm-search-advanced/extensions/search-advanced/runtime.ts

@@ -65,6 +65,9 @@ function readStringOption(options: Record<string, unknown>, key: string, aliases
   return undefined;
 }
 
+const BOOLEAN_TRUE_VALUES = new Set(["true", "1", "yes", "on"]);
+const BOOLEAN_FALSE_VALUES = new Set(["false", "0", "no", "off"]);
+
 function readBooleanOption(options: Record<string, unknown>, key: string, aliases: string[] = []): boolean | undefined {
   const keys = [key, ...aliases];
   for (const candidate of keys) {
@@ -77,10 +80,10 @@ function readBooleanOption(options: Record<string, unknown>, key: string, aliase
     }
     if (typeof value === "string") {
       const normalized = value.trim().toLowerCase();
-      if (normalized === "true" || normalized === "1" || normalized === "yes" || normalized === "on") {
+      if (BOOLEAN_TRUE_VALUES.has(normalized)) {
         return true;
       }
-      if (normalized === "false" || normalized === "0" || normalized === "no" || normalized === "off") {
+      if (BOOLEAN_FALSE_VALUES.has(normalized)) {
         return false;
       }
     }
@@ -88,24 +91,79 @@ function readBooleanOption(options: Record<string, unknown>, key: string, aliase
   return undefined;
 }
 
+const SEARCH_VALUE_FLAGS = new Set([
+  "--mode",
+  "--type",
+  "--tag",
+  "--priority",
+  "--deadline-before",
+  "--deadline_before",
+  "--deadline-after",
+  "--deadline_after",
+  "--limit",
+  "--fields",
+]);
+
+const SEARCH_BOOLEAN_FLAGS = new Set([
+  "--semantic",
+  "--hybrid",
+  "--include-linked",
+  "--include_linked",
+  "--title-exact",
+  "--title_exact",
+  "--phrase-exact",
+  "--phrase_exact",
+  "--compact",
+  "--full",
+  "--json",
+]);
+
+function stripSearchOptionTokens(args: string[]): string[] {
+  const queryTokens: string[] = [];
+  for (let index = 0; index < args.length; index += 1) {
+    const token = args[index]?.trim() ?? "";
+    const equalsIndex = token.indexOf("=");
+    const flagName = equalsIndex > 0 ? token.slice(0, equalsIndex) : token;
+    if (SEARCH_VALUE_FLAGS.has(flagName)) {
+      if (equalsIndex < 0) {
+        index += 1;
+      }
+      continue;
+    }
+    if (SEARCH_BOOLEAN_FLAGS.has(flagName)) {
+      continue;
+    }
+    if (token.length > 0) {
+      queryTokens.push(token);
+    }
+  }
+  return queryTokens;
+}
+
 function resolveSearchQuery(args: string[]): string {
-  const query = args
-    .map((value) => value.trim())
-    .filter((value) => value.length > 0)
-    .join(" ");
+  const query = stripSearchOptionTokens(args).join(" ");
   if (query.length === 0) {
     throw new PmCliError("Search query must not be empty", EXIT_CODE.USAGE);
   }
   return query;
 }
 
-function normalizeAdvancedSearchOptions(rawOptions: Record<string, unknown>): SearchOptions {
+function normalizeAdvancedSearchOptions(rawOptions: Record<string, unknown>, args: string[]): SearchOptions {
   const fields = readStringOption(rawOptions, "fields");
   const compactRequested = readBooleanOption(rawOptions, "compact") === true;
   const fullRequested = readBooleanOption(rawOptions, "full") === true;
   const defaultCompact = !compactRequested && !fullRequested && fields === undefined;
+  const explicitMode = readStringOption(rawOptions, "mode");
+  const argFlags = new Set(args.map((value) => value?.trim() ?? ""));
+  const mode =
+    explicitMode ??
+    (readBooleanOption(rawOptions, "semantic") === true || argFlags.has("--semantic")
+      ? "semantic"
+      : readBooleanOption(rawOptions, "hybrid") === true || argFlags.has("--hybrid")
+        ? "hybrid"
+        : "keyword");
   return {
-    mode: readStringOption(rawOptions, "mode"),
+    mode,
     includeLinked: readBooleanOption(rawOptions, "includeLinked", ["include_linked"]) === true ? true : undefined,
     titleExact: readBooleanOption(rawOptions, "titleExact", ["title_exact"]) === true ? true : undefined,
     phraseExact: readBooleanOption(rawOptions, "phraseExact", ["phrase_exact"]) === true ? true : undefined,
@@ -133,7 +191,7 @@ export async function runAdvancedSearchPackage(
   rawOptions: Record<string, unknown>,
   global: GlobalOptions,
 ): Promise<SearchResult> {
-  return runSearch(resolveSearchQuery(args), normalizeAdvancedSearchOptions(rawOptions), global);
+  return runSearch(resolveSearchQuery(args), normalizeAdvancedSearchOptions(rawOptions, args), global);
 }
 
 export async function runAdvancedReindexPackage(