Compare commits

...

5 Commits

Author SHA1 Message Date
Evan Simkowitz eab2cb616d output dl links (#414) 2024-03-08 15:16:55 -08:00
Evan Simkowitz a6f2e0b26e Fix buildres script auth (#413) 2024-03-08 14:52:46 -08:00
Evan Simkowitz 358ffb6d50 Add pacman artifact and update product tagline (#412)
This adds support for Arch Linux via pacman. It also updates the product tagline in package.json and the "About" modal. It also removes the unused "Help" menu and updates the copyright year in About and fixes the window icon display on Linux.
2024-03-08 14:05:21 -08:00
Mike Sawka a2795fb74d indicator fixup (mismatch of increments/decrements) (#411)
* addLineForCmd should only increment for running commands.  also openai lines should increment

* small fix for openai chat styles
2024-03-08 10:33:10 -08:00
Red J Adaya c5d4a0e1f3 Convert history table to use div (#407)
* convert table to div

* remove comment

* more history UI updates.  copy/use controls, change font, fix scroll area

* use css variables

* fix textfield placeholder color

* put back input styles

* change overflow-x to auto
2024-03-07 22:48:52 -08:00
20 changed files with 213 additions and 190 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
if: matrix.platform == 'linux'
run: |
sudo apt-get update
sudo apt-get install rpm
sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm
- uses: actions/setup-go@v5
with:
go-version: ${{env.GO_VERSION}}
+4 -3
View File
@@ -9,7 +9,7 @@
# Wave Terminal
An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.
Wave is an open-source AI-native terminal built for seamless workflows.
Wave isn't just another terminal emulator; it's a rethink on how terminals are built. Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.
@@ -17,13 +17,14 @@ Wave isn't just another terminal emulator; it's a rethink on how terminals are b
- Persistent sessions that can restore state across network disconnections and reboots
- Searchable contextual command history across all remote sessions (saved locally)
- Workspaces, tabs, and command blocks to keep you organized
- CodeEdit, to edit local and remote files with a VSCode-like inline editor
- AI Integration with ChatGPT (or ChatGPT compatible APIs) to help write commands and get answers inline
![WaveTerm Screenshot](./assets/wave-screenshot.jpeg)
## Installation
Wave Terminal works with MacOS and Linux (preliminary).
Wave Terminal works with MacOS and Linux.
Install Wave Terminal from: [www.waveterm.dev/download](https://www.waveterm.dev/download)
@@ -49,7 +50,7 @@ brew install --cask wave
## Contributing
Wave uses Github Project for tracking issues.
Wave uses Github Issues for issue tracking.
Find more information in our [Contributions Guide](CONTRIBUTING.md), which includes:
+1 -1
View File
@@ -13,4 +13,4 @@ fi
DOWNLOAD_DIR=$VERSION-staged
rm -rf $DOWNLOAD_DIR
mkdir -p $DOWNLOAD_DIR
aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ $DOWNLOAD_DIR/ --recursive
aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE
+10 -1
View File
@@ -9,4 +9,13 @@ if [ -z "$VERSION" ]; then
exit
fi
aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ s3://dl.waveterm.dev/releases/ --recursive
ORIGIN="waveterm-github-artifacts/staging/$VERSION/"
DESTINATION="dl.waveterm.dev/releases/"
OUTPUT=$(aws s3 cp s3://$ORIGIN s3://$DESTINATION --recursive --profile $AWS_PROFILE)
for line in $OUTPUT; do
PREFIX=${line%%${DESTINATION}*}
SUFFIX=${line:${#PREFIX}}
echo "https://$SUFFIX"
done
+1 -1
View File
@@ -73,7 +73,7 @@ const config = {
executableName: pkg.productName,
category: "TerminalEmulator",
icon: "public/waveterm.icns",
target: ["zip", "deb", "rpm", "AppImage"],
target: ["zip", "deb", "rpm", "AppImage", "pacman"],
synopsis: pkg.description,
description: null,
desktop: {
+1 -1
View File
@@ -5,7 +5,7 @@
"email": "info@commandline.dev"
},
"productName": "Wave",
"description": "An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.",
"description": "An Open-Source, AI-Native, Terminal Built for Seamless Workflows",
"version": "0.7.0",
"main": "dist/emain.js",
"license": "Apache-2.0",
+1 -1
View File
@@ -188,7 +188,7 @@
/* table colors */
--table-border-color: rgba(241, 246, 243, 0.15);
--table-thead-border-top-color: rgba(250, 250, 250, 0.1);
--table-thead-border-bottom-color: var(--table-border-color);
--table-thead-bright-border-color: #ccc;
--table-thead-bg-color: rgba(250, 250, 250, 0.02);
--table-tr-border-bottom-color: rgba(241, 246, 243, 0.15);
--table-tr-hover-bg-color: rgba(255, 255, 255, 0.06);
+2
View File
@@ -47,6 +47,8 @@
--form-element-label-color: rgba(0, 0, 0, 0.6);
--form-element-secondary-color: rgba(0, 0, 0, 0.09);
--form-element-icon-color: rgb(0, 0, 0, 0.6);
--form-element-disabled-text-color: #b7b7b7;
--form-element-placeholder-color: #b7b7b7;
/* modal colors */
--modal-header-bottom-border-color: rgba(0, 0, 0, 0.3);
+1 -1
View File
@@ -166,7 +166,7 @@ class ClientSettingsView extends React.Component<{ model: RemotesModel }, { hove
const curTheme = GlobalModel.getTheme();
return (
<MainView viewName="clientsettings" title="Client Settings" onClose={this.handleClose}>
<MainView className="clientsettings-view" title="Client Settings" onClose={this.handleClose}>
<div className="content">
<div className="settings-field">
<div className="settings-label">Term Font Size</div>
+1
View File
@@ -5,6 +5,7 @@
width: 100%;
border: 2px solid var(--form-element-border-color);
border-radius: 6px;
line-height: 22px;
background: var(--form-element-bg-color);
&.no-label {
+2 -2
View File
@@ -10,17 +10,17 @@ import "./mainview.less";
@mobxReact.observer
class MainView extends React.Component<{
viewName: string;
title: string;
onClose: () => void;
children: React.ReactNode;
className?: string;
}> {
render() {
const sidebarModel = GlobalModel.mainSidebarModel;
const maxWidthSubtractor = sidebarModel.getCollapsed() ? 0 : sidebarModel.getWidth();
return (
<div
className={cn("mainview", `${this.props.viewName}-view`)}
className={cn("mainview", this.props.className)}
style={{ maxWidth: `calc(100vw - ${maxWidthSubtractor}px)` }}
>
<div className="header-container bottom-border">
+4
View File
@@ -64,6 +64,10 @@
&.offset-left {
padding: 5px 16px 5px 0;
}
input::placeholder {
color: var(--form-element-placeholder-color);
}
}
}
+6 -3
View File
@@ -75,6 +75,7 @@ class AboutModal extends React.Component<{}, {}> {
}
render() {
const currentDate = new Date();
return (
<Modal className="about-modal">
<Modal.Header onClose={this.closeModal} title="About" />
@@ -86,9 +87,9 @@ class AboutModal extends React.Component<{}, {}> {
<div className="text-wrapper">
<div>Wave Terminal</div>
<div className="text-standard">
Modern Terminal for
Open-Source AI-Native Terminal
<br />
Seamless Workflow
Built for Seamless Workflows
</div>
</div>
</div>
@@ -122,7 +123,9 @@ class AboutModal extends React.Component<{}, {}> {
Acknowledgements
</LinkButton>
</div>
<div className="about-section text-standard">&copy; 2023 Command Line Inc.</div>
<div className="about-section text-standard">
&copy; {currentDate.getFullYear()} Command Line Inc.
</div>
</div>
</Modal>
);
+1 -1
View File
@@ -28,7 +28,7 @@
thead {
border-radius: var(--sizing-2-xs, 4px);
border-bottom: 2px solid var(--table-thead-border-bottom-color);
border-bottom: 2px solid var(--table-thead-bright-border-color);
th {
height: 32px;
+1 -1
View File
@@ -126,7 +126,7 @@ class ConnectionsView extends React.Component<{ model: RemotesModel }, { hovered
let item: RemoteType = null;
return (
<MainView viewName="connections" title="Connections" onClose={this.handleClose}>
<MainView className="connections-view" title="Connections" onClose={this.handleClose}>
<table
className="connections-table"
cellSpacing="0"
+83 -90
View File
@@ -1,5 +1,6 @@
.history-view {
padding-bottom: 10px;
min-height: 0;
.icon {
width: 1.5em !important;
@@ -8,6 +9,14 @@
fill: var(--app-text-color);
}
.mainview-content {
display: flex;
flex-direction: column;
flex-grow: 1;
padding: 10px 10px 0 10px;
min-height: 0;
}
.history-checkbox {
&.state-unchecked {
width: 16px;
@@ -51,16 +60,6 @@
color: var(--app-text-color);
}
.main-search {
.field {
width: 80%;
}
input::placeholder {
color: #777;
}
}
.advanced-search {
display: flex;
flex-direction: row;
@@ -68,37 +67,7 @@
.workspace-dropdown,
.remote-dropdown {
width: 200px;
}
.dropdown {
font-size: 0.8em;
padding: 0.5em 1em;
.label {
display: inline;
vertical-align: middle;
color: var(--app-text-color);
}
.icon {
vertical-align: middle;
margin-left: 1em;
}
}
.session-dropdown,
.remote-dropdown {
.dropdown-item {
color: var(--app-text-color);
cursor: pointer;
&:hover {
background-color: #666;
}
}
.dropdown-content {
border-radius: 0 0 4px 4px;
width: 16em;
}
width: 170px;
}
.remote-dropdown {
@@ -115,10 +84,6 @@
align-items: center;
height: 34px;
&.is-active {
background-color: #666;
}
.checkbox-container {
position: relative;
top: 2px;
@@ -151,7 +116,7 @@
margin-top: 10px;
margin-left: 10px;
align-items: center;
height: 32px;
height: 35px;
flex-shrink: 0;
.is-hidden {
@@ -159,8 +124,14 @@
}
&.is-top {
border-top: 1px solid #333;
border-bottom: 2px solid var(--table-thead-bright-border-color);
border-top: 1px solid var(--table-thead-border-top-color);
padding-top: 4px;
padding-bottom: 4px;
}
&.is-bottom {
border-top: 2px solid var(--table-thead-bright-border-color);
}
.trash-icon {
@@ -175,7 +146,7 @@
.control-button {
cursor: pointer;
color: #aaa;
color: var(--form-element-label-color);
margin-left: 12px;
.icon {
@@ -215,8 +186,11 @@
&.is-disabled {
cursor: default;
color: #777;
font-weight: normal;
.icon {
fill: var(--form-element-disabled-text-color);
}
}
}
@@ -230,7 +204,7 @@
flex-direction: row;
justify-content: center;
padding: 30px 0 30px 0;
border: 1px solid white;
border: 1px solid var(--app-border-color);
border-radius: 3px;
margin: 20px 50px 20px 20px;
}
@@ -239,16 +213,24 @@
flex-grow: 1;
min-height: 200px;
overflow-y: auto;
height: calc(100vh - 186px); // 186px is sum of all the heights above the history-scroll-region
}
.history-table {
margin: 0px 10px 10px 10px;
table-layout: fixed;
border-top: 2px solid #ccc;
display: flex;
flex-direction: column;
width: calc(100% - 20px);
flex-grow: 1;
min-height: 200px;
tr.active-history-item {
td {
.row.active-history-item {
display: flex;
border-bottom: 1px solid var(--table-tr-border-bottom-color);
align-items: center;
padding: 0 10px;
.cell {
padding-right: 10px;
.line-container {
@@ -287,12 +269,13 @@
}
}
tr.history-item {
.row.history-item {
padding: 0 10px 0 10px;
display: flex;
border-bottom: 1px solid var(--table-tr-border-bottom-color);
align-items: center;
color: var(--app-text-color);
font: var(--base-font);
&.is-selected {
background-color: var(--table-tr-selected-bg-color);
@@ -310,41 +293,27 @@
}
}
td {
.cell {
display: flex;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 5px;
}
td.selectbox {
flex: 0 0 auto;
flex-basis: 25px;
.selectbox {
flex: 0 0 30px;
cursor: pointer;
}
td.bookmark {
flex: 0 0 auto;
flex-basis: 20px;
margin-right: 1em;
cursor: pointer;
}
td.ts {
flex: 0 0 auto;
flex-basis: 86px;
margin-left: 24px;
}
td.workspace {
flex: 0 0 auto;
flex-basis: 120px;
.workspace {
flex: 0 0 120px;
text-overflow: ellipsis;
margin-left: 24px;
overflow: hidden;
}
td.remote {
flex: 0 0 auto;
flex-basis: 150px;
.remote {
flex: 0 0 150px;
text-overflow: ellipsis;
padding-right: 5px;
max-width: 150px;
@@ -352,29 +321,53 @@
margin-left: 24px;
}
td.cmdstr {
color: var(--app-text-color);
flex: 1 0 0;
.ts {
flex: 0 0 86px;
margin-left: 24px;
}
.cmdstr {
flex-grow: 1;
border-radius: 3px;
white-space: pre;
max-height: 70px;
min-width: 300px;
padding-top: 4px;
padding-bottom: 4px;
overflow: hidden;
padding-top: 0;
padding-bottom: 0;
overflow-x: auto;
position: relative;
.cmdstr-code {
display: flex;
flex-direction: row;
align-items: flex-end;
padding-top: 4px;
padding-bottom: 4px;
}
.actions-block {
display: flex;
flex-direction: row;
.action-item:hover {
color: var(--app-text-color);
cursor: pointer;
}
.use-button {
visibility: hidden;
}
&:hover .use-button {
visibility: visible;
.activate-item-spacer {
cursor: pointer;
}
}
td.downarrow {
display: flex;
width: 32px;
&:hover .cmdstr .actions-block {
visibility: visible;
}
.downarrow {
flex: 0 0 32px;
justify-content: center;
align-items: center;
align-self: stretch;
+81 -76
View File
@@ -153,16 +153,16 @@ class HistoryCmdStr extends React.Component<
<div>copied</div>
</div>
</If>
<div key="use" className="use-button hoverEffect" title="Use Command" onClick={this.handleUse}>
<CheckIcon className="icon" />
</div>
<div key="code" className="code-div">
<code>{cmdstr}</code>
</div>
<div key="copy" className="copy-control hoverEffect">
<div className="inner-copy" onClick={this.handleCopy} title="copy">
<div key="copy" className="actions-block">
<div className="action-item" onClick={this.handleCopy} title="copy">
<CopyIcon className="icon" />
</div>
<div key="use" className="action-item" title="Use Command" onClick={this.handleUse}>
<CheckIcon className="icon" />
</div>
</div>
</div>
);
@@ -447,7 +447,7 @@ class HistoryView extends React.Component<{}, {}> {
let remoteId: string = null;
return (
<MainView viewName="history" title="History" onClose={this.handleClose}>
<MainView className="history-view" title="History" onClose={this.handleClose}>
<div key="search" className="history-search">
<div className="main-search field">
<TextField
@@ -544,78 +544,83 @@ class HistoryView extends React.Component<{}, {}> {
</div>
</If>
<div key="hsr" className="history-scroll-region">
<table className="history-table" cellSpacing="0" cellPadding="0" border={0} ref={this.tableRef}>
<tbody>
<For index="idx" each="item" of={items}>
<tr
key={item.historyid}
className={cn("history-item", {
"is-selected": hvm.selectedItems.get(item.historyid),
})}
>
<td className="selectbox" onClick={() => this.handleSelect(item.historyid)}>
<HistoryCheckbox checked={hvm.selectedItems.get(item.historyid)} />
</td>
<td className="cmdstr">
<HistoryCmdStr
cmdstr={item.cmdstr}
onUse={() => this.handleUse(item)}
onCopy={() => this.handleCopy(item)}
isCopied={this.copiedItemId.get() == item.historyid}
fontSize="normal"
limitHeight={true}
/>
</td>
<td className="workspace text-standard">{formatSSName(snames, scrnames, item)}</td>
<td className="remote text-standard">{formatRemoteName(rnames, item.remote)}</td>
<td className="ts text-standard">{getHistoryViewTs(nowDate, item.ts)}</td>
<td className="downarrow" onClick={() => this.activateItem(item.historyid)}>
<If condition={activeItemId != item.historyid}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
>
<path
d="M12.1297 6.62492C12.3999 6.93881 12.3645 7.41237 12.0506 7.68263L8.48447 10.7531C8.20296 10.9955 7.78645 10.9952 7.50519 10.7526L3.94636 7.68213C3.63274 7.41155 3.59785 6.93796 3.86843 6.62434C4.13901 6.31072 4.6126 6.27583 4.92622 6.54641L7.99562 9.19459L11.0719 6.54591C11.3858 6.27565 11.8594 6.31102 12.1297 6.62492Z"
fill="#C3C8C2"
/>
</svg>
</If>
<If condition={activeItemId == item.historyid}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
>
<path
d="M3.87035 9.37508C3.60009 9.06119 3.63546 8.58763 3.94936 8.31737L7.51553 5.24692C7.79704 5.00455 8.21355 5.00476 8.49481 5.24742L12.0536 8.31787C12.3673 8.58845 12.4022 9.06204 12.1316 9.37566C11.861 9.68928 11.3874 9.72417 11.0738 9.45359L8.00438 6.80541L4.92806 9.45409C4.61416 9.72435 4.14061 9.68898 3.87035 9.37508Z"
fill="#C3C8C2"
/>
</svg>
</If>
</td>
</tr>
<If condition={activeItemId == item.historyid}>
<tr className="active-history-item">
<td colSpan={6}>
<LineContainer
key={activeItemId}
historyId={activeItemId}
width={this.tableWidth.get()}
<div className="history-table" ref={this.tableRef}>
<For index="idx" each="item" of={items}>
<div
key={item.historyid}
className={cn("row history-item", {
"is-selected": hvm.selectedItems.get(item.historyid),
})}
>
<div className="cell selectbox" onClick={() => this.handleSelect(item.historyid)}>
<HistoryCheckbox checked={hvm.selectedItems.get(item.historyid)} />
</div>
<div className="cell cmdstr">
<HistoryCmdStr
cmdstr={item.cmdstr}
onUse={() => this.handleUse(item)}
onCopy={() => this.handleCopy(item)}
isCopied={this.copiedItemId.get() == item.historyid}
fontSize="normal"
limitHeight={true}
/>
<div
className="flex-spacer activate-item-spacer"
onClick={() => this.activateItem(item.historyid)}
/>
</div>
<div className="cell workspace">{formatSSName(snames, scrnames, item)}</div>
<div className="cell remote">{formatRemoteName(rnames, item.remote)}</div>
<div className="cell ts">{getHistoryViewTs(nowDate, item.ts)}</div>
<div className="cell downarrow" onClick={() => this.activateItem(item.historyid)}>
<If condition={activeItemId != item.historyid}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
>
<path
d="M12.1297 6.62492C12.3999 6.93881 12.3645 7.41237 12.0506 7.68263L8.48447 10.7531C8.20296 10.9955 7.78645 10.9952 7.50519 10.7526L3.94636 7.68213C3.63274 7.41155 3.59785 6.93796 3.86843 6.62434C4.13901 6.31072 4.6126 6.27583 4.92622 6.54641L7.99562 9.19459L11.0719 6.54591C11.3858 6.27565 11.8594 6.31102 12.1297 6.62492Z"
fill="#C3C8C2"
/>
</td>
</tr>
</If>
</For>
</tbody>
</table>
</svg>
</If>
<If condition={activeItemId == item.historyid}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
>
<path
d="M3.87035 9.37508C3.60009 9.06119 3.63546 8.58763 3.94936 8.31737L7.51553 5.24692C7.79704 5.00455 8.21355 5.00476 8.49481 5.24742L12.0536 8.31787C12.3673 8.58845 12.4022 9.06204 12.1316 9.37566C11.861 9.68928 11.3874 9.72417 11.0738 9.45359L8.00438 6.80541L4.92806 9.45409C4.61416 9.72435 4.14061 9.68898 3.87035 9.37508Z"
fill="#C3C8C2"
/>
</svg>
</If>
</div>
</div>
<If condition={activeItemId == item.historyid}>
<div className="row active-history-item">
<div className="cell">
<LineContainer
key={activeItemId}
historyId={activeItemId}
width={this.tableWidth.get()}
/>
</div>
</div>
</If>
</For>
</div>
</div>
<div key="control2" className={cn("control-bar", { "is-hidden": items.length == 0 || !hasMore })}>
<div
key="control2"
className={cn("control-bar", "is-bottom", { "is-hidden": items.length == 0 || !hasMore })}
>
<div className="spacer" />
<div className="showing-text">
Showing {offset + 1}-{offset + items.length}
+4 -4
View File
@@ -279,9 +279,6 @@ const menuTemplate: Electron.MenuItemConstructorOptions[] = [
{
role: "windowMenu",
},
{
role: "help",
},
];
const menu = electron.Menu.buildFromTemplate(menuTemplate);
@@ -330,7 +327,10 @@ function createMainWindow(clientData: ClientDataType | null): Electron.BrowserWi
height: bounds.height,
minWidth: 800,
minHeight: 600,
icon: unamePlatform == "linux" ? "public/logos/wave-logo-dark.png" : undefined,
icon:
unamePlatform == "linux"
? path.join(getElectronAppBasePath(), "public/logos/wave-logo-dark.png")
: undefined,
webPreferences: {
preload: path.join(getElectronAppBasePath(), DistDir, "preload.js"),
},
+2 -1
View File
@@ -11,9 +11,9 @@
.openai-role {
color: var(--term-bright-green);
font-weight: bold;
width: 100px;
flex-shrink: 0;
font: var(--base-font);
}
.openai-role.openai-role-assistant {
@@ -24,6 +24,7 @@
color: var(--app-text-color);
font-family: var(--markdown-font);
font-weight: normal;
font-size: var(--markdown-font-size);
}
.openai-content-assistant {
+6 -2
View File
@@ -2858,10 +2858,13 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
if promptStr == "" {
return nil, fmt.Errorf("openai error, prompt string is blank")
}
update := scbus.MakeUpdatePacket()
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1)
line, err := sstore.AddOpenAILine(ctx, ids.ScreenId, DefaultUserId, cmd)
if err != nil {
return nil, fmt.Errorf("cannot add new line: %v", err)
}
if resolveBool(pk.Kwargs["stream"], true) {
go doOpenAIStreamCompletion(cmd, clientData.ClientId, opts, prompt)
} else {
@@ -2876,7 +2879,6 @@ func OpenAICommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (scbus
// ignore error again (nothing to do)
log.Printf("openai error updating screen selected line: %v\n", err)
}
update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, line, cmd)
update.AddUpdate(*screen)
return update, nil
@@ -3011,7 +3013,9 @@ func addLineForCmd(ctx context.Context, metaCmd string, shouldFocus bool, ids re
update := scbus.MakeUpdatePacket()
sstore.AddLineUpdate(update, rtnLine, cmd)
update.AddUpdate(*screen)
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1)
if cmd.Status == sstore.CmdStatusRunning {
sstore.IncrementNumRunningCmds_Update(update, cmd.ScreenId, 1)
}
updateHistoryContext(ctx, rtnLine, cmd, cmd.FeState)
return update, nil
}