Merge branch 'main' into evan/inshellisense

package.json

@@ -24,6 +24,7 @@
         "@table-nav/react": "^0.0.7",
         "@tanstack/match-sorter-utils": "^8.8.4",
         "@tanstack/react-table": "^8.10.3",
+        "@withfig/autocomplete": "^2.652.3",
         "autobind-decorator": "^2.4.0",
         "base64-js": "^1.5.1",
         "classnames": "^2.3.1",
@@ -79,6 +80,7 @@
         "@types/throttle-debounce": "^5.0.1",
         "@types/uuid": "^9.0.7",
         "@types/webpack-env": "^1.18.3",
+        "@withfig/autocomplete-types": "^1.30.0",
         "babel-loader": "^9.1.3",
         "babel-plugin-jsx-control-statements": "^4.1.2",
         "copy-webpack-plugin": "^12.0.0",

public/themes/light.css

@@ -9,8 +9,8 @@
     --app-accent-color: rgb(75, 166, 57);
     --app-accent-bg-color: rgba(75, 166, 57, 0.2);
     --app-text-color: rgb(0, 0, 0);
-    --app-text-primary-color: rgb(0, 0, 0, 0.9);
-    --app-text-secondary-color: rgb(0, 0, 0, 0.7);
+    --app-text-primary-color: rgb(23, 23, 23);
+    --app-text-secondary-color: rgb(76, 76, 76);
     --app-border-color: rgb(139 145 138);
     --app-panel-bg-color: rgb(224, 224, 224);
     --app-panel-bg-color-dev: rgb(224, 224, 224);

src/app/appconst.ts

@@ -68,3 +68,4 @@ export const ErrorCode_InvalidCwd = "ERRCWD";
 export const InputAuxView_History = "history";
 export const InputAuxView_Info = "info";
 export const InputAuxView_AIChat = "aichat";
+export const InputAuxView_Suggestions = "suggestions";

src/app/clientsettings/clientsettings.tsx

@@ -11,9 +11,9 @@ import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "@/commo
 import { commandRtnHandler, isBlank } from "@/util/util";
 import { getTermThemes } from "@/util/themeutil";
 import * as appconst from "@/app/appconst";
+import { MainView } from "@/common/elements/mainview";
 
 import "./clientsettings.less";
-import { MainView } from "../common/elements/mainview";
 
 class ClientSettingsKeybindings extends React.Component<{}, {}> {
     componentDidMount() {
@@ -110,6 +110,12 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
         GlobalModel.getElectronApi().changeAutoUpdate(val);
     }
 
+    @boundMethod
+    handleChangeAutocompleteEnabled(val: boolean): void {
+        const prtn: Promise<CommandRtnType> = GlobalCommandRunner.setAutocompleteEnabled(val);
+        commandRtnHandler(prtn, this.errorMessage);
+    }
+
     getFontSizes(): DropdownItem[] {
         const availableFontSizes: DropdownItem[] = [];
         for (let s = appconst.MinFontSize; s <= appconst.MaxFontSize; s++) {
@@ -354,6 +360,15 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
                             />
                         </div>
                     </div>
+                    <div className="settings-field">
+                        <div className="settings-label">Command Autocomplete</div>
+                        <div className="settings-input">
+                            <Toggle
+                                checked={cdata.clientopts.autocompleteenabled ?? false}
+                                onChange={this.handleChangeAutocompleteEnabled}
+                            />
+                        </div>
+                    </div>
                     <SettingsError errorMessage={this.errorMessage} />
                 </div>
             </MainView>

src/app/workspace/cmdinput/aichat.tsx

@@ -92,7 +92,7 @@ class AIChat extends React.Component<{}, {}> {
     }
 
     submitChatMessage(messageStr: string) {
-        const curLine = GlobalModel.inputModel.getCurLine();
+        const curLine = GlobalModel.inputModel.curLine;
         const prtn = GlobalModel.submitChatInfoCommand(messageStr, curLine, false);
         prtn.then((rtn) => {
             if (!rtn.success) {

src/app/workspace/cmdinput/auxview.tsx

@@ -4,47 +4,45 @@
 import * as React from "react";
 import cn from "classnames";
 import { If } from "tsx-control-statements/components";
+import { observer } from "mobx-react";
 
 import "./auxview.less";
 
-export class AuxiliaryCmdView extends React.Component<
-    {
-        title: string;
-        className?: string;
-        iconClass?: string;
-        titleBarContents?: React.ReactElement[];
-        children?: React.ReactNode;
-        onClose?: React.MouseEventHandler<HTMLDivElement>;
-    },
-    {}
-> {
-    render() {
-        const { title, className, iconClass, titleBarContents, children, onClose } = this.props;
+interface AuxiliaryCmdViewProps {
+    title: string;
+    className?: string;
+    iconClass?: string;
+    titleBarContents?: React.ReactElement[];
+    children?: React.ReactNode;
+    onClose?: React.MouseEventHandler<HTMLDivElement>;
+}
 
-        return (
-            <div className={cn("auxview", className)}>
-                <div className="auxview-titlebar">
-                    <If condition={iconClass != null}>
-                        <div className="title-icon">
-                            <i className={iconClass} />
-                        </div>
-                    </If>
-                    <div className="title-string">{title}</div>
+export const AuxiliaryCmdView: React.FC<AuxiliaryCmdViewProps> = observer((props) => {
+    const { title, className, iconClass, titleBarContents, children, onClose } = props;
 
-                    <If condition={titleBarContents != null}>{titleBarContents}</If>
+    return (
+        <div className={cn("auxview", className)}>
+            <div className="auxview-titlebar">
+                <If condition={iconClass != null}>
+                    <div className="title-icon">
+                        <i className={iconClass} />
+                    </div>
+                </If>
+                <div className="title-string">{title}</div>
 
-                    <div className="flex-spacer"></div>
+                <If condition={titleBarContents != null}>{titleBarContents}</If>
 
-                    <If condition={onClose != null}>
-                        <div className="close-button" title="Close (ESC)" onClick={onClose}>
-                            <i className="fa-sharp fa-solid fa-xmark-large" />
-                        </div>
-                    </If>
-                </div>
-                <If condition={children != null}>
-                    <div className="auxview-content">{children}</div>
+                <div className="flex-spacer"></div>
+
+                <If condition={onClose != null}>
+                    <div className="close-button" title="Close (ESC)" onClick={onClose}>
+                        <i className="fa-sharp fa-solid fa-xmark-large" />
+                    </div>
                 </If>
             </div>
-        );
-    }
-}
+            <If condition={children != null}>
+                <div className="auxview-content">{children}</div>
+            </If>
+        </div>
+    );
+});

src/app/workspace/cmdinput/cmdinput.less

@@ -14,7 +14,8 @@
     // TODO: use a generic selector for this
     &.has-aichat,
     &.has-history,
-    &.has-info {
+    &.has-info,
+    &.has-suggestions {
         .base-cmdinput {
             border-top: 1px solid var(--app-border-color);
         }
@@ -109,9 +110,11 @@
                 }
             }
 
-            textarea {
-                color: var(--app-text-primary-color);
-                background-color: var(--app-bg-color);
+            .textarea,
+            .textarea-ghost {
+                position: absolute;
+                top: 0;
+                left: 0;
                 padding: var(--termpad) 0;
                 resize: none;
                 overflow: auto;
@@ -119,10 +122,21 @@
                 font-family: var(--termfontfamily);
                 line-height: var(--termlineheight);
                 font-size: var(--termfontsize);
+                background-color: transparent;
                 border: none;
                 box-shadow: none;
             }
 
+            .textarea {
+                color: var(--app-text-primary-color);
+                z-index: 2;
+            }
+
+            .textarea-ghost {
+                color: var(--app-text-secondary-color);
+                z-index: 1;
+            }
+
             input.history-input {
                 border: 0;
                 padding: 0;

src/app/workspace/cmdinput/cmdinput.tsx

@@ -19,6 +19,7 @@ import { CenteredIcon, RotateIcon } from "@/common/icons/icons";
 import { AIChat } from "./aichat";
 import * as util from "@/util/util";
 import * as appconst from "@/app/appconst";
+import { SuggestionView } from "./suggestionview";
 
 import "./cmdinput.less";
 
@@ -181,6 +182,7 @@ class CmdInput extends React.Component<{}, {}> {
                 hidePrompt = true;
             }
         }
+
         return (
             <div ref={this.cmdInputRef} className={cn("cmd-input", hasOpenView, { active: focusVal })}>
                 <Choose>
@@ -195,6 +197,9 @@ class CmdInput extends React.Component<{}, {}> {
                     <When condition={openView === appconst.InputAuxView_Info}>
                         <InfoMsg key="infomsg" />
                     </When>
+                    <When condition={openView === appconst.InputAuxView_Suggestions}>
+                        <SuggestionView />
+                    </When>
                 </Choose>
                 <If condition={remote && remote.status != "connected"}>
                     <div className="remote-status-warning">

src/app/workspace/cmdinput/historyinfo.less

@@ -11,7 +11,6 @@
         .history-clickable-opt {
             cursor: pointer;
             white-space: nowrap;
-            cursor: pointer;
 
             &:hover {
                 color: var(--app-text-primary-color);

src/app/workspace/cmdinput/historyinfo.tsx

@@ -225,7 +225,7 @@ class HistoryInfo extends React.Component<{}, {}> {
     render() {
         const inputModel = GlobalModel.inputModel;
         const selItem = inputModel.getHistorySelectedItem();
-        const hitems = inputModel.getFilteredHistoryItems().slice().reverse();
+        const hitems = inputModel.filteredHistoryItems.slice().reverse();
         const opts = inputModel.historyQueryOpts.get();
         let hitem: HistoryItem = null;
         let snames: Record<string, string> = {};

src/app/workspace/cmdinput/suggestionview.less

@@ -0,0 +1,25 @@
+.suggestions-view .auxview-content {
+    display: flex;
+    flex-direction: column;
+    min-height: 1em;
+    .suggestion-item {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        cursor: pointer;
+        border-radius: 5px;
+
+        &:hover {
+            background-color: var(--table-tr-hover-bg-color);
+        }
+
+        &.is-selected {
+            font-weight: bold;
+            color: var(--app-text-primary-color);
+            background-color: var(--table-tr-selected-bg-color);
+            &:hover {
+                background-color: var(--table-tr-selected-hover-bg-color);
+            }
+        }
+    }
+}

src/app/workspace/cmdinput/suggestionview.tsx

@@ -0,0 +1,75 @@
+import { SuggestionBlob } from "@/autocomplete/runtime/model";
+import { AuxiliaryCmdView } from "./auxview";
+import { GlobalModel } from "@/models";
+import cn from "classnames";
+import React, { useEffect } from "react";
+import { observer } from "mobx-react";
+import { If } from "tsx-control-statements/components";
+
+import "./suggestionview.less";
+
+export const SuggestionView: React.FC = observer(() => {
+    const [selectedSuggestion, setSelectedSuggestion] = React.useState<number>(0);
+    useEffect(() => {
+        const keybindManager = GlobalModel.keybindManager;
+
+        keybindManager.registerKeybinding("pane", "aichat", "generic:confirm", (waveEvent) => {
+            setSuggestion(selectedSuggestion);
+            return true;
+        });
+        keybindManager.registerKeybinding("pane", "aichat", "generic:cancel", (waveEvent) => {
+            closeView();
+            return true;
+        });
+        keybindManager.registerKeybinding("pane", "aichat", "generic:selectAbove", (waveEvent) => {
+            setSelectedSuggestion(Math.max(0, selectedSuggestion - 1));
+            return true;
+        });
+        keybindManager.registerKeybinding("pane", "aichat", "generic:selectBelow", (waveEvent) => {
+            setSelectedSuggestion(Math.min(suggestions?.suggestions.length - 1, selectedSuggestion + 1));
+            return true;
+        });
+        keybindManager.registerKeybinding("pane", "aichat", "generic:tab", (waveEvent) => {
+            setSelectedSuggestion(Math.min(suggestions?.suggestions.length - 1, selectedSuggestion + 1));
+            return true;
+        });
+
+        return () => {
+            GlobalModel.keybindManager.unregisterDomain("aichat");
+        };
+    });
+
+    const inputModel = GlobalModel.inputModel;
+    const autocompleteModel = GlobalModel.autocompleteModel;
+    const suggestions: SuggestionBlob = autocompleteModel.getSuggestions();
+
+    const closeView = () => {
+        inputModel.closeAuxView();
+    };
+
+    const setSuggestion = (idx: number) => {
+        autocompleteModel.applySuggestion(idx);
+        autocompleteModel.loadSuggestions();
+        closeView();
+    };
+
+    return (
+        <AuxiliaryCmdView title="Suggestions" className="suggestions-view" onClose={closeView}>
+            <If condition={!suggestions}>
+                <div className="no-suggestions">No suggestions</div>
+            </If>
+            {suggestions?.suggestions.map((suggestion, idx) => (
+                <div
+                    key={suggestion.name}
+                    title={suggestion.description}
+                    className={cn("suggestion-item", { "is-selected": selectedSuggestion === idx })}
+                    onClick={() => {
+                        setSuggestion(idx);
+                    }}
+                >
+                    {suggestion.icon} {suggestion.name} {suggestion.description ? `- ${suggestion.description}` : ""}
+                </div>
+            ))}
+        </AuxiliaryCmdView>
+    );
+});

src/app/workspace/cmdinput/textareainput.tsx

@@ -11,6 +11,8 @@ import cn from "classnames";
 import { GlobalModel, GlobalCommandRunner, Screen } from "@/models";
 import { getMonoFontSize } from "@/util/textmeasure";
 import * as appconst from "@/app/appconst";
+import { Shell, getSuggestions } from "@/autocomplete";
+import { SuggestionBlob } from "@/autocomplete/runtime/model";
 
 type OV<T> = mobx.IObservableValue<T>;
 
@@ -38,7 +40,7 @@ function scrollDiv(div: any, amt: number) {
     div.scrollTo({ top: newScrollTop, behavior: "smooth" });
 }
 
-class HistoryKeybindings extends React.Component<{ inputObject: TextAreaInput }, {}> {
+class HistoryKeybindings extends React.Component<{}, {}> {
     componentDidMount(): void {
         if (GlobalModel.activeMainView != "session") {
             return;
@@ -100,39 +102,39 @@ class HistoryKeybindings extends React.Component<{ inputObject: TextAreaInput },
     }
 }
 
+const SuggestionsInfoMsg = (props: { suggestions: SuggestionBlob }) => {
+    const suggestions = props.suggestions.suggestions;
+    return (
+        <div className="cmd-input-info">
+            {suggestions.map((s) => (
+                <div key={s.name} className="cmd-input-info-item">
+                    {s.icon} {s.name}
+                </div>
+            ))}
+        </div>
+    );
+};
+
 class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }, {}> {
-    lastTab: boolean;
     curPress: string;
+    lastTab: boolean;
 
     componentDidMount() {
         if (GlobalModel.activeMainView != "session") {
             return;
         }
         const inputObject = this.props.inputObject;
-        this.lastTab = false;
         const keybindManager = GlobalModel.keybindManager;
         const inputModel = GlobalModel.inputModel;
         keybindManager.registerKeybinding("pane", "cmdinput", "cmdinput:autocomplete", (waveEvent) => {
-            const lastTab = this.lastTab;
-            this.lastTab = true;
             this.curPress = "tab";
-            const curLine = inputModel.getCurLine();
-            if (lastTab) {
-                GlobalModel.submitCommand(
-                    "_compgen",
-                    null,
-                    [curLine],
-                    { comppos: String(curLine.length), compshow: "1", nohist: "1" },
-                    true
-                );
+            if (this.lastTab) {
+                const curLine = inputModel.curLine;
+                if (curLine != "") {
+                    inputModel.setActiveAuxView(appconst.InputAuxView_Suggestions);
+                }
             } else {
-                GlobalModel.submitCommand(
-                    "_compgen",
-                    null,
-                    [curLine],
-                    { comppos: String(curLine.length), nohist: "1" },
-                    true
-                );
+                this.lastTab = true;
             }
             return true;
         });
@@ -203,6 +205,10 @@ class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }
             const rtn = inputObject.arrowDownPressed();
             return rtn;
         });
+        keybindManager.registerKeybinding("pane", "cmdinput", "generic:selectRight", (waveEvent) => {
+            inputObject.arrowRightPressed();
+            return true;
+        });
         keybindManager.registerKeybinding("pane", "cmdinput", "generic:selectPageAbove", (waveEvent) => {
             this.curPress = "historyupdown";
             inputObject.scrollPage(true);
@@ -240,9 +246,7 @@ class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }
 
 @mobxReact.observer
 class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: () => void }, {}> {
-    lastTab: boolean = false;
     lastHistoryUpDown: boolean = false;
-    lastTabCurLine: OV<string> = mobx.observable.box(null);
     lastFocusType: string = null;
     mainInputRef: React.RefObject<HTMLTextAreaElement> = React.createRef();
     historyInputRef: React.RefObject<HTMLInputElement> = React.createRef();
@@ -399,6 +403,11 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
         return true;
     }
 
+    @boundMethod
+    arrowRightPressed() {
+        GlobalModel.autocompleteModel.applyPrimarySuggestion();
+    }
+
     scrollPage(up: boolean) {
         const inputModel = GlobalModel.inputModel;
         const infoScroll = inputModel.hasScrollingInfoMsg();
@@ -562,7 +571,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
     render() {
         const model = GlobalModel;
         const inputModel = model.inputModel;
-        const curLine = inputModel.getCurLine();
+        const curLine = inputModel.curLine;
         let displayLines = 1;
         const numLines = curLine.split("\n").length;
         const maxCols = this.getTextAreaMaxCols();
@@ -605,6 +614,10 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
             }
         }
         const isHistoryFocused = auxViewFocused && inputModel.getActiveAuxView() == appconst.InputAuxView_History;
+
+        // Will be null if the feature is disabled
+        const primaryAutocompleteSuggestion = GlobalModel.autocompleteModel.getPrimarySuggestionCompletion();
+
         return (
             <div
                 className="textareainput-div control is-expanded"
@@ -612,15 +625,23 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
                 style={{ height: computedOuterHeight }}
             >
                 <If condition={!auxViewFocused}>
-                    <CmdInputKeybindings inputObject={this}></CmdInputKeybindings>
+                    <CmdInputKeybindings inputObject={this} />
                 </If>
                 <If condition={isHistoryFocused}>
-                    <HistoryKeybindings inputObject={this}></HistoryKeybindings>
+                    <HistoryKeybindings />
                 </If>
 
                 <If condition={!util.isBlank(shellType)}>
                     <div className="shelltag">{shellType}</div>
                 </If>
+                <If condition={primaryAutocompleteSuggestion}>
+                    <div
+                        className="textarea-ghost"
+                        style={{ height: computedInnerHeight, minHeight: computedInnerHeight, fontSize: termFontSize }}
+                    >
+                        {`${"\xa0".repeat(curLine.length)}${primaryAutocompleteSuggestion}`}
+                    </div>
+                </If>
                 <textarea
                     key="main"
                     ref={this.mainInputRef}

src/autocomplete/README.md

@@ -0,0 +1,3 @@
+# Autocomplete parser
+
+This is the autocomplete parser for Wave. Much of the runtime for this parser is forked from the [@microsoft/inshellisense project](https://github.com/microsoft/inshellisense). We've modified the exec code to proxy commands to the active `waveshell` instance. All suggestions, as with inshellisense, come from the [@withfig/autocomplete project](https://github.com/withfig/autocomplete). We will be supplementing these with some of our own autocomplete for our own `/slashcommands` and `metacommands`.

src/autocomplete/index.ts

@@ -0,0 +1,5 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+export * from "./runtime/runtime";
+export * from "./utils/shell";

src/autocomplete/runtime/generator.ts

@@ -0,0 +1,164 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Modified from https://github.com/microsoft/inshellisense/blob/main/src/runtime/generator.ts
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { GlobalModel } from "@/models";
+import log from "../utils/log";
+import { runTemplates } from "./template";
+import { buildExecuteShellCommand } from "./utils";
+
+const getGeneratorContext = async (cwd: string): Promise<Fig.GeneratorContext> => {
+    const resp = await GlobalModel.submitEphemeralCommand("eval", null, ["env"], null, false, {
+        expectsresponse: true,
+        overridecwd: cwd,
+        env: null,
+    });
+
+    const { stdout, stderr } = await GlobalModel.getEphemeralCommandOutput(resp);
+    if (stderr) {
+        log.debug({ msg: "failed to get environment variables", stderr });
+    }
+
+    const env = {};
+    stdout
+        .split("\n")
+        .filter((s) => s.length > 0)
+        .forEach((line) => {
+            const [key, value] = line.split("=");
+            env[key] = value;
+        });
+    return {
+        environmentVariables: env,
+        currentWorkingDirectory: cwd,
+        currentProcess: "", // TODO: define current process
+        sshPrefix: "", // deprecated, should be empty
+        isDangerous: false,
+        searchTerm: "", // TODO: define search term
+    };
+};
+
+let lastFirstToken = "";
+let lastFinalToken = "";
+let cachedSuggestions: Fig.Suggestion[] = [];
+
+// TODO: add support getQueryTerm
+export const runGenerator = async (
+    generator: Fig.Generator,
+    tokens: string[],
+    cwd: string
+): Promise<Fig.Suggestion[]> => {
+    const { script, postProcess, scriptTimeout, splitOn, custom, template, filterTemplateSuggestions, trigger } =
+        generator;
+
+    const newToken = tokens.at(-1) ?? "";
+
+    if (lastFirstToken == tokens.at(0) && trigger && cachedSuggestions.length > 0) {
+        log.debug("trigger", trigger);
+        if (typeof trigger === "string") {
+            if (!newToken?.includes(trigger)) {
+                log.debug("trigger string", newToken, trigger);
+                return cachedSuggestions;
+            }
+        } else if (typeof trigger === "function") {
+            log.debug("trigger function", "newToken:", newToken, "lastToken: ", lastFinalToken);
+            if (!trigger(newToken, lastFinalToken ?? "")) {
+                log.debug("trigger function false");
+                return cachedSuggestions;
+            } else {
+                log.debug("trigger function true");
+            }
+        } else {
+            switch (trigger.on) {
+                case "change": {
+                    log.debug("trigger change", newToken, lastFinalToken);
+                    if (lastFinalToken && newToken && lastFinalToken === newToken) {
+                        log.debug("trigger change false");
+                        return cachedSuggestions;
+                    } else {
+                        log.debug("trigger change true");
+                    }
+                    break;
+                }
+                case "match": {
+                    if (Array.isArray(trigger.string)) {
+                        log.debug("trigger match array", newToken, trigger.string);
+                        if (!trigger.string.some((t) => newToken === t)) {
+                            log.debug("trigger match false");
+                            return cachedSuggestions;
+                        } else {
+                            log.debug("trigger match true");
+                        }
+                    } else if (trigger.string !== newToken) {
+                        log.debug("trigger match single true", newToken, trigger.string);
+                        return cachedSuggestions;
+                    } else {
+                        log.debug("trigger match single false", newToken, trigger.string);
+                    }
+                    break;
+                }
+                case "threshold": {
+                    log.debug("trigger threshold", newToken, lastFinalToken, trigger.length);
+                    if (Math.abs(newToken.length - lastFinalToken.length) < trigger.length) {
+                        log.debug("trigger threshold false");
+                        return cachedSuggestions;
+                    } else {
+                        log.debug("trigger threshold true");
+                    }
+                    break;
+                }
+            }
+        }
+    } else if (lastFirstToken === tokens.at(0) && newToken && lastFinalToken === newToken) {
+        log.debug("lastToken === newToken", lastFinalToken, newToken);
+        return cachedSuggestions;
+    }
+    log.debug("lastToken !== newToken", lastFinalToken, newToken);
+
+    const executeShellCommand = buildExecuteShellCommand(scriptTimeout ?? 5000);
+    const suggestions = [];
+    lastFinalToken = tokens[-1];
+    lastFirstToken = tokens[0];
+    try {
+        if (script) {
+            const shellInput = typeof script === "function" ? script(tokens) : script;
+            const scriptOutput = Array.isArray(shellInput)
+                ? await executeShellCommand({ command: shellInput.at(0) ?? "", args: shellInput.slice(1), cwd })
+                : await executeShellCommand({ ...shellInput, cwd });
+
+            const scriptStdout = scriptOutput.stdout.trim();
+            const scriptStderr = scriptOutput.stderr.trim();
+            if (scriptStderr) {
+                log.debug("script error, skipping processing", scriptStderr);
+            } else if (postProcess) {
+                suggestions.push(...postProcess(scriptStdout, tokens));
+            } else if (splitOn) {
+                suggestions.push(...scriptStdout.split(splitOn).map((s) => ({ name: s })));
+            }
+        }
+
+        if (custom) {
+            log.debug("custom", custom);
+            const customSuggestions = await custom(tokens, executeShellCommand, await getGeneratorContext(cwd));
+            log.debug("customSuggestions", customSuggestions);
+            suggestions.push(...customSuggestions);
+        }
+
+        if (template != null) {
+            const templateSuggestions = await runTemplates(template, cwd);
+            if (filterTemplateSuggestions) {
+                suggestions.push(...filterTemplateSuggestions(templateSuggestions));
+            } else {
+                suggestions.push(...templateSuggestions);
+            }
+        }
+        cachedSuggestions = suggestions;
+        return suggestions;
+    } catch (e) {
+        const err = typeof e === "string" ? e : e instanceof Error ? e.message : e;
+        log.debug({ msg: "generator failed", err, script, splitOn, template });
+    }
+    return suggestions;
+};

src/autocomplete/runtime/model.ts

@@ -0,0 +1,21 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Modified from https://github.com/microsoft/inshellisense/blob/main/src/runtime/model.ts
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type Suggestion = {
+    name: string;
+    allNames: string[];
+    description?: string;
+    icon: string;
+    priority: number;
+    insertValue?: string;
+};
+
+export type SuggestionBlob = {
+    suggestions: Suggestion[];
+    argumentDescription?: string;
+    charactersToDrop?: number;
+};

src/autocomplete/runtime/parser.ts

@@ -0,0 +1,79 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Modified from https://github.com/microsoft/inshellisense/blob/main/src/runtime/parser.ts
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export type CommandToken = {
+    token: string;
+    complete: boolean;
+    isOption: boolean;
+    isPersistent?: boolean;
+    isPath?: boolean;
+    isPathComplete?: boolean;
+};
+
+const cmdDelim = /(\|\|)|(&&)|(;)|(\|)/;
+const spaceRegex = /\s/;
+
+export const parseCommand = (command: string): CommandToken[] => {
+    const lastCommand = command.split(cmdDelim).at(-1)?.trimStart();
+    return lastCommand ? lex(lastCommand) : [];
+};
+
+const lex = (command: string): CommandToken[] => {
+    const tokens: CommandToken[] = [];
+    let [readingQuotedString, readingFlag, readingCmd] = [false, false, false];
+    let readingIdx = 0;
+    let readingQuoteChar = "";
+
+    [...command].forEach((char, idx) => {
+        const reading = readingQuotedString || readingFlag || readingCmd;
+        if (!reading && (char === `'` || char === `"`)) {
+            [readingQuotedString, readingIdx, readingQuoteChar] = [true, idx, char];
+            return;
+        } else if (!reading && char === `-`) {
+            [readingFlag, readingIdx] = [true, idx];
+            return;
+        } else if (!reading && !spaceRegex.test(char)) {
+            [readingCmd, readingIdx] = [true, idx];
+            return;
+        }
+
+        if (readingQuotedString && char === readingQuoteChar && command.at(idx - 1) !== "\\") {
+            readingQuotedString = false;
+            const complete = idx + 1 < command.length && spaceRegex.test(command[idx + 1]);
+            tokens.push({
+                token: command.slice(readingIdx, idx + 1),
+                complete,
+                isOption: false,
+            });
+        } else if ((readingFlag && spaceRegex.test(char)) || char === "=") {
+            readingFlag = false;
+            tokens.push({
+                token: command.slice(readingIdx, idx),
+                complete: true,
+                isOption: true,
+            });
+        } else if (readingCmd && spaceRegex.test(char)) {
+            readingCmd = false;
+            tokens.push({
+                token: command.slice(readingIdx, idx),
+                complete: true,
+                isOption: false,
+            });
+        }
+    });
+
+    const reading = readingQuotedString || readingFlag || readingCmd;
+    if (reading) {
+        tokens.push({
+            token: command.slice(readingIdx),
+            complete: false,
+            isOption: readingFlag,
+        });
+    }
+
+    return tokens;
+};

src/autocomplete/runtime/runtime.ts

@@ -0,0 +1,451 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Modified from https://github.com/microsoft/inshellisense/blob/main/src/runtime/runtime.ts
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import speclist, {
+    diffVersionedCompletions as versionedSpeclist,
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+} from "@withfig/autocomplete/build/index";
+import { parseCommand, CommandToken } from "./parser";
+import { getArgDrivenRecommendation, getSubcommandDrivenRecommendation } from "./suggestion";
+import { SuggestionBlob } from "./model";
+import { buildExecuteShellCommand, resolveCwd } from "./utils";
+import { Shell } from "../utils/shell";
+import { getApi } from "@/models";
+import log from "../utils/log";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- recursive type, setting as any
+const specSet: any = {};
+const rootSpec: Fig.Spec = {
+    name: "root",
+    filterStrategy: "prefix",
+    subcommands: (speclist as string[])
+        .filter((s) => !s.includes("/") && !s.includes("@")) // filter out versioned commands and subcommands in subdirectories
+        .map((s) => {
+            return {
+                name: s,
+                loadSpec: s,
+            };
+        }),
+};
+
+const filepathSpec: Fig.Spec = {
+    name: "filepaths",
+    args: {
+        name: "filepaths",
+        isVariadic: true,
+        template: "filepaths",
+    },
+};
+
+(speclist as string[]).forEach((s) => {
+    let activeSet = specSet;
+    const specRoutes = s.split("/");
+    specRoutes.forEach((route, idx) => {
+        if (typeof activeSet !== "object") {
+            return;
+        }
+        if (idx === specRoutes.length - 1) {
+            const prefix = versionedSpeclist.includes(s) ? "/index.js" : `.js`;
+            activeSet[route] = `${s}${prefix}`;
+        } else {
+            activeSet[route] = activeSet[route] || {};
+            activeSet = activeSet[route];
+        }
+    });
+});
+
+const loadedSpecs: { [key: string]: Fig.Spec } = {};
+
+const loadSpec = async (cmd: CommandToken[]): Promise<Fig.Spec | undefined> => {
+    const rootToken = cmd.at(0);
+    if (!rootToken?.complete) {
+        log.debug("root token not complete");
+        return;
+    }
+
+    if (loadedSpecs[rootToken.token]) {
+        log.debug("loaded spec found");
+        return loadedSpecs[rootToken.token];
+    }
+    if (specSet[rootToken.token]) {
+        log.debug("loading spec");
+        const spec = (await import(`@withfig/autocomplete/build/${specSet[rootToken.token]}`)).default;
+        loadedSpecs[rootToken.token] = spec;
+        return spec;
+    } else {
+        log.debug("no spec found");
+        return;
+    }
+};
+
+// this load spec function should only be used for `loadSpec` on the fly as it is cacheless
+const lazyLoadSpec = async (key: string): Promise<Fig.Spec | undefined> => {
+    return (await import(`@withfig/autocomplete/build/${key}.js`)).default;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- will be implemented in below TODO
+const lazyLoadSpecLocation = async (location: Fig.SpecLocation): Promise<Fig.Spec | undefined> => {
+    return; //TODO: implement spec location loading
+};
+
+export const getSuggestions = async (cmd: string, cwd: string, shell: Shell): Promise<SuggestionBlob | undefined> => {
+    const activeCmd = parseCommand(cmd);
+    log.debug("activeCmd", activeCmd);
+    if (activeCmd.length === 0) {
+        return;
+    }
+
+    const spec = await loadSpec(activeCmd);
+    let result: SuggestionBlob | undefined = undefined;
+    const lastCommand = activeCmd.at(-1);
+    let charactersToDrop = lastCommand?.complete ? 0 : lastCommand?.token.length ?? 0;
+    log.debug("charactersToDrop", charactersToDrop);
+
+    if (spec) {
+        log.debug("spec found", spec);
+        const subcommand = getSubcommand(spec);
+        if (subcommand == null) return;
+        const { cwd: resolvedCwd, pathy, complete: pathyComplete } = await resolveCwd(lastCommand, cwd, shell);
+        if (pathy && lastCommand) {
+            lastCommand.isPath = true;
+            lastCommand.isPathComplete = pathyComplete;
+        }
+        result = await runSubcommand(activeCmd.slice(1), subcommand, resolvedCwd);
+
+        if (pathy) {
+            log.debug("pathy", pathy);
+            charactersToDrop = pathyComplete ? 0 : getApi().pathBaseName(lastCommand?.token ?? "").length;
+            log.debug("new charactersToDrop", charactersToDrop);
+        }
+    } else if (cmd.endsWith(" ")) {
+        // if the first token is complete and we don't have a spec, just return filepaths
+        log.debug("no spec found, first token complete, returning filepaths");
+        result = await runSubcommand(activeCmd, filepathSpec, cwd);
+    } else {
+        // if the first token is not complete, return root spec
+        log.debug("no spec found, first token not complete, returning root spec");
+        result = await runSubcommand(activeCmd, rootSpec, cwd);
+    }
+
+    if (result == null) return;
+    log.debug("result", result);
+    return { ...result, charactersToDrop };
+};
+
+const getPersistentOptions = (persistentOptions: Fig.Option[], options?: Fig.Option[]) => {
+    const persistentOptionNames = new Set(
+        persistentOptions.map((o) => (typeof o.name === "string" ? [o.name] : o.name)).flat()
+    );
+    return persistentOptions.concat(
+        (options ?? []).filter(
+            (o) =>
+                (typeof o.name == "string"
+                    ? !persistentOptionNames.has(o.name)
+                    : o.name.some((n) => !persistentOptionNames.has(n))) && o.isPersistent === true
+        )
+    );
+};
+
+// TODO: handle subcommands that are versioned
+const getSubcommand = (spec?: Fig.Spec): Fig.Subcommand | undefined => {
+    if (spec == null) return;
+    if (typeof spec === "function") {
+        const potentialSubcommand = spec();
+        if (Object.prototype.hasOwnProperty.call(potentialSubcommand, "name")) {
+            return potentialSubcommand as Fig.Subcommand;
+        }
+        return;
+    }
+    return spec;
+};
+
+const executeShellCommand = buildExecuteShellCommand(5000);
+
+const genSubcommand = async (command: string, parentCommand: Fig.Subcommand): Promise<Fig.Subcommand | undefined> => {
+    if (!parentCommand.subcommands || parentCommand.subcommands.length === 0) return;
+
+    const subcommandIdx = parentCommand.subcommands.findIndex((s) =>
+        Array.isArray(s.name) ? s.name.includes(command) : s.name === command
+    );
+
+    if (subcommandIdx === -1) return;
+    const subcommand = parentCommand.subcommands[subcommandIdx];
+
+    // this pulls in the spec from the load spec and overwrites the subcommand in the parent with the loaded spec.
+    // then it returns the subcommand and clears the loadSpec field so that it doesn't get called again
+    switch (typeof subcommand.loadSpec) {
+        case "function": {
+            const partSpec = await subcommand.loadSpec(command, executeShellCommand);
+            if (partSpec instanceof Array) {
+                const locationSpecs = (await Promise.all(partSpec.map((s) => lazyLoadSpecLocation(s)))).filter(
+                    (s) => s != null
+                ) as Fig.Spec[];
+                const subcommands = locationSpecs
+                    .map((s) => getSubcommand(s))
+                    .filter((s) => s != null) as Fig.Subcommand[];
+                (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx] = {
+                    ...subcommand,
+                    ...(subcommands.find((s) => s?.name == command) ?? []),
+                    loadSpec: undefined,
+                };
+                return (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx];
+            } else if (Object.prototype.hasOwnProperty.call(partSpec, "type")) {
+                const locationSingleSpec = await lazyLoadSpecLocation(partSpec as Fig.SpecLocation);
+                (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx] = {
+                    ...subcommand,
+                    ...(getSubcommand(locationSingleSpec) ?? []),
+                    loadSpec: undefined,
+                };
+                return (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx];
+            } else {
+                (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx] = {
+                    ...subcommand,
+                    ...partSpec,
+                    loadSpec: undefined,
+                };
+                return (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx];
+            }
+        }
+        case "string": {
+            const spec = await lazyLoadSpec(subcommand.loadSpec as string);
+            (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx] = {
+                ...subcommand,
+                ...(getSubcommand(spec) ?? []),
+                loadSpec: undefined,
+            };
+            return (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx];
+        }
+        case "object": {
+            (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx] = {
+                ...subcommand,
+                ...(subcommand.loadSpec ?? {}),
+                loadSpec: undefined,
+            };
+            return (parentCommand.subcommands as Fig.Subcommand[])[subcommandIdx];
+        }
+        case "undefined": {
+            return subcommand;
+        }
+    }
+};
+
+const getOption = (activeToken: CommandToken, options: Fig.Option[]): Fig.Option | undefined => {
+    return options.find((o) =>
+        typeof o.name === "string" ? o.name === activeToken.token : o.name.includes(activeToken.token)
+    );
+};
+
+const getPersistentTokens = (tokens: CommandToken[]): CommandToken[] => {
+    return tokens.filter((t) => t.isPersistent === true);
+};
+
+const getArgs = (args: Fig.SingleOrArray<Fig.Arg> | undefined): Fig.Arg[] => {
+    return args instanceof Array ? args : args != null ? [args] : [];
+};
+
+const runOption = async (
+    tokens: CommandToken[],
+    option: Fig.Option,
+    subcommand: Fig.Subcommand,
+    cwd: string,
+    persistentOptions: Fig.Option[],
+    acceptedTokens: CommandToken[]
+): Promise<SuggestionBlob | undefined> => {
+    if (tokens.length === 0) {
+        throw new Error("invalid state reached, option expected but no tokens found");
+    }
+    const activeToken = tokens[0];
+    const isPersistent = persistentOptions.some((o) =>
+        typeof o.name === "string" ? o.name === activeToken.token : o.name.includes(activeToken.token)
+    );
+    if ((option.args instanceof Array && option.args.length > 0) || option.args != null) {
+        const args = option.args instanceof Array ? option.args : [option.args];
+        return runArg(
+            tokens.slice(1),
+            args,
+            subcommand,
+            cwd,
+            persistentOptions,
+            acceptedTokens.concat(activeToken),
+            true,
+            false
+        );
+    }
+    return runSubcommand(
+        tokens.slice(1),
+        subcommand,
+        cwd,
+        persistentOptions,
+        acceptedTokens.concat({ ...activeToken, isPersistent })
+    );
+};
+
+const runArg = async (
+    tokens: CommandToken[],
+    args: Fig.Arg[],
+    subcommand: Fig.Subcommand,
+    cwd: string,
+    persistentOptions: Fig.Option[],
+    acceptedTokens: CommandToken[],
+    fromOption: boolean,
+    fromVariadic: boolean
+): Promise<SuggestionBlob | undefined> => {
+    if (args.length === 0) {
+        return runSubcommand(tokens, subcommand, cwd, persistentOptions, acceptedTokens, true, !fromOption);
+    } else if (tokens.length === 0) {
+        return await getArgDrivenRecommendation(
+            args,
+            subcommand,
+            persistentOptions,
+            undefined,
+            acceptedTokens,
+            fromVariadic,
+            cwd
+        );
+    } else if (!tokens.at(0)?.complete) {
+        return await getArgDrivenRecommendation(
+            args,
+            subcommand,
+            persistentOptions,
+            tokens[0],
+            acceptedTokens,
+            fromVariadic,
+            cwd
+        );
+    }
+
+    const activeToken = tokens[0];
+    if (args.every((a) => a.isOptional)) {
+        if (activeToken.isOption) {
+            const option = getOption(activeToken, persistentOptions.concat(subcommand.options ?? []));
+            if (option != null) {
+                return runOption(tokens, option, subcommand, cwd, persistentOptions, acceptedTokens);
+            }
+            return;
+        }
+
+        const nextSubcommand = await genSubcommand(activeToken.token, subcommand);
+        if (nextSubcommand != null) {
+            return runSubcommand(
+                tokens.slice(1),
+                nextSubcommand,
+                cwd,
+                persistentOptions,
+                getPersistentTokens(acceptedTokens.concat(activeToken))
+            );
+        }
+    }
+
+    const activeArg = args[0];
+    if (activeArg.isVariadic) {
+        return runArg(
+            tokens.slice(1),
+            args,
+            subcommand,
+            cwd,
+            persistentOptions,
+            acceptedTokens.concat(activeToken),
+            fromOption,
+            true
+        );
+    } else if (activeArg.isCommand) {
+        if (tokens.length <= 0) {
+            return;
+        }
+        const spec = await loadSpec(tokens);
+        if (spec == null) return;
+        const subcommand = getSubcommand(spec);
+        if (subcommand == null) return;
+        return runSubcommand(tokens.slice(1), subcommand, cwd);
+    }
+    return runArg(
+        tokens.slice(1),
+        args.slice(1),
+        subcommand,
+        cwd,
+        persistentOptions,
+        acceptedTokens.concat(activeToken),
+        fromOption,
+        false
+    );
+};
+
+const runSubcommand = async (
+    tokens: CommandToken[],
+    subcommand: Fig.Subcommand,
+    cwd: string,
+    persistentOptions: Fig.Option[] = [],
+    acceptedTokens: CommandToken[] = [],
+    argsDepleted = false,
+    argsUsed = false
+): Promise<SuggestionBlob | undefined> => {
+    log.debug("runSubcommand", tokens, subcommand, cwd, persistentOptions, acceptedTokens, argsDepleted, argsUsed);
+    if (tokens.length === 0) {
+        log.debug("tokens length 0");
+        return getSubcommandDrivenRecommendation(
+            subcommand,
+            persistentOptions,
+            undefined,
+            argsDepleted,
+            argsUsed,
+            acceptedTokens,
+            cwd
+        );
+    } else if (!tokens.at(0)?.complete) {
+        log.debug("tokens not complete");
+        return getSubcommandDrivenRecommendation(
+            subcommand,
+            persistentOptions,
+            tokens[0],
+            argsDepleted,
+            argsUsed,
+            acceptedTokens,
+            cwd
+        );
+    }
+
+    const activeToken = tokens[0];
+    const activeArgsLength = subcommand.args instanceof Array ? subcommand.args.length : 1;
+    const allOptions = [...persistentOptions, ...(subcommand.options ?? [])];
+
+    if (activeToken.isOption) {
+        const option = getOption(activeToken, allOptions);
+        if (option != null) {
+            return runOption(tokens, option, subcommand, cwd, persistentOptions, acceptedTokens);
+        }
+        return;
+    }
+
+    log.debug("getting next subcommand", activeToken.token, subcommand);
+    const nextSubcommand = await genSubcommand(activeToken.token, subcommand);
+    log.debug("nextSubcommand", nextSubcommand);
+    if (nextSubcommand) {
+        log.debug("has next subcommand");
+        return runSubcommand(
+            tokens.slice(1),
+            nextSubcommand,
+            cwd,
+            getPersistentOptions(persistentOptions, subcommand.options),
+            getPersistentTokens(acceptedTokens.concat(activeToken))
+        );
+    }
+
+    if (activeArgsLength <= 0) {
+        log.debug("no args specified");
+        return; // not subcommand or option & no args exist
+    }
+
+    const args = getArgs(subcommand.args);
+    if (args.length != 0) {
+        log.debug("args specified");
+        return runArg(tokens, args, subcommand, cwd, allOptions, acceptedTokens, false, false);
+    }
+
+    // if the subcommand has no args specified, fallback to the subcommand and ignore this item
+    return runSubcommand(tokens.slice(1), subcommand, cwd, persistentOptions, acceptedTokens.concat(activeToken));
+};

src/autocomplete/runtime/suggestion.ts

@@ -0,0 +1,334 @@
+// Copyright 2024, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Modified from https://github.com/microsoft/inshellisense/blob/main/src/runtime/suggestion.ts
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { CommandToken } from "./parser";
+import { runGenerator } from "./generator";
+import { runTemplates } from "./template";
+import { Suggestion, SuggestionBlob } from "./model";
+import { getApi } from "@/models";
+import log from "../utils/log";
+
+enum SuggestionIcons {
+    File = "📄",
+    Folder = "📁",
+    Subcommand = "📦",
+    Option = "🔗",
+    Argument = "💲",
+    Mixin = "🏝️",
+    Shortcut = "🔥",
+    Special = "⭐",
+    Default = "📀",
+}
+
+const getIcon = (icon: string | undefined, suggestionType: Fig.SuggestionType | undefined): string => {
+    // TODO: enable fig icons once spacing is better
+    // if (icon && /[^\u0000-\u00ff]/.test(icon)) {
+    //   return icon;
+    // }
+    switch (suggestionType) {
+        case "arg":
+            return SuggestionIcons.Argument;
+        case "file":
+            return SuggestionIcons.File;
+        case "folder":
+            return SuggestionIcons.Folder;
+        case "option":
+            return SuggestionIcons.Option;
+        case "subcommand":
+            return SuggestionIcons.Subcommand;
+        case "mixin":
+            return SuggestionIcons.Mixin;
+        case "shortcut":
+            return SuggestionIcons.Shortcut;
+        case "special":
+            return SuggestionIcons.Special;
+    }
+    return SuggestionIcons.Default;
+};
+
+const getLong = (suggestion: Fig.SingleOrArray<string>): string => {
+    return suggestion instanceof Array ? suggestion.reduce((p, c) => (p.length > c.length ? p : c)) : suggestion;
+};
+
+const toSuggestion = (suggestion: Fig.Suggestion, name?: string, type?: Fig.SuggestionType): Suggestion | undefined => {
+    if (suggestion.name == null) return;
+    return {
+        name: name ?? getLong(suggestion.name),
+        description: suggestion.description,
+        icon: getIcon(suggestion.icon, type ?? suggestion.type),
+        allNames: suggestion.name instanceof Array ? suggestion.name : [suggestion.name],
+        priority: suggestion.priority ?? 50,
+        insertValue: suggestion.insertValue,
+    };
+};
+
+function filter<
+    T extends Fig.BaseSuggestion & { name?: Fig.SingleOrArray<string>; type?: Fig.SuggestionType | undefined }
+>(
+    suggestions: T[],
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined,
+    suggestionType: Fig.SuggestionType | undefined
+): Suggestion[] {
+    log.debug("filter", suggestions, filterStrategy, partialCmd, suggestionType);
+    if (!partialCmd)
+        return suggestions
+            .map((s) => toSuggestion(s, undefined, suggestionType))
+            .filter((s) => s != null) as Suggestion[];
+
+    switch (filterStrategy) {
+        case "fuzzy":
+            log.debug("fuzzy");
+            return suggestions
+                .map((s) => {
+                    if (s.name == null) return;
+                    if (s.name instanceof Array) {
+                        const matchedName = s.name.find((n) => n.toLowerCase().includes(partialCmd.toLowerCase()));
+                        return matchedName != null
+                            ? {
+                                  name: matchedName,
+                                  description: s.description,
+                                  icon: getIcon(s.icon, s.type ?? suggestionType),
+                                  allNames: s.name,
+                                  priority: s.priority ?? 50,
+                                  insertValue: s.insertValue,
+                              }
+                            : undefined;
+                    }
+                    return s.name.toLowerCase().includes(partialCmd.toLowerCase())
+                        ? {
+                              name: s.name,
+                              description: s.description,
+                              icon: getIcon(s.icon, s.type ?? suggestionType),
+                              allNames: [s.name],
+                              priority: s.priority ?? 50,
+                              insertValue: s.insertValue,
+                          }
+                        : undefined;
+                })
+                .filter((s) => s != null) as Suggestion[];
+        default:
+            return suggestions
+                .map((s) => {
+                    if (s.name == null) return;
+                    if (s.name instanceof Array) {
+                        const matchedName = s.name.find((n) => n.toLowerCase().startsWith(partialCmd.toLowerCase()));
+                        return matchedName != null
+                            ? {
+                                  name: matchedName,
+                                  description: s.description,
+                                  icon: getIcon(s.icon, s.type ?? suggestionType),
+                                  allNames: s.name,
+                                  insertValue: s.insertValue,
+                                  priority: s.priority ?? 50,
+                              }
+                            : undefined;
+                    }
+                    return s.name.toLowerCase().startsWith(partialCmd.toLowerCase())
+                        ? {
+                              name: s.name,
+                              description: s.description,
+                              icon: getIcon(s.icon, s.type ?? suggestionType),
+                              allNames: [s.name],
+                              insertValue: s.insertValue,
+                              priority: s.priority ?? 50,
+                          }
+                        : undefined;
+                })
+                .filter((s) => s != null) as Suggestion[];
+    }
+}
+
+type FilterStrategy = "fuzzy" | "prefix" | "default";
+
+const generatorSuggestions = async (
+    generator: Fig.SingleOrArray<Fig.Generator> | undefined,
+    acceptedTokens: CommandToken[],
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined,
+    cwd: string
+): Promise<Suggestion[]> => {
+    const generators = generator instanceof Array ? generator : generator ? [generator] : [];
+    const tokens = acceptedTokens.map((t) => t.token);
+    if (partialCmd) tokens.push(partialCmd);
+    const suggestions = (await Promise.all(generators.map((gen) => runGenerator(gen, tokens, cwd)))).flat();
+    return filter<Fig.Suggestion>(
+        suggestions.map((suggestion) => ({ ...suggestion, priority: suggestion.priority ?? 60 })),
+        filterStrategy,
+        partialCmd,
+        undefined
+    );
+};
+
+const templateSuggestions = async (
+    templates: Fig.Template | undefined,
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined,
+    cwd: string
+): Promise<Suggestion[]> => {
+    log.debug("templateSuggestions", templates, filterStrategy, partialCmd);
+    return filter<Fig.Suggestion>(await runTemplates(templates ?? [], cwd), filterStrategy, partialCmd, undefined);
+};
+
+const suggestionSuggestions = (
+    suggestions: (string | Fig.Suggestion)[] | undefined,
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined
+): Suggestion[] => {
+    const cleanedSuggestions = suggestions?.map((s) => (typeof s === "string" ? { name: s } : s)) ?? [];
+    return filter<Fig.Suggestion>(cleanedSuggestions ?? [], filterStrategy, partialCmd, undefined);
+};
+
+const subcommandSuggestions = (
+    subcommands: Fig.Subcommand[] | undefined,
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined
+): Suggestion[] => {
+    return filter<Fig.Subcommand>(subcommands ?? [], filterStrategy, partialCmd, "subcommand");
+};
+
+const optionSuggestions = (
+    options: Fig.Option[] | undefined,
+    acceptedTokens: CommandToken[],
+    filterStrategy: FilterStrategy | undefined,
+    partialCmd: string | undefined
+): Suggestion[] => {
+    log.debug("optionSuggestions", options, acceptedTokens, filterStrategy, partialCmd);
+    const usedOptions = new Set(acceptedTokens.filter((t) => t.isOption).map((t) => t.token));
+    const validOptions = options?.filter(
+        (o) => o.exclusiveOn?.every((exclusiveOption) => !usedOptions.has(exclusiveOption)) ?? true
+    );
+    return filter<Fig.Option>(validOptions ?? [], filterStrategy, partialCmd, "option");
+};
+
+const removeAcceptedSuggestions = (suggestions: Suggestion[], acceptedTokens: CommandToken[]): Suggestion[] => {
+    const seen = new Set<string>(acceptedTokens.map((t) => t.token));
+    return suggestions.filter((s) => s.allNames.every((n) => !seen.has(n)));
+};
+
+const removeDuplicateSuggestion = (suggestions: Suggestion[]): Suggestion[] => {
+    const seen = new Set<string>();
+    return suggestions
+        .map((s) => {
+            if (seen.has(s.name)) return null;
+            seen.add(s.name);
+            return s;
+        })
+        .filter((s): s is Suggestion => s != null);
+};
+
+const removeEmptySuggestion = (suggestions: Suggestion[]): Suggestion[] => {
+    return suggestions.filter((s) => s.name.length > 0);
+};
+
+export const getSubcommandDrivenRecommendation = async (
+    subcommand: Fig.Subcommand,
+    persistentOptions: Fig.Option[],
+    partialToken: CommandToken | undefined,
+    argsDepleted: boolean,
+    argsFromSubcommand: boolean,
+    acceptedTokens: CommandToken[],
+    cwd: string
+): Promise<SuggestionBlob | undefined> => {
+    log.debug("getSubcommandDrivenRecommendation", subcommand, partialToken, argsDepleted, argsFromSubcommand);
+    // if (argsDepleted && argsFromSubcommand) {
+    //     log.debug("argsDepleted && argsFromSubcommand");
+    //     return;
+    // }
+    let partialCmd = partialToken?.token ?? "";
+    if (partialToken?.isPath) {
+        log.debug("partialToken?.isPath");
+        partialCmd = partialToken.isPathComplete ? "" : getApi().pathBaseName(partialCmd ?? "");
+    }
+
+    const suggestions: Suggestion[] = [];
+    const argLength = subcommand.args instanceof Array ? subcommand.args.length : subcommand.args ? 1 : 0;
+    const allOptions = persistentOptions.concat(subcommand.options ?? []);
+    log.debug("allOptions", allOptions, persistentOptions, subcommand.options, subcommand.args, argLength);
+
+    if (!argsFromSubcommand) {
+        log.debug("!argsFromSubcommand");
+        suggestions.push(...subcommandSuggestions(subcommand.subcommands, subcommand.filterStrategy, partialCmd));
+        log.debug("suggestions", suggestions);
+        suggestions.push(...optionSuggestions(allOptions, acceptedTokens, subcommand.filterStrategy, partialCmd));
+        log.debug("suggestions", suggestions);
+    }
+    if (argLength != 0) {
+        log.debug("argLength != 0");
+        const activeArg = subcommand.args instanceof Array ? subcommand.args[0] : subcommand.args;
+        suggestions.push(
+            ...(await generatorSuggestions(
+                activeArg?.generators,
+                acceptedTokens,
+                activeArg?.filterStrategy,
+                partialCmd,
+                cwd
+            ))
+        );
+        log.debug("suggestions", suggestions);
+        suggestions.push(...suggestionSuggestions(activeArg?.suggestions, activeArg?.filterStrategy, partialCmd));
+        log.debug("suggestions", suggestions);
+        suggestions.push(
+            ...(await templateSuggestions(activeArg?.template, activeArg?.filterStrategy, partialCmd, cwd))
+        );
+        log.debug("suggestions", suggestions);
+    }
+
+    suggestions.push(...(await templateSuggestions("history", "prefix", null, cwd)));
+    log.debug("suggestions return", suggestions);
+
+    return {
+        suggestions: removeDuplicateSuggestion(
+            removeEmptySuggestion(
+                removeAcceptedSuggestions(
+                    suggestions.sort((a, b) => b.priority - a.priority),
+                    acceptedTokens
+                )
+            )
+        ),
+    };
+};
+
+export const getArgDrivenRecommendation = async (
+    args: Fig.Arg[],
+    subcommand: Fig.Subcommand,
+    persistentOptions: Fig.Option[],
+    partialToken: CommandToken | undefined,
+    acceptedTokens: CommandToken[],
+    variadicArgBound: boolean,
+    cwd: string
+): Promise<SuggestionBlob | undefined> => {
+    let partialCmd = partialToken?.token;
+    if (partialToken?.isPath) {
+        partialCmd = partialToken.isPathComplete ? "" : getApi().pathBaseName(partialCmd ?? "");
+    }
+
+    const activeArg = args[0];
+    const allOptions = persistentOptions.concat(subcommand.options ?? []);
+    const suggestions = [
+        ...(await generatorSuggestions(args[0].generators, acceptedTokens, activeArg?.filterStrategy, partialCmd, cwd)),
+        ...suggestionSuggestions(args[0].suggestions, activeArg?.filterStrategy, partialCmd),
+        ...(await templateSuggestions(args[0].template, activeArg?.filterStrategy, partialCmd, cwd)),
+    ];
+
+    if (activeArg.isOptional || (activeArg.isVariadic && variadicArgBound)) {
+        suggestions.push(...subcommandSuggestions(subcommand.subcommands, activeArg?.filterStrategy, partialCmd));
+        suggestions.push(...optionSuggestions(allOptions, acceptedTokens, activeArg?.filterStrategy, partialCmd));
+    }
+
+    return {
+        suggestions: removeDuplicateSuggestion(
+            removeEmptySuggestion(
+                removeAcceptedSuggestions(
+                    suggestions.sort((a, b) => b.priority - a.priority),
+                    acceptedTokens
+                )
+            )
+        ),
+        argumentDescription: activeArg.description ?? activeArg.name,
+    };
+};